Add 'natty' to the recognized names and make it the default.

This commit is contained in:
Michael Bienia 2010-09-15 09:23:28 +02:00
parent 0021522956
commit 403a1a9412
6 changed files with 9 additions and 6 deletions

View File

@ -31,5 +31,5 @@ _pbuilder-dist()
return 0 return 0
} }
[ "$have" ] && complete -F _pbuilder-dist -o filenames \ [ "$have" ] && complete -F _pbuilder-dist -o filenames \
{pbuilder,cowbuilder}-{dist,dapper,edgy,feisty,gutsy,hardy,intrepid,jaunty,karmic,lucid,maverick,sarge,etch,lenny,squeeze,sid} {pbuilder,cowbuilder}-{dist,dapper,hardy,jaunty,karmic,lucid,maverick,natty,sarge,etch,lenny,squeeze,sid}
# Make it pbuilder-* if you know how to do it # Make it pbuilder-* if you know how to do it

View File

@ -47,7 +47,7 @@ EOM
exit(0); exit(0);
} }
my @releases = ('dapper', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid', 'maverick'); my @releases = ('dapper', 'hardy', 'jaunty', 'karmic', 'lucid', 'maverick', 'natty');
#Getopt::Long::Configure("bundling", "no_ignore_case"); #Getopt::Long::Configure("bundling", "no_ignore_case");
our $opt_build_tree = "/scratch/ubuntu/build"; our $opt_build_tree = "/scratch/ubuntu/build";

5
debian/changelog vendored
View File

@ -26,7 +26,10 @@ ubuntu-dev-tools (0.102) UNRELEASED; urgency=low
* all: Use production API rather than edge by default. Should be more * all: Use production API rather than edge by default. Should be more
reliable and was advised by lifeless (LP team). reliable and was advised by lifeless (LP team).
-- Benjamin Drung <bdrung@ubuntu.com> Sun, 15 Aug 2010 02:22:08 +0200 [ Michael Bienia ]
* Add 'natty' to recognized names and make it the default.
-- Michael Bienia <geser@ubuntu.com> Wed, 15 Sep 2010 09:20:28 +0200
ubuntu-dev-tools (0.101) unstable; urgency=low ubuntu-dev-tools (0.101) unstable; urgency=low

View File

@ -103,7 +103,7 @@ if __name__ == '__main__':
if lpapi: if lpapi:
release = Distribution('ubuntu').getDevelopmentSeries().name release = Distribution('ubuntu').getDevelopmentSeries().name
else: else:
release = 'maverick' release = 'natty'
print >> sys.stderr, 'W: Target release missing - assuming %s' % release print >> sys.stderr, 'W: Target release missing - assuming %s' % release
elif len(args) == 2: elif len(args) == 2:
release = args[1] release = args[1]

View File

@ -73,7 +73,7 @@ use Pod::Usage;
use Data::Dumper; use Data::Dumper;
my $progname = basename($0); my $progname = basename($0);
my $version = '1.0'; my $version = '1.0';
my $default_distribution = "maverick"; my $default_distribution = "natty";
my $dctrl = "/usr/bin/grep-dctrl"; my $dctrl = "/usr/bin/grep-dctrl";
my $sources_path = "/var/lib/apt/lists/"; my $sources_path = "/var/lib/apt/lists/";
my $source_pattern = ".*_dists_${default_distribution}_.*Sources\$"; my $source_pattern = ".*_dists_${default_distribution}_.*Sources\$";

View File

@ -90,7 +90,7 @@ def edit_debdiff(debdiff):
run_cmd(cmd) run_cmd(cmd)
def submit_bugreport(body, debdiff, changelog): def submit_bugreport(body, debdiff, changelog):
cmd = 'reportbug -P "User: ubuntu-devel@lists.ubuntu.com" -P "Usertags: origin-ubuntu maverick ubuntu-patch" -T patch -A %s -B debian -i %s -V %s %s' % (debdiff, body, deb_version, changelog.package) cmd = 'reportbug -P "User: ubuntu-devel@lists.ubuntu.com" -P "Usertags: origin-ubuntu natty ubuntu-patch" -T patch -A %s -B debian -i %s -V %s %s' % (debdiff, body, deb_version, changelog.package)
run_cmd(cmd) run_cmd(cmd)
def run_cmd(cmd): def run_cmd(cmd):