Merge lp:~maxb/bzr-builddeb/python-debian-compat into lp:bzr-builddeb

[Max Bowsher]

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-23 21:00:50 +0000
+++ debian/changelog	2011-02-26 21:08:32 +0000
@@ -35,7 +35,11 @@
   * The deb: directory service has been renamed to apt: to avoid
     confusion.
 
- -- Jelmer Vernooij <[e-mail]>  Sun, 06 Feb 2011 14:25:32 +0100
+  [ Max Bowsher ]
+
+  * Add devscripts to Build-Depends-Indep, the test suite runs dch.
+
+ -- Max Bowsher <[e-mail]>  Sat, 26 Feb 2011 18:41:00 +0000
 
 bzr-builddeb (2.6) unstable; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2011-02-03 13:38:09 +0000
+++ debian/control	2011-02-26 21:08:32 +0000
@@ -4,7 +4,7 @@
 Maintainer: Debian Bazaar Maintainers <[e-mail]>
 Uploaders: Reinhard Tartler <[e-mail]>, James Westby <[e-mail]>, Jelmer Vernooij <[e-mail]>
 Build-Depends: debhelper (>= 5.0.37.2), python-all (>= 2.3.5-11)
-Build-Depends-Indep: bzr (>= 2.1~), python-central (>= 0.5.8), python-docutils, python-debian (>= 0.1.11), python-apt, patchutils, python-testtools (>= 0.9.2), pristine-tar
+Build-Depends-Indep: bzr (>= 2.1~), python-central (>= 0.5.8), python-docutils, python-debian (>= 0.1.11), python-apt, patchutils, python-testtools (>= 0.9.2), pristine-tar, devscripts
 Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzr-builddeb/unstable
 Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-bazaar/bzr-builddeb/unstable
 XS-Python-Version: >= 2.4

=== modified file 'util.py'
--- util.py	2011-02-04 11:30:52 +0000
+++ util.py	2011-02-26 21:08:32 +0000
@@ -668,7 +668,7 @@
 
     # If the package doesn't have a debian revision then it must be native.
     if version is not None:
-        version_native = (not version.debian_revision)
+        version_native = (not version.debian_version)
     else:
         version_native = None