Merge with trunk.

debian/changelog

@@ -9,6 +9,11 @@ ubuntu-dev-tools (0.24) UNRELEASED; urgency=low
   [ Cesare Tirabassi ]
   * Add man page for check-symbols (Thanks to Albert Damen - LP: #174123).
 
+  [ Michael Bienia ]
+  * requestsync:
+     - Set importance to wishlist.
+     - Strip some more whitespace.
+
   [ Siegfried-Angel Gevatter Pujals (RainCT) ]
   * what-patch:
      - Print a list of files that have been modified outside debian/
@@ -17,7 +22,7 @@ ubuntu-dev-tools (0.24) UNRELEASED; urgency=low
   * debian/control:
      - Bump standards version to 3.7.3
      - Move python-central to Build-Depends-Indep
-     - Rename XS-Vcs-* fields to Vcs-*
+     - Rename XS-Vcs-{Bzr,Browser} fields to Vcs-{Bzr,Browser}
      - Bump minimum cdbs version to 0.4.49
   * Add Albert Damen to the Authors and Copyright Holders
 

pbuilder-dist

@@ -1,7 +1,8 @@
 #!/bin/sh
-# Copyright (C) Jamin W. Collins <jcollins@asgardsrealm.net>
-#                and Jordan Mantha <mantha@ubuntu.com>
-# Copyright 2007 (C) Siegfried-A. Gevatter <siggi.gevatter@gmail.com>
+# Copyright by:
+#   Jamin W. Collins <jcollins@asgardsrealm.net>
+#   Jordan Mantha <mantha@ubuntu.com>
+#   Siegfried-A. Gevatter <siggi.gevatter@gmail.com>
 # License: GPLv2 or later
 #
 # This script is a wrapper to use pbuilder with many different

requestsync

@@ -42,7 +42,7 @@ def cur_deb_version(sourcepkg):
         print "%s doesn't appear to exist in Debian." % sourcepkg
         sys.exit(1)
    
-    return out.split('|')[1].rstrip('[]''').lstrip()
+    return out.split('|')[1].rstrip('[]''').strip()
 
     sys.exit(1)
 
@@ -76,7 +76,7 @@ def debian_component(sourcepkg):
     raw_comp = out.split('|')[2].split('/')
     component = 'main'
     if len(raw_comp) == 2:
-        component = raw_comp[1]
+        component = raw_comp[1].strip()
     return component
 
 def usage():
@@ -136,6 +136,7 @@ if newsource:
 
 report = ''' affects ubuntu%s
  status %s
+ importance wishlist
  subscribe %s
 
 Please sync %s %s (%s) from Debian unstable (%s).