Merge lp:~andrewsomething/bzr-builddeb/BTS711042 into lp:bzr-builddeb

[Andrew Starr-Bochicchio]

This fixes Debian BTS: #711042

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=711042

  * tests/blackbox/test_import_dsc.py:
   - Explicitly pass '--format=1.0' to dpkg-source inorder to
     silence "no source format specified" warnings printed to
     stderr (Closes: #711042).

It also includes the changes from lp:~andrewsomething/bzr-builddeb/spring_cleaning

https://code.launchpad.net/~andrewsomething/bzr-builddeb/spring_cleaning/+merge/165247

That branch has been pushed to Alioth and uploaded to Debian. It hasn't actually landed in lp:bzr-builddeb though. It was approved by Jelmer.

[Jelmer Vernooij (jelmer)]

On Sun, Jun 09, 2013 at 06:51:24PM -0000, Andrew Starr-Bochicchio wrote:
> Andrew Starr-Bochicchio has proposed merging lp:~andrewsomething/bzr-builddeb/BTS711042 into lp:bzr-builddeb.
>
> Requested reviews:
> Bzr-builddeb-hackers (bzr-builddeb-hackers)
>
> For more details, see:
> https://code.launchpad.net/~andrewsomething/bzr-builddeb/BTS711042/+merge/168299
>
> This fixes Debian BTS: #711042
>
> http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=711042
>
> * tests/blackbox/test_import_dsc.py:
> - Explicitly pass '--format=1.0' to dpkg-source inorder to
> silence "no source format specified" warnings printed to
> stderr (Closes: #711042).
>
> It also includes the changes from lp:~andrewsomething/bzr-builddeb/spring_cleaning
>
> https://code.launchpad.net/~andrewsomething/bzr-builddeb/spring_cleaning/+merge/165247
>
> That branch has been pushed to Alioth and uploaded to Debian. It hasn't actually landed in lp:bzr-builddeb though. It was approved by Jelmer.

  review approve

Cheers,

Jelmer

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-03 22:33:39 +0000
+++ debian/changelog	2013-06-09 18:50:32 +0000
@@ -1,3 +1,24 @@
+bzr-builddeb (2.8.7) UNRELEASED; urgency=low
+
+  * tests/blackbox/test_import_dsc.py:
+   - Explicitly pass '--format=1.0' to dpkg-source inorder to
+     silence "no source format specified" warnings printed to
+     stderr (Closes: #711042).
+
+ -- Andrew Starr-Bochicchio <[e-mail]>  Sun, 09 Jun 2013 14:38:31 -0400
+
+bzr-builddeb (2.8.6) unstable; urgency=low
+
+  * Team upload.
+  * Upload to unstable.
+  * Move to minimal dh style rules file. 
+  * Drop bzr-svn from Build-Depends-Indep and Suggests (Closes: #709288).
+  * Bump Standards-Version to 3.9.4, no changes needed.
+  * Drop deprecated debian/pycompat and debian/pyversions files.
+  * Add autopkgtests.
+
+ -- Andrew Starr-Bochicchio <[e-mail]>  Wed, 22 May 2013 14:03:43 -0400
+
 bzr-builddeb (2.8.5) experimental; urgency=low
 
   * Cope with quilt output being empty in error message. LP: #1014543

=== modified file 'debian/compat'
--- debian/compat	2006-08-15 21:34:50 +0000
+++ debian/compat	2013-06-09 18:50:32 +0000
@@ -1,1 +1,1 @@
-5
+9

=== modified file 'debian/control'
--- debian/control	2012-12-03 22:28:44 +0000
+++ debian/control	2013-06-09 18:50:32 +0000
@@ -3,18 +3,19 @@
 Priority: optional
 Maintainer: Debian Bazaar Maintainers <[e-mail]>
 Uploaders: James Westby <[e-mail]>
-Build-Depends: debhelper (>= 5.0.37.2), python-all (>= 2.6.6-3), xz-utils
-Build-Depends-Indep: bzr (>= 2.1~), python-docutils, python-debian (>= 0.1.11), python-apt, patchutils, python-testtools (>= 0.9.2), pristine-tar, devscripts (>= 2.10.59), python-subunit, python-bzrlib.tests | bzr (<< 2.4.0~beta1-2), python-lzma, libalgorithm-merge-perl, python-distro-info, quilt, bzr-svn
+Build-Depends: debhelper (>= 9), python-all (>= 2.6.6-3), xz-utils
+Build-Depends-Indep: bzr (>= 2.1~), python-docutils, python-debian (>= 0.1.11), python-apt, patchutils, python-testtools (>= 0.9.2), pristine-tar, devscripts (>= 2.10.59), python-subunit, python-bzrlib.tests | bzr (<< 2.4.0~beta1-2), python-lzma, libalgorithm-merge-perl, python-distro-info, quilt
 Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzr-builddeb/unstable
 Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-bazaar/bzr-builddeb/unstable
 X-Python-Version: >= 2.4
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
+XS-Testsuite: autopkgtest
 
 Package: bzr-builddeb
 Architecture: all
 Depends: bzr (>= 2.1~), python-debian (>= 0.1.11), python-apt, ${python:Depends}, dpkg-dev, fakeroot, devscripts (>= 2.10.59), patchutils, pristine-tar, quilt, ${misc:Depends}
 Recommends: python-launchpadlib, libalgorithm-merge-perl, python-distro-info
-Suggests: bzr-svn (>= 0.4.10), python-lzma
+Suggests: python-lzma
 Provides: bzr-buildpackage
 Description: bzr plugin for Debian package management
  bzr-builddeb is a plugin for the bzr version control system that helps to

=== removed file 'debian/pycompat'
--- debian/pycompat	2006-09-17 15:19:19 +0000
+++ debian/pycompat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2

=== removed file 'debian/pyversions'
--- debian/pyversions	2006-08-16 16:41:19 +0000
+++ debian/pyversions	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2.4-

=== modified file 'debian/rules'
--- debian/rules	2012-01-16 00:25:08 +0000
+++ debian/rules	2013-06-09 18:50:32 +0000
@@ -10,18 +10,8 @@
 rst_docs=$(wildcard $(addsuffix /*.rst, $(doc_dir)))
 html_docs=$(patsubst %.rst, %.html, $(rst_docs))
 
-%.html: %.rst
-	rst2html --stylesheet-path=$(doc_dir)/user_manual.css $< > $@
-
-docs: $(html_docs)
-
-build-indep: $(PYVERS:%=build-python%) docs
-	rst2html README > README.html
-	touch $@
-
-build-arch:
-
-build: build-indep
+%:
+	dh $* --with python2 --buildsystem=python_distutils
 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 SELFTEST_CONCURRENCY = BZR_CONCURRENCY=$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -31,53 +21,20 @@
 SELFTEST_PARALLEL =
 endif
 
-build-python%:
-	python$* setup.py build
+override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	$(SELFTEST_CONCURRENCY) BZR_PLUGINS_AT=builddeb@$(CURDIR) python$* /usr/bin/bzr selftest \
 	    $(SELFTEST_PARALLEL) -v -s bp.builddeb
 endif
-	touch $@-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp install-all-stamp build-python*-stamp
+
+%.html: %.rst
+	rst2html --stylesheet-path=$(doc_dir)/user_manual.css $< > $@
+
+override_dh_auto_build-indep: $(html_docs)
+	rst2html README > README.html
+
+override_dh_auto_clean:
+	dh_auto_clean
 	rm -f $(html_docs)
 	rm -f README.html
 
-	python setup.py clean --all
-	dh_clean
-
-install: build-indep $(PYVERS:%=install-python%)
-
-install-all-stamp:
-	dh_testdir
-	dh_testroot
-	dh_clean
-	dh_installdirs
-	touch install-all-stamp
-
-install-python%: install-all-stamp
-	python$* setup.py install --root=$(CURDIR)/debian/bzr-builddeb --no-compile --install-layout=deb
-
-binary-indep: build-indep install
-	dh_testdir
-	dh_testroot
-	dh_install
-	dh_installchangelogs
-	dh_installdocs
-	dh_installexamples
-	dh_compress
-	dh_fixperms
-	dh_python2
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-arch: build-arch install
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install build-arch build-indep

=== added directory 'debian/tests'
=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2013-06-09 18:50:32 +0000
@@ -0,0 +1,3 @@
+Tests: testsuite
+Depends: @, python-bzrlib.tests, python-subunit, python-testtools, python-lzma
+Features: no-build-needed

=== added file 'debian/tests/testsuite'
--- debian/tests/testsuite	1970-01-01 00:00:00 +0000
+++ debian/tests/testsuite	2013-06-09 18:50:32 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Disable the doctest bzrlib.plugins.builddeb.config.DebBuildConfig.__init__
+# as it wants to find sample conf files from the source tree that are not
+# guaranteed to actually exist.
+/usr/bin/bzr selftest -s bp.builddeb --parallel=fork \
+    -x bzrlib.plugins.builddeb.config.DebBuildConfig.__init__

=== modified file 'info.py'
--- info.py	2012-06-18 15:50:12 +0000
+++ info.py	2013-06-09 18:50:32 +0000
@@ -18,7 +18,7 @@
 
 bzr_plugin_name = 'builddeb'
 
-bzr_plugin_version = (2, 8, 5, 'dev', 0)
+bzr_plugin_version = (2, 8, 6, 'final', 0)
 
 bzr_commands = [
     "test_builddeb",

=== modified file 'tests/blackbox/test_import_dsc.py'
--- tests/blackbox/test_import_dsc.py	2011-11-03 14:07:41 +0000
+++ tests/blackbox/test_import_dsc.py	2013-06-09 18:50:32 +0000
@@ -85,8 +85,10 @@
         upstream_dir = self.make_upstream_tarball(upstream_version)
         debian_dir = os.path.join(upstream_dir, 'debian')
         self.make_debian_dir(debian_dir, version=version)
-        proc = subprocess.Popen('dpkg-source -b %s' % upstream_dir,
-                            shell=True, stdout=subprocess.PIPE)
+        proc = subprocess.Popen('dpkg-source -b --format=1.0 %s' % \
+                                upstream_dir,
+                                shell=True,
+                                stdout=subprocess.PIPE)
         proc.wait()
         self.assertEqual(proc.returncode, 0)
         shutil.rmtree(upstream_dir)

=== modified file 'version.py'
--- version.py	2009-03-08 23:05:19 +0000
+++ version.py	2013-06-09 18:50:32 +0000
@@ -26,5 +26,5 @@
 # releaselevel of 'dev' for unreleased under-development code.
 #
 # Please set this to 'final' before upload.
-version_info = (2, 1, 2, 'dev', 0)
+version_info = (2, 8, 6, 'final', 0)