merge

debian/changelog

@@ -1,10 +1,36 @@
-ubuntu-dev-tools (0.16) UNRELEASED; urgency=low
+ubuntu-dev-tools (0.19) UNRELEASED; urgency=low
 
   * requestsync: allow to customize the SMTP server (LP: #144244)
   * Add a short description for requestsync to the README file.
 
  -- Siegfried-Angel Gevatter Pujals (RainCT) <siggi.gevatter@gmail.com>  Mon,  1 Oct 2007 18:04:14 +0200
 
+ubuntu-dev-tools (0.18) gutsy; urgency=low
+
+  * requestsync: add an option to "Add latest debian version to the title of
+    the bug" (LP: #132221)
+
+ -- Marco Rodrigues <gothicx@sapo.pt>  Fri, 05 Oct 2007 14:16:34 +0200
+
+ubuntu-dev-tools (0.17) gutsy; urgency=low
+
+  * submittodebian: backed out changes from last upload. This needs Debian Bug
+    445144 fixed.
+  * debian/control: don't Depends on a version of reportbug Ubuntu does not
+    have yet.
+
+ -- Daniel Holbach <daniel.holbach@ubuntu.com>  Fri, 05 Oct 2007 11:44:51 +0200
+
+ubuntu-dev-tools (0.16) gutsy; urgency=low
+
+  [ Lucas Nussbaum ]
+  * Added support for Bugs/Debian/Usertagging in submittodebian.
+
+  [ Daniel Holbach ]
+  * setup.py: actually install submittodebian.
+
+ -- Daniel Holbach <daniel.holbach@ubuntu.com>  Fri, 05 Oct 2007 11:05:29 +0200
+
 ubuntu-dev-tools (0.15) gutsy; urgency=low
 
   [ Laurent Bigonville ]

debian/control

@@ -12,7 +12,7 @@ Standards-Version: 3.7.2
 Package: ubuntu-dev-tools
 Architecture: all
 Section: devel
-Depends: ${python:Depends}, ${misc:Depends}, binutils, devscripts, sudo, python-launchpad-bugs (>= 0.2.14)
+Depends: ${python:Depends}, ${misc:Depends}, binutils, devscripts, sudo, python-launchpad-bugs (>= 0.2.14), reportbug
 Recommends: bzr, pbuilder
 Conflicts: devscripts (<< 2.10.7ubuntu5)
 Replaces: devscripts (<< 2.10.7ubuntu5)

requestsync

@@ -27,6 +27,24 @@ def cur_version_component(sourcepkg, release):
     print "%s doesn't appear to exist in %s, specify -n for a package not in Ubuntu." % (sourcepkg, release)
     sys.exit(1)
 
+def cur_deb_version(sourcepkg):
+    ''' Return the current debian version of a package in unstable '''
+    madison = subprocess.Popen(['rmadison', '-u', 'debian', '-a', 'source', \
+                                '-s', 'unstable', sourcepkg], \
+                               stdout=subprocess.PIPE)
+    out = madison.communicate()[0]
+    assert (madison.returncode == 0)
+
+    try:
+        assert out
+    except AssertionError:
+        print "%s doesn't appear to exist in Debian." % sourcepkg
+        sys.exit(1)
+   
+    return out.split('|')[1].rstrip('[]''').lstrip()
+
+    sys.exit(1)
+
 def debian_changelog(sourcepkg, component, version):
     '''Return the Debian changelog from the latest up to the given version
     (exclusive).'''
@@ -54,7 +72,7 @@ def debian_component(sourcepkg):
     except AssertionError:
         print "%s doesn't appear to exist in Debian." % sourcepkg
         sys.exit(1)
-    raw_comp = out.split(' | ')[2].split('/')
+    raw_comp = out.split('|')[2].split('/')
     component = 'main'
     if len(raw_comp) == 2:
         component = raw_comp[1]
@@ -65,7 +83,7 @@ def usage():
 
 In some cases, the base version (fork point from Debian) cannot be determined
 automatically, and you'll get a complete Debian changelog. Specify the correct
-base version in that case."""
+base version of the package in Ubuntu."""
     sys.exit(1)
 
 #
@@ -103,6 +121,7 @@ debiancomponent = debian_component(srcpkg)
 # generate bug report
 status = "confirmed"
 subscribe = "ubuntu-archive"
+deb_version = cur_deb_version(srcpkg)
 if sponsorship:
     status = "new"
     if component in ['main', 'restricted']:
@@ -118,8 +137,8 @@ report = ''' affects ubuntu%s
  status %s
  subscribe %s
 
-Please sync %s (%s) from Debian unstable (%s).
-''' % (affects, status, subscribe, srcpkg, component, debiancomponent)
+Please sync %s %s (%s) from Debian unstable (%s).
+''' % (affects, status, subscribe, srcpkg, deb_version, component, debiancomponent)
 
 base_ver = cur_ver
 uidx = base_ver.find('ubuntu')
@@ -166,9 +185,9 @@ to = 'new@bugs.launchpad.net'
 
 mail = '''From: %s
 To: %s
-Subject: Please sync %s (%s) from Debian unstable (%s)
+Subject: Please sync %s %s (%s) from Debian unstable (%s)
 
-%s''' % (myemailaddr, to, srcpkg, component, debiancomponent, signed_report)
+%s''' % (myemailaddr, to, srcpkg, deb_version, component, debiancomponent, signed_report)
 
 print mail
 

setup.py

@@ -28,7 +28,8 @@ setup(name='ubuntu-dev-tools',
                'ppaput',
                'requestsync',
 	       'hugdaylist',
-	       'massfile'
+	       'massfile',
+	       'submittodebian'
   	       ],
 )