diff -Nru subunit-0.0.10/debian/changelog subunit-0.0.10/debian/changelog --- subunit-0.0.10/debian/changelog 2013-05-11 09:57:56.000000000 +0200 +++ subunit-0.0.10/debian/changelog 2013-08-05 11:12:00.000000000 +0200 @@ -1,3 +1,28 @@ +subunit (0.0.10-2.1) unstable; urgency=low + + * Non-maintainer upload. + + [ Scott Kitterman ] + * Switch python{3}-all-dev build-depends to python{3}-all because there + is no architecture specific python{3} content in the package + (Closes: #709540). + * Drop unneeded python{3}:Provides - not generally useful and + specifically not appropriate for arch all packages. + + [ Luca Falavigna ] + * debian/patches/AM_PROG_AR.patch: + - Define AM_PROG_AR macro, fix FTBFS (Closes: 712203). + * debian/control: + - Add ${python3:Depends} in Depends fields, where needed + (Closes: #708077). + * debian/rules: + - Remove ar-lib and test-driver during clean phase. + - Remove unneeded Python files after they have been put in their + install locations. + - Override python3 shebang to always be /usr/bin/python3. + + -- Luca Falavigna Mon, 05 Aug 2013 11:03:54 +0200 + subunit (0.0.10-2) unstable; urgency=low * Uploading to unstable. diff -Nru subunit-0.0.10/debian/control subunit-0.0.10/debian/control --- subunit-0.0.10/debian/control 2012-11-05 22:23:05.000000000 +0100 +++ subunit-0.0.10/debian/control 2013-08-05 11:06:26.000000000 +0200 @@ -4,9 +4,8 @@ Maintainer: Jelmer Vernooij Uploaders: Robert Collins Build-Depends: debhelper (>= 9), - python-dev (>= 2.6.6-3), - python-all-dev (>= 2.6.6-3), - python3-all-dev, + python-all (>= 2.6.6-3), + python3-all , autoconf (>= 2.59), automake, libtool, @@ -26,7 +25,7 @@ Package: subunit Architecture: all Depends: python-subunit (>= ${source:Version}), ${perl:Depends}, - libsubunit-perl (>= ${source:Version}), ${misc:Depends}, ${python:Depends}, python + libsubunit-perl (>= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${python3:Depends} Recommends: python-gtk2, python-junitxml Description: command line tools for processing Subunit streams subunit is a protocol for test activity serialisation deserialisation. This @@ -51,8 +50,7 @@ Package: python-subunit Architecture: all -Provides: ${python:Provides} -Depends: ${python:Depends}, ${misc:Depends}, +Depends: ${python:Depends}, ${python3:Depends}, ${misc:Depends}, python-testtools (>= 0.9.4) Section: python Description: unit testing protocol - Python bindings to generate and consume streams @@ -64,7 +62,6 @@ Package: python3-subunit Architecture: all -Provides: ${python3:Provides} Depends: ${python3:Depends}, ${misc:Depends}, python3-testtools (>= 0.9.4) Section: python diff -Nru subunit-0.0.10/debian/patches/AM_PROG_AR.patch subunit-0.0.10/debian/patches/AM_PROG_AR.patch --- subunit-0.0.10/debian/patches/AM_PROG_AR.patch 1970-01-01 01:00:00.000000000 +0100 +++ subunit-0.0.10/debian/patches/AM_PROG_AR.patch 2013-08-05 11:06:26.000000000 +0200 @@ -0,0 +1,12 @@ +Index: subunit-0.0.10/configure.ac +=================================================================== +--- subunit-0.0.10.orig/configure.ac 2013-08-05 08:07:41.000000000 +0000 ++++ subunit-0.0.10/configure.ac 2013-08-05 08:08:52.177248475 +0000 +@@ -19,6 +19,7 @@ + AC_USE_SYSTEM_EXTENSIONS + AC_PROG_CC + AC_PROG_CXX ++m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) + AM_PROG_CC_C_O + AC_PROG_INSTALL + AC_PROG_LN_S diff -Nru subunit-0.0.10/debian/patches/series subunit-0.0.10/debian/patches/series --- subunit-0.0.10/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ subunit-0.0.10/debian/patches/series 2013-08-05 11:06:26.000000000 +0200 @@ -0,0 +1 @@ +AM_PROG_AR.patch diff -Nru subunit-0.0.10/debian/rules subunit-0.0.10/debian/rules --- subunit-0.0.10/debian/rules 2013-02-27 20:10:36.000000000 +0100 +++ subunit-0.0.10/debian/rules 2013-08-05 11:06:26.000000000 +0200 @@ -12,7 +12,7 @@ override_dh_auto_clean: $(MAKE) distclean || true - rm -rf build python_subunit.egg-info + rm -rf build python_subunit.egg-info ar-lib test-driver rm -rf debian/tmp rm -f configure perl/MYMETA.yml cp -rf debian/upstream-orig-files/* . @@ -26,9 +26,6 @@ override_dh_auto_install: $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp - find debian/tmp/ -name "*.pyc" | xargs rm -f - find debian/tmp/ -name "__pycache__" | xargs rm -f - find debian/tmp/ -name "*.pyo" | xargs rm -f mkdir debian/tmp/usr/share mv debian/tmp/usr/lib/perl5 debian/tmp/usr/share/perl5 for vers in $(PY3VERS); do \ @@ -37,6 +34,12 @@ for vers in $(PYVERS); do \ python$$vers setup.py install --install-layout=deb --single-version-externally-managed --root=$(CURDIR)/debian/tmp; \ done + find debian/tmp/ -name "*.pyc" | xargs rm -f + find debian/tmp/ -name "__pycache__" | xargs rm -fr + find debian/tmp/ -name "*.pyo" | xargs rm -f + +override_dh_python3: + dh_python3 --shebang=/usr/bin/python3 %: dh $* --with python2,python3