diff -Nru dbus-python-1.2.0/debian/changelog dbus-python-1.2.0/debian/changelog --- dbus-python-1.2.0/debian/changelog 2016-01-19 11:46:17.000000000 +0000 +++ dbus-python-1.2.0/debian/changelog 2016-01-20 09:39:50.000000000 +0000 @@ -1,26 +1,18 @@ -dbus-python (1.2.0-2build4) xenial; urgency=medium +dbus-python (1.2.0-3) unstable; urgency=medium - * No-change rebuild to drop python3.4 support. + * Update Vcs-Browser to use https and cgit + * python-dbus: stop depending on python-dbus-dev (Closes: #673779) + * Standards-Version: 3.9.6 (no changes required) + * Install arch-independent documentation and development files + with "make install-data", fixing FTBFS in arch-all-only builds + * Build-depend on dh-python + - transcode debian/rules to UTF-8 to support this + * d/control: mention dbus.mainloop.pyqt5 instead of dbus.mainloop.qt. + Thanks to Dmitry Shachnev. (Part of #802659) + * d/control: stop mentioning python-gobject-2 as an alternative. + to python-gi. Thanks to Dmitry Shachnev. (Part of #802659) - -- Matthias Klose Tue, 19 Jan 2016 11:46:17 +0000 - -dbus-python (1.2.0-2build3) wily; urgency=medium - - * No-change rebuild for python3.5 transition - - -- Steve Langasek Wed, 22 Jul 2015 06:32:22 +0000 - -dbus-python (1.2.0-2build2) trusty; urgency=medium - - * No-change rebuild to drop Python 3.3 support. - - -- Matthias Klose Sun, 23 Mar 2014 15:28:20 +0000 - -dbus-python (1.2.0-2build1) trusty; urgency=medium - - * Rebuild to add Python 3.4 support. - - -- Colin Watson Wed, 25 Dec 2013 13:04:49 +0000 + -- Simon McVittie Wed, 20 Jan 2016 09:39:43 +0000 dbus-python (1.2.0-2) unstable; urgency=low diff -Nru dbus-python-1.2.0/debian/control dbus-python-1.2.0/debian/control --- dbus-python-1.2.0/debian/control 2015-07-22 06:32:22.000000000 +0000 +++ dbus-python-1.2.0/debian/control 2016-01-20 09:39:50.000000000 +0000 @@ -1,8 +1,7 @@ Source: dbus-python Section: devel Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Utopia Maintenance Team +Maintainer: Utopia Maintenance Team Uploaders: Sjoerd Simons , Sebastian Dröge , Simon McVittie , @@ -11,6 +10,7 @@ automake, debhelper (>= 9), dh-autoreconf, + dh-python, dpkg-dev (>= 1.16.1), python-all-dbg (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~), @@ -23,23 +23,20 @@ xmlto Build-Depends-Indep: python-docutils, python-epydoc (>= 3.0~beta1) -Standards-Version: 3.9.4 +Standards-Version: 3.9.6 X-Python-Version: >= 2.6 X-Python3-Version: >= 3.2 Homepage: http://www.freedesktop.org/wiki/Software/DBusBindings#Python Vcs-Git: git://anonscm.debian.org/pkg-utopia/dbus-python.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-utopia/dbus-python.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-utopia/dbus-python.git Package: python-dbus Section: python Architecture: any -# Depends on python-dbus-dev for backwards compatibility, until packages -# are fixed to depend on that directly Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, - python-dbus-dev -Recommends: python-gi | python-gobject-2 | python-qt4-dbus +Recommends: python-gi | python-qt4-dbus Suggests: python-dbus-doc, python-dbus-dbg Replaces: python2.4-dbus Conflicts: python2.4-dbus @@ -59,8 +56,6 @@ Package: python3-dbus Section: python Architecture: any -# Does not have Depends: python-dbus-dev because as a new package, it cannot -# have backwards compatibility concerns Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends} @@ -90,9 +85,10 @@ terms of complexity. . This package provides development files required to compile main-loop - integration modules for python-dbus, such as dbus.mainloop.qt provided - by PyQt. It is Python-version-independent: you must also depend on either - python-dbus or python3-dbus, if required. + integration modules for python-dbus, such as dbus.mainloop.pyqt5 provided + by PyQt. It is Python-version-independent: packages that build-depend + on python-dbus-dev should also build-depend on python-dbus, + python3-dbus, python-dbus-dbg and/or python3-dbus-dbg. Package: python-dbus-dbg Section: debug diff -Nru dbus-python-1.2.0/debian/python-dbus-doc.docs dbus-python-1.2.0/debian/python-dbus-doc.docs --- dbus-python-1.2.0/debian/python-dbus-doc.docs 2013-06-03 17:28:54.000000000 +0000 +++ dbus-python-1.2.0/debian/python-dbus-doc.docs 2016-01-20 09:39:50.000000000 +0000 @@ -1,7 +1,3 @@ -build-doc/api -doc/ -build-doc/doc/ -NEWS -README -build-doc/NEWS.html -build-doc/README.html +build-indep/api +build-indep/doc +doc diff -Nru dbus-python-1.2.0/debian/python-dbus-doc.install dbus-python-1.2.0/debian/python-dbus-doc.install --- dbus-python-1.2.0/debian/python-dbus-doc.install 1970-01-01 00:00:00.000000000 +0000 +++ dbus-python-1.2.0/debian/python-dbus-doc.install 2016-01-20 09:39:50.000000000 +0000 @@ -0,0 +1 @@ +usr/share/doc/python-dbus-doc diff -Nru dbus-python-1.2.0/debian/rules dbus-python-1.2.0/debian/rules --- dbus-python-1.2.0/debian/rules 2013-06-03 17:28:54.000000000 +0000 +++ dbus-python-1.2.0/debian/rules 2016-01-20 09:39:50.000000000 +0000 @@ -1,8 +1,8 @@ #!/usr/bin/make -f -# Copyright © 2002,2003 Colin Walters -# Copyright © 2003 Daniel Stone -# Copyright © 2006 Sjoerd Simons -# Copyright © 2012 Collabora Ltd. +# Copyright © 2002,2003 Colin Walters +# Copyright © 2003 Daniel Stone +# Copyright © 2006 Sjoerd Simons +# Copyright © 2012 Collabora Ltd. include /usr/share/dpkg/default.mk @@ -27,7 +27,12 @@ ; \ done override_dh_auto_configure-indep: - dh_auto_configure --builddirectory=build-doc + dh_auto_configure \ + --builddirectory=build-indep \ + -- \ + --libdir=/usr/lib \ + --docdir=/usr/share/doc/python-dbus-doc \ + ${NULL} override_dh_auto_build-arch: set -e && for x in $(FLAVOURS); do \ @@ -35,7 +40,7 @@ dh_auto_build --arch --builddirectory=build-$$x; \ done override_dh_auto_build-indep: - dh_auto_build --indep --builddirectory=build-doc + dh_auto_build --indep --builddirectory=build-indep override_dh_auto_test-arch: : @@ -104,7 +109,7 @@ # do not install any docs, we copy those from the builddir override_dh_auto_install-indep: - : + make -C build-indep install-data DESTDIR=$(CURDIR)/debian/tmp override_dh_install: rm -fr debian/tmp/usr/share/doc/dbus-python