merge with trunk; remove unnecesary fix

debian/changelog

@@ -2,9 +2,20 @@ ubuntu-dev-tools (0.23) UNRELEASED; urgency=low
 
   [ Ryan Kavanagh ]
   * Updated requestsync(1) to reflect the addition of the -k <keyid> and
-    removed a runon in DESCRIPTION. 
+    removed a runon in DESCRIPTION.
 
- -- Ryan Kavanagh <ryanakca@kubuntu.org>  Thu, 22 Nov 2007 11:50:36 -0500
+  [ Mathias Gug ]
+  * Add patch tag in submittodebian.
+
+  [ Luke Yelavich ]
+  * update-maintainer: Exit after displaying usage for --help.
+
+  [ Siegfried-Angel Gevatter Pujals (RainCT) ]
+  * pbuilder-dist: Move warning about changing $COMPONENTS's value to
+    the right place (it should be displayed if the installed version
+    of pbuilder is too old, not otherwise).
+
+ -- Siegfried-Angel Gevatter Pujals (RainCT) <sgevatter@ubuntu.cat>  Fri, 23 Nov 2007 22:07:58 +0100
 
 ubuntu-dev-tools (0.22) hardy; urgency=low
 

pbuilder-dist

@@ -191,5 +191,5 @@ sudo pbuilder $OPERATION \
     $( [ -z $DEBCACHE ] || echo "--aptcache $DEBCACHE" ) \
     --buildresult $BASE_DIR/${FOLDERBASE}_result \
     --mirror "$ARCHIVE" \
-    $@	\
-    $COMPONENTS_LINE 
+    $COMPONENTS_LINE \
+    $@

submittodebian

@@ -72,7 +72,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 hardy ubuntu-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 hardy 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):

update-maintainer

@@ -34,6 +34,7 @@ for argv in "$@"; do
         ;;
         "--help")
             usage
+            exit 0
         ;;
         *)
             echo "Bad parameter."