Update to the new python-debian version:

- Depend on python-debian >= 1.1.15
 - Replace imports of debian_bundle with debian to fix the deprecation
   warnings.

debian/changelog

@@ -26,7 +26,13 @@ ubuntu-dev-tools (0.100) UNRELEASED; urgency=low
     - support adding existing patches (e.g. from launchpad)
       thanks to David Futcher (LP: #586787)
 
- -- Benjamin Drung <bdrung@ubuntu.com>  Thu, 03 Jun 2010 21:32:01 +0200
+  [ Michael Bienia ]
+  * Update to the new python-debian version:
+    - Depend on python-debian >= 1.1.15
+    - Replace imports of debian_bundle with debian to fix the deprecation
+      warnings.
+
+ -- Michael Bienia <geser@ubuntu.com>  Tue, 08 Jun 2010 19:08:24 +0200
 
 ubuntu-dev-tools (0.99) lucid; urgency=low
 

debian/control

@@ -13,7 +13,7 @@ Standards-Version: 3.8.4
 Package: ubuntu-dev-tools
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}, binutils, devscripts, sudo,
- python-debian, python-launchpadlib (>= 1.5.7), dctrl-tools, lsb-release, diffstat,
+ python-debian (>= 1.1.15), python-launchpadlib (>= 1.5.7), dctrl-tools, lsb-release, diffstat,
  dpkg-dev, python-apt (>= 0.7.93~), python-lazr.restfulclient
 Recommends: bzr, pbuilder | cowdancer | sbuild, reportbug (>= 3.39ubuntu1),
  ca-certificates, debootstrap, genisoimage, perl-modules, libwww-perl,

requestsync

@@ -28,7 +28,7 @@
 
 import sys
 from optparse import OptionParser
-from debian_bundle.changelog import Version
+from debian.changelog import Version
 
 # ubuntu-dev-tools modules
 from ubuntutools.lp import udtexceptions

submittodebian

@@ -26,7 +26,7 @@ import re, os, sys
 from tempfile import mkstemp
 
 try:
-	from debian_bundle.changelog import Changelog
+	from debian.changelog import Changelog
 except ImportError:
 	print 'This utility requires modules from the «python-debian» package, which isn\'t currently installed.'
 	sys.exit(1)

ubuntutools/requestsync/common.py

@@ -25,7 +25,7 @@ import urllib2
 import re
 import tempfile
 import subprocess
-from debian_bundle.changelog import Changelog
+from debian.changelog import Changelog
 
 def raw_input_exit_on_ctrlc(*args, **kwargs):
 	'''
@@ -63,8 +63,7 @@ def getDebianChangelog(srcpkg, version):
 
 	new_entries = ''
 	changelog = Changelog(changelog.read())
-	# see also Debian #539334
-	for block in changelog._blocks:
+	for block in changelog:
 		if block.version > version:
 			# see also Debian #561805
 			new_entries += unicode(str(block).decode('utf-8'))

ubuntutools/requestsync/mail.py

@@ -24,7 +24,7 @@ import sys
 import subprocess
 import smtplib
 import socket
-from debian_bundle.changelog import Version
+from debian.changelog import Version
 from ubuntutools.requestsync.common import raw_input_exit_on_ctrlc
 from ubuntutools.lp.udtexceptions import PackageNotFoundException