Released version 0.26 (with only some of the current changes); updated changelog. Other changes.

debian/changelog

@@ -1,4 +1,26 @@
-ubuntu-dev-tools (0.26) UNRELEASED; urgency=low
+ubuntu-dev-tools (0.27) UNRELEASED; urgency=low
+
+  [ Andrew Hunter ]
+  * Use install files as we have multiple binaries now.
+  * ppaput:
+    * Separated ppaput script from backend python modules (shipped in
+      python-ppaput). (LP: #192184)
+    * Switched from homegrown option parseing to Optparse, much more
+      robust and less code duplication.
+
+  [ Siegfried-Angel Gevatter Pujals (RainCT) ]
+  * Remove wrong element from doc/ppaput.1.docbook.
+  * Move ppaput.py into new python_modules/directory and remove
+    it's shabang.
+  * Write a description for the new python-ubuntu-utils binary
+    package in debian/control. Add a "Suggests: ubuntu-dev-tools".
+  * Check for reportbug being installed in submittodebian. Replace
+    reportbug dependency with a Recommends.
+  * Remove debian/pycompat.
+
+ -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com>  Sun, 17 Feb 2008 22:05:00 +0100
+
+ubuntu-dev-tools (0.26) hardy; urgency=low
 
   [ Stephan Hermann ]
   * pbuild-dist: fixed a bug with the *sudo call.
@@ -12,14 +34,6 @@ ubuntu-dev-tools (0.26) UNRELEASED; urgency=low
       (LP: #190351)
     * Exit, if versions in Ubuntu and Debian are the same already.
 
-  [ Andrew Hunter ]
-  * Use install files as we have multiple binaries now.
-  * ppaput:
-    * Separated ppaput script from backend python modules (shipped in
-      python-ppaput). (LP: #192184)
-    * Switched from homegrown option parseing to Optparse, much more
-      robust and less code duplication.
-
   [ Siegfried-Angel Gevatter Pujals (RainCT) ]
   * Add manpages for update-maintainer and 404main.
   * Move pbuilder-dist.bash_completion into new bash_completion/
@@ -31,7 +45,7 @@ ubuntu-dev-tools (0.26) UNRELEASED; urgency=low
     doc/suspicious-source.1.
   * Fix some issues with the new pbuilder-dist code.
 
- -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com>  Sun, 17 Feb 2008 17:36:11 +0100
+ -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com>  Sun, 17 Feb 2008 19:35:46 +0100
 
 ubuntu-dev-tools (0.25) hardy; urgency=low
 

debian/control

@@ -13,8 +13,8 @@ Standards-Version: 3.7.3
 Package: ubuntu-dev-tools
 Architecture: all
 Section: devel
-Depends: ${python:Depends}, ${misc:Depends}, binutils, devscripts, sudo, python-launchpad-bugs (>= 0.2.25), reportbug (>= 3.39ubuntu1), python-debian, dctrl-tools, lsb-release, python-ppaput
-Recommends: bzr, pbuilder
+Depends: ${python:Depends}, ${misc:Depends}, binutils, devscripts, sudo, python-launchpad-bugs (>= 0.2.25), python-debian, dctrl-tools, lsb-release
+Recommends: bzr, pbuilder, python-ubuntu-utils, reportbug (>= 3.39ubuntu1)
 Conflicts: devscripts (<< 2.10.7ubuntu5)
 Replaces: devscripts (<< 2.10.7ubuntu5)
 XB-Python-Version: ${python:Versions}
@@ -23,11 +23,16 @@ Description: useful tools for Ubuntu developers
  make their packaging work a lot easier. Such tools can include bug
  filing, packaging preparation, package analysis, etc.
 
-Package: python-ppaput
+Package: python-ubuntu-utils
 Architecture: all
 Section: python
 Depends: ${python:Depends}
+Suggests: ubuntu-dev-tools
 XB-Python-Version: ${python:Versions}
-Description: python module for uploading to PPAs.
- python-ppaput is a python module that abstracts the process of creating and
- uploading Debian source packages to Personal Package Archives.
+Description: useful Python modules for Ubuntu developers
+ This is a collection of useful Python modules that people interested
+ in Ubuntu development might find interesting. Those include:
+ .
+  * ppaput: a Python module that abstracts the process of creating and
+    uploading Debian source packages to Launchpad's Personal Package
+    Archives.

debian/pycompat

@@ -1 +0,0 @@
-2

debian/rules

@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM       := pycentral
+DEB_PYTHON_SYSTEM := pycentral
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk

doc/ppaput.1.docbook

@@ -73,7 +73,7 @@
       the bug report.
     </para>
     <para>
-      If you use the <arg choice="opt"><option>-n</option></arg> option, it
+      If you use the <option>-n</option> option, it
       will also 1) file a bug and add 2) a (LP: #.....) header to the source
       package.
     </para>

doc/update-maintainer.1

@@ -22,7 +22,7 @@ Manually specify the section of the package. This is necessary if the
 package is not yet in the archive or if you don't have an Internet
 connection available when you run \fBupdate\-maintainer\fP.
 .TP
-\fB\-\-nochangelog\fP
+\fB\-\-nochangelog\fP, \fB\-\-no\-changelog\fP
 By default, \fBupdate\-maintainer\fP adds an entry to the changelog
 explaining that it changed the Maintainer field. If you don't want
 that to happen, use this option.

ppaput

@@ -1,10 +1,24 @@
 #!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Copyright 2007, Canonical, Daniel Holbach
+# License: GPLv3
+#
+# Builds a source package from the source tree you're currently in,
+# uploads it to PPA and follow up on a bug report, subscribe the right
+# sponsors and sets the right status - if you pass "-n" it will file a
+# bug report and add "(LP: #....)" and to the changelog.
 
 import os
 import sys
-import ppaput
 from optparse import OptionParser
 
+try:
+	import ppaput
+except ImportError:
+	print 'You need python-ubuntu-utils installed to use ppaput.'
+	sys.exit(1)
+
 USAGE = \
 """Usage: ppaput [-n] [<location>] [<debuild options>]
 

python_modules/ppaput.py

@@ -1,19 +1,8 @@
-#!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
 # Copyright 2007, Canonical, Daniel Holbach
-#
-# GPL 3
-#
-#
-# 11:57:27 < dholbach> but what it does is: build a source package of
-#                      the current source tree you're in, upload it to PPA
-#                      and follow up on a bug report, subscribe the right
-#                      sponsors, set the right status - if you pass "-n"
-#                      it will file a bug report, add a (LP: #....)  to
-#                      the changelog also
-# 11:57:37 < dholbach> I thought it'd help with our sponsoring process
-#
+# Modified by Andrew Hunter
+# License: GPLv3
 
 import re
 import os
@@ -23,14 +12,13 @@ import string
 try:
     import launchpadbugs.connector as Connector
 except:
-    print >> sys.stderr, \
-	"You need  python-launchpad-bugs (>= 0.2.14)  installed to use ppaput."
+    raise ImportError, "You need python-launchpad-bugs (>= 0.2.14) installed to use ppaput."
     sys.exit(1)
 
 #try:
 #    import apt
 #except:
-#    print >> sys.stderr, "You need  python-apt  installed to use ppaput."
+#    raise ImportError, "You need python-apt installed to use ppaput."
 #    sys.exit(1)
 
 def dput_check():

setup.py

@@ -33,5 +33,5 @@ setup(name='ubuntu-dev-tools',
                'get-build-deps',
                'dgetlp'
             ],
-    py_modules=['ppaput'],
+    py_modules=['modules/ppaput.py'],
 )

submittodebian

@@ -28,6 +28,10 @@ except ImportError:
 	print 'This utility requires modules from the «python-debian» package, which isn\'t currently installed.'
 	sys.exit(1)
 
+if not os.path.exists('/usr/bin/reportbug'):
+	print 'This utility requires the «reportbug» package, which isn\'t currently installed.'
+	sys.exit(1)
+
 def get_most_recent_debian_version(changelog):
 	for v in changelog.get_versions():
 		if not re.search('(ubuntu|build)', v.full_version):