From 9e89a22c5820b57a4fc5131cf79b2ed6c308f84a Mon Sep 17 00:00:00 2001
From: Michael Bienia <geser@ubuntu.com>
Date: Tue, 20 Apr 2010 17:56:51 +0200
Subject: [PATCH] [ Michael Bienia ] Update the defaults for maverick and let
 requestsync and pull-debian-source default to unstable (lp: #472837).

---
 debian/changelog         | 6 +++++-
 doc/pull-debian-source.1 | 2 +-
 doc/requestsync.1        | 2 +-
 pull-debian-source       | 2 +-
 requestsync              | 7 +++----
 reverse-build-depends    | 2 +-
 submittodebian           | 2 +-
 7 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 422d710..3d080ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,11 @@ ubuntu-dev-tools (0.99) UNRELEASED; urgency=low
   [ Andrey Voronov ]
   * pbuilder-dist: change requested/system arch order in check (LP: #557097)
 
- -- Emmet Hikory <persia@ubuntu.com>  Tue, 20 Apr 2010 06:23:28 +0900
+  [ Michael Bienia ]
+  * Update the defaults for maverick and let requestsync and
+    pull-debian-source default to unstable (lp: #472837).
+
+ -- Michael Bienia <geser@ubuntu.com>  Tue, 20 Apr 2010 17:53:57 +0200
 
 ubuntu-dev-tools (0.98) lucid; urgency=low
 
diff --git a/doc/pull-debian-source.1 b/doc/pull-debian-source.1
index c74f828..11e48ae 100644
--- a/doc/pull-debian-source.1
+++ b/doc/pull-debian-source.1
@@ -23,7 +23,7 @@ This is the source package that you would like to be downloaded from Debian.
 .TP
 .B [target release]
 This is the release that you would like the source package to be downloaded from.
-This value defaults to 'testing'.
+This value defaults to 'unstable'.
 
 .SH AUTHOR
 .PP
diff --git a/doc/requestsync.1 b/doc/requestsync.1
index ba95330..5525241 100644
--- a/doc/requestsync.1
+++ b/doc/requestsync.1
@@ -44,7 +44,7 @@ Display a help message and exit.
 .TP
 .B \-d
 Specifies which Debian distribution a package should be synced from.
-Default is \fItesting\fR.
+Default is \fIunstable\fR.
 .TP
 .B \-n
 Specifies that the package is a new package, and requestsync should not
diff --git a/pull-debian-source b/pull-debian-source
index b623f20..840e7a6 100755
--- a/pull-debian-source
+++ b/pull-debian-source
@@ -30,7 +30,7 @@ my($package)=$ARGV[0] || &usage();
 my($help)=0;
 GetOptions('help' => \$help);
 &usage() if($help);
-my($release)=$ARGV[1] || 'testing';
+my($release)=$ARGV[1] || 'unstable';
 $release=&convertCodeName($release);
 &checkRelease($release);
 my($dsc)=&getDSC(&getMadison(&getURL($package,$release)));
diff --git a/requestsync b/requestsync
index b8a1e6a..877d65c 100755
--- a/requestsync
+++ b/requestsync
@@ -47,7 +47,7 @@ if __name__ == '__main__':
 	optParser = OptionParser(usage)
 
 	optParser.add_option('-d', type = 'string',
-		dest = 'dist', default = 'testing',
+		dest = 'dist', default = 'unstable',
 		help = 'Debian distribution to sync from.')
 	optParser.add_option('-k', type = 'string',
 		dest = 'keyid', default = None,
@@ -101,10 +101,9 @@ if __name__ == '__main__':
 	if len(args) == 1:
 		if lpapi:
 			release = Distribution('ubuntu').getDevelopmentSeries().name
-			print >> sys.stderr, 'W: Target release missing - assuming %s' % release
 		else:
-			print >> sys.stderr, 'E: Source package or target release missing. Exiting.'
-			sys.exit(1)
+			release = 'maverick'
+		print >> sys.stderr, 'W: Target release missing - assuming %s' % release
 	elif len(args) == 2:
 		release = args[1]
 	elif len(args) == 3:
diff --git a/reverse-build-depends b/reverse-build-depends
index 5b1770f..c0a1621 100755
--- a/reverse-build-depends
+++ b/reverse-build-depends
@@ -75,7 +75,7 @@ my $progname = basename($0);
 my $version = '1.0';
 my $dctrl = "/usr/bin/grep-dctrl";
 my $sources_path = "/var/lib/apt/lists/";
-my $source_pattern = ".*_dists_lucid_.*Sources\$";
+my $source_pattern = ".*_dists_maverick_.*Sources\$";
 my @source_files;
 my $sources_count=0;
 my $opt_debug;
diff --git a/submittodebian b/submittodebian
index 9e57dc5..536c3ab 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 lucid 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 maverick 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):