diff options
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/control | 20 | ||||
| -rw-r--r-- | debian/python3-dbus-tests.lintian-overrides | 2 | ||||
| -rwxr-xr-x | debian/rules | 37 | ||||
| -rw-r--r-- | debian/tests/control | 1 |
5 files changed, 22 insertions, 47 deletions
diff --git a/debian/changelog b/debian/changelog index b9d9c92..0da4ea2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +dbus-python (1.2.18-3) unstable; urgency=medium + + * Don't do a separate build for python3.x-dbg (Closes: #994299) + * Update lintian overrides + * d/rules: Don't let debhelper >= 13.4 make test data executable + * Standards-Version: 4.6.0 (no changes required) + + -- Simon McVittie <smcv@debian.org> Wed, 15 Sep 2021 16:46:27 +0100 + dbus-python (1.2.18-2) unstable; urgency=medium * Upload to unstable diff --git a/debian/control b/debian/control index 999614a..f4eeb06 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,6 @@ Build-Depends: dpkg-dev (>= 1.16.1), libdbus-1-dev (>= 1.8), libglib2.0-dev (>= 2.40), - python3-all-dbg, python3-all-dev, python3-gi, python3-tap <!nocheck>, @@ -26,7 +25,7 @@ Build-Depends-Indep: python3-sphinx, python3-sphinx-rtd-theme, Rules-Requires-Root: no -Standards-Version: 4.5.1 +Standards-Version: 4.6.0 Homepage: https://www.freedesktop.org/wiki/Software/DBusBindings#Python Vcs-Git: https://salsa.debian.org/debian/dbus-python.git Vcs-Browser: https://salsa.debian.org/debian/dbus-python @@ -47,8 +46,7 @@ Description: main loop integration development files for python3-dbus integration modules for python3-dbus, such as dbus.mainloop.pyqt5 provided by PyQt. It is Python-version-independent, and was shared between Python 3 and Python 2 when Python 2 was supported in Debian, so packages that - build-depend on python-dbus-dev should also build-depend on python3-dbus - and/or python3-dbus-dbg. + build-depend on python-dbus-dev should also build-depend on python3-dbus. Package: python-dbus-doc Section: doc @@ -75,7 +73,6 @@ Recommends: python3-gi, Suggests: python-dbus-doc, - python3-dbus-dbg, Provides: ${python3:Provides}, Description: simple interprocess messaging system (Python 3 interface) @@ -87,19 +84,6 @@ Description: simple interprocess messaging system (Python 3 interface) . See the dbus description for more information about D-Bus in general. -Package: python3-dbus-dbg -Section: debug -Architecture: any -Depends: - python3-dbg, - python3-dbus (= ${binary:Version}), - ${misc:Depends}, - ${python3:Depends}, - ${shlibs:Depends}, -Description: debug build of the D-Bus Python 3 interface - This package provides a version of the python3-dbus package built for - debugging versions of Python 3, and debug symbols for python3-dbus. - Package: python3-dbus-tests Section: python Architecture: any diff --git a/debian/python3-dbus-tests.lintian-overrides b/debian/python3-dbus-tests.lintian-overrides index 08d2e82..b1f2f33 100644 --- a/debian/python3-dbus-tests.lintian-overrides +++ b/debian/python3-dbus-tests.lintian-overrides @@ -4,4 +4,4 @@ python3-dbus-tests: capitalization-error-in-description dbus D-Bus python3-dbus-tests: capitalization-in-override-comment capitalization-* # we are deliberately using a specific python3.x version here -python3-dbus-tests: unusual-interpreter usr/libexec/installed-tests/dbus-python/python3.*/test/*.py #!/usr/bin/python3.* +python3-dbus-tests: unusual-interpreter usr/libexec/installed-tests/dbus-python/python3.*/test/*.py /usr/bin/python3.* diff --git a/debian/rules b/debian/rules index 482a28f..53ca7ed 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,7 @@ include /usr/share/dpkg/default.mk PYTHON3 := $(shell py3versions --requested --version debian/control) PYDEFAULTVER := $(shell py3versions --default --version) -FLAVOURS := $(patsubst %,%-dbg,$(PYTHON3)) $(PYTHON3) +FLAVOURS := $(PYTHON3) %: dh $@ $(DH_ADDONS) --buildsystem=autoconf @@ -62,10 +62,6 @@ override_dh_auto_test-arch: PYTHON=/usr/bin/python$$x \ VERBOSE=1 \ dh_auto_test --no-parallel --arch --builddirectory=build-$$x; \ - LC_ALL=C.UTF-8 \ - PYTHON=/usr/bin/python$$x-dbg \ - VERBOSE=1 \ - dh_auto_test --no-parallel --arch --builddirectory=build-$$x-dbg; \ done override_dh_auto_test-indep: : @@ -90,24 +86,6 @@ override_dh_auto_install-arch: debian/tmp/usr/lib/python3/dist-packages/_dbus_glib_bindings$$so; \ mv "debian/tmp/usr/libexec/installed-tests/dbus-python/python$$x/test/dbus_py_test.so" \ "debian/tmp/usr/lib/python3/dist-packages/dbus_py_test$$so"; \ - PYTHON=/usr/bin/python$$x-dbg \ - dh_auto_install \ - --arch \ - --builddirectory=build-$$x-dbg \ - --destdir=debian/tmp-dbg \ - -- \ - installed_testdir='$${libexecdir}/installed-tests/$${PACKAGE_TARNAME}/'"python$$x-dbg" \ - installed_test_metadir='$${datadir}/installed-tests/$${PACKAGE_TARNAME}/'"python$$x-dbg" \ - pyexecdir='$${pythondir}' \ - pythondir='$${libdir}/python3/dist-packages' \ - ; \ - so=`/usr/bin/python$$x-dbg -c "import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX') or sysconfig.get_config_var('SO'))"`; \ - mv debian/tmp-dbg/usr/lib/python3/dist-packages/_dbus_bindings.so \ - debian/tmp-dbg/usr/lib/python3/dist-packages/_dbus_bindings$$so; \ - mv debian/tmp-dbg/usr/lib/python3/dist-packages/_dbus_glib_bindings.so \ - debian/tmp-dbg/usr/lib/python3/dist-packages/_dbus_glib_bindings$$so; \ - mv "debian/tmp-dbg/usr/libexec/installed-tests/dbus-python/python$$x-dbg/test/dbus_py_test.so" \ - "debian/tmp-dbg/usr/lib/python3/dist-packages/dbus_py_test$$so"; \ done install -d debian/tmp/usr/lib/python3/dist-packages/dbus_python-${DEB_VERSION_UPSTREAM}.egg-info install -m644 dbus_python.egg-info/PKG-INFO debian/tmp/usr/lib/python3/dist-packages/dbus_python-${DEB_VERSION_UPSTREAM}.egg-info/ @@ -115,6 +93,12 @@ override_dh_auto_install-arch: install -m644 dbus_python.egg-info/top_level.txt debian/tmp/usr/lib/python3/dist-packages/dbus_python-${DEB_VERSION_UPSTREAM}.egg-info/ touch debian/tmp/usr/lib/python3/dist-packages/dbus_python-${DEB_VERSION_UPSTREAM}.egg-info/not-zip-safe +# debhelper >= 13.4 makes all of /usr/libexec executable, which is not +# quite right for installed-tests +override_dh_fixperms-arch: + dh_fixperms -a -Xusr/libexec/installed-tests + chmod --recursive --changes a+rX,u+w,og-w debian/python3-dbus-tests/usr/libexec/installed-tests + override_dh_auto_install-indep: dh_auto_install \ --indep \ @@ -138,7 +122,6 @@ override_dh_installexamples: dh_installexamples --remaining-packages override_dh_installdocs: - dh_installdocs --link-doc=python3-dbus -ppython3-dbus-dbg dh_installdocs --doc-main-package=python-dbus-doc -ppython-dbus-doc dh_installdocs --doc-main-package=python3-dbus -ppython3-dbus dh_installdocs --remaining-packages @@ -148,18 +131,18 @@ override_dh_sphinxdoc-indep: override_dh_auto_clean: dh_auto_clean - rm -Rf build-* install-3* debian/tmp-dbg + rm -Rf build-* install-3* find . -name '*.py[co]' -print0 | xargs -0 rm -f override_dh_missing: dh_missing --fail-missing override_dh_strip: - dh_strip --dbg-package=python3-dbus-dbg -ppython3-dbus -ppython3-dbus-dbg -ppython3-dbus-tests + dh_strip --dbgsym-migration='python3-dbg (<< 1.2.18-3~)' override_dh_python3: dh_python3 - set -e; for x in $(PYTHON3) $(patsubst %,%-dbg,$(PYTHON3)); do \ + set -e; for x in $(PYTHON3); do \ dh_python3 --shebang="/usr/bin/python$$x" \ /usr/libexec/installed-tests/dbus-python/python$$x; \ done diff --git a/debian/tests/control b/debian/tests/control index 1c737ae..0947f21 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -6,7 +6,6 @@ Depends: python3-all-dbg, python3-all-dev, python3-dbus, - python3-dbus-dbg, Tests: python3 Depends: |