From 15ea866f4e924f2d12e558d8611ce9fffd6dba24 Mon Sep 17 00:00:00 2001 From: Iustin Pop Date: Sat, 14 May 2016 23:31:41 +0200 Subject: [PATCH] Revert "Move from manual to automatic debug packages" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This reverts commit c727dbdd. I didn't realise that Python is a special case and needs the -dbg packages, as they contain not only debug symbols but also a debug version of the extension itself (built against a debug-enabled Python interpreter). I only found it accidentally while looking at the debian diff after a twice-build pbuilder run (thanks…). --- debian/changelog | 3 +-- debian/control | 30 ++++++++++++++++++++++++++++++ debian/rules | 8 +++++--- 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 247ee13..a23fc0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,14 +11,13 @@ python-pyxattr (0.5.6-1) unstable; urgency=medium build) * Migrate debian/copyright to DEP5-style * Switch debian packaging repo over to Alioth - * Move from manual to automatic debug packages * Switch build system to dh and pybuild * Split the documentation into a separate package (Closes: #725419); note that the path to the documentation has now changed * Add autopkgtest testsuite; this would have helped the issue found by RedHat much earlier, since Debian runs on more platforms - -- Iustin Pop Sat, 14 May 2016 22:36:51 +0200 + -- Iustin Pop Sat, 14 May 2016 23:31:34 +0200 python-pyxattr (0.5.3-2) unstable; urgency=medium diff --git a/debian/control b/debian/control index ce14989..5223a6e 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,7 @@ Package: python-pyxattr Architecture: any Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} Provides: ${python:Provides} +Suggests: python-pyxattr-dbg Description: module for manipulating filesystem extended attributes pyxattr is a Python interface to the libattr library. It allows manipulation of the filesystem extended attributes present in some @@ -25,10 +26,25 @@ Description: module for manipulating filesystem extended attributes . This package contains the library for Python 2. +Package: python-pyxattr-dbg +Section: debug +Priority: extra +Architecture: any +Depends: python-pyxattr (= ${binary:Version}), python-dbg, ${shlibs:Depends}, + ${misc:Depends}, ${python:Depends} +Provides: ${python:Provides} +Description: module for manipulating filesystem extended attributes (debug extension) + pyxattr is a Python interface to the libattr library. It allows + manipulation of the filesystem extended attributes present in some + operating systems (GNU/Linux included). + . + This package contains the library for the Python 2 debug interpreter. + Package: python3-pyxattr Architecture: any Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends} Provides: ${python3:Provides} +Suggests: python3-pyxattr-dbg Description: module for manipulating filesystem extended attributes (Python3) pyxattr is a Python interface to the libattr library. It allows manipulation of the filesystem extended attributes present in some @@ -36,6 +52,20 @@ Description: module for manipulating filesystem extended attributes (Python3) . This package contains the library for Python 3. +Package: python3-pyxattr-dbg +Section: debug +Priority: extra +Architecture: any +Depends: python3-pyxattr (= ${binary:Version}), python3-dbg, + ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends} +Provides: ${python3:Provides} +Description: module for manipulating filesystem extended attributes (Python3 debug version) + pyxattr is a Python interface to the libattr library. It allows + manipulation of the filesystem extended attributes present in some + operating systems (GNU/Linux included). + . + This package contains the library for the Python 3 debug interpreter. + Package: python-pyxattr-doc Architecture: all Section: doc diff --git a/debian/rules b/debian/rules index 8017d83..0efa0b6 100755 --- a/debian/rules +++ b/debian/rules @@ -27,11 +27,13 @@ override_dh_auto_clean: $(MAKE) clean override_dh_strip: - dh_strip -ppython-pyxattr --dbgsym-migration='python-pyxattr-dbg (<< 0.5.6-1~)' - dh_strip -ppython3-pyxattr --dbgsym-migration='python3-pyxattr-dbg (<< 0.5.6-1~)' + dh_strip -ppython-pyxattr --dbg-package=python-pyxattr-dbg + dh_strip -ppython3-pyxattr --dbg-package=python3-pyxattr-dbg override_dh_installdocs: - dh_installdocs -A README.rst + dh_installdocs --link-doc=python-pyxattr -ppython-pyxattr-dbg + dh_installdocs --link-doc=python3-pyxattr -ppython3-pyxattr-dbg + dh_installdocs -A --remaining-packages README.rst override_dh_installchangelogs: dh_installchangelogs -A NEWS -- 2.39.5