From 403a1a94124d314c2bd2d5b392e11295c7a8526c Mon Sep 17 00:00:00 2001
From: Michael Bienia <geser@ubuntu.com>
Date: Wed, 15 Sep 2010 09:23:28 +0200
Subject: [PATCH] Add 'natty' to the recognized names and make it the default.

---
 bash_completion/pbuilder-dist | 2 +-
 dch-repeat                    | 2 +-
 debian/changelog              | 5 ++++-
 requestsync                   | 2 +-
 reverse-build-depends         | 2 +-
 submittodebian                | 2 +-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/bash_completion/pbuilder-dist b/bash_completion/pbuilder-dist
index 994d608..2da2e2a 100644
--- a/bash_completion/pbuilder-dist
+++ b/bash_completion/pbuilder-dist
@@ -31,5 +31,5 @@ _pbuilder-dist()
     return 0
 }
 [ "$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
diff --git a/dch-repeat b/dch-repeat
index 6703ffc..eb174d9 100755
--- a/dch-repeat
+++ b/dch-repeat
@@ -47,7 +47,7 @@ EOM
     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");
 our $opt_build_tree = "/scratch/ubuntu/build";
diff --git a/debian/changelog b/debian/changelog
index 3ced4ed..2dc514d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,7 +26,10 @@ ubuntu-dev-tools (0.102) UNRELEASED; urgency=low
   * all: Use production API rather than edge by default. Should be more
     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
 
diff --git a/requestsync b/requestsync
index bed1c35..ecd9068 100755
--- a/requestsync
+++ b/requestsync
@@ -103,7 +103,7 @@ if __name__ == '__main__':
 		if lpapi:
 			release = Distribution('ubuntu').getDevelopmentSeries().name
 		else:
-			release = 'maverick'
+			release = 'natty'
 		print >> sys.stderr, 'W: Target release missing - assuming %s' % release
 	elif len(args) == 2:
 		release = args[1]
diff --git a/reverse-build-depends b/reverse-build-depends
index c5b17cf..fa86cff 100755
--- a/reverse-build-depends
+++ b/reverse-build-depends
@@ -73,7 +73,7 @@ use Pod::Usage;
 use Data::Dumper;
 my $progname = basename($0);
 my $version = '1.0';
-my $default_distribution = "maverick";
+my $default_distribution = "natty";
 my $dctrl = "/usr/bin/grep-dctrl";
 my $sources_path = "/var/lib/apt/lists/";
 my $source_pattern = ".*_dists_${default_distribution}_.*Sources\$";
diff --git a/submittodebian b/submittodebian
index 003ae3f..b732bcb 100755
--- a/submittodebian
+++ b/submittodebian
@@ -90,7 +90,7 @@ def edit_debdiff(debdiff):
 	run_cmd(cmd)
 
 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)
 
 def run_cmd(cmd):