Merge lp:~maxb/bzr-builddeb/testfix into lp:bzr-builddeb

[Max Bowsher]

Add devscripts to Build-Depends-Indep, the test suite runs dch.

[Jelmer Vernooij (jelmer)]

review: Approve

[lp:~maxb/bzr-builddeb/testfix]

528. By Max Bowsher on 2011-02-27

Merge trunk, resolve changelog conflict.

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-27 02:08:17 +0000
+++ debian/changelog	2011-02-27 11:19:14 +0000
@@ -37,6 +37,10 @@
   * When building with distribution set to UNRELEASED, it is now assumed
     the build is targetted at the same distribution as the build before.
 
+  [ Max Bowsher ]
+
+  * Add devscripts to Build-Depends-Indep, the test suite runs dch.
+
  -- Jelmer Vernooij <[e-mail]>  Sun, 27 Feb 2011 03:08:09 +0100
 
 bzr-builddeb (2.6) unstable; urgency=low
 
=== modified file 'debian/control'
--- debian/control	2011-02-03 13:38:09 +0000
+++ debian/control	2011-02-27 11:19:14 +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