Remove explicit debug symbol packages.

Debug symbol packages are now implicit and built automatically for all
architecture-dependent packages in Debian. See
<URL:https://lists.debian.org/msgid-search/5675E791.6060705@thykier.net>
for details.

diff --git a/debian/changelog b/debian/changelog
index 5a6fba8..9cabd8d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -52,6 +52,9 @@ python-coverage (4.1+dfsg.1-1) UNRELEASED; urgency=medium
     * Document how the source package is built.
   * debian/clean:
     * Remove Setuptools build artefacts.
+  * debian/control, debian/rules, debian/*-dbg.postinst:
+    * Remove explicit debug symbol packages, now implicit for all
+      architecture-dependent packages in Debian.
 
  --
 

diff --git a/debian/control b/debian/control
index b7a92fd..7b2d31b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,15 @@ Maintainer: Ben Finney <[email protected]>
 Section: python
 Priority: optional
 Build-Depends:
-    debhelper (>= 9~),
     dh-python,
     python-docutils,
     python-setuptools,
     python-all-dev (>= 2.6.6-3~),
-    python-all-dbg,
     python (>= 2.6.6-3~),
     python3-setuptools,
     python3-all-dev,
-    python3-all-dbg,
-    python3
+    python3,
+    debhelper (>= 9~)
 Standards-Version: 3.9.8
 Homepage: http://nedbatchelder.com/code/coverage/
 VCS-Git: https://anonscm.debian.org/git/collab-maint/pkg-python-coverage.git
@@ -70,49 +68,3 @@ Description: code coverage tool for Python 2
  .
  This package installs the Python version 2 ‘coverage’ library, and the
  ‘python-coverage’ program to perform and report coverage tests.
-
-Package: python3-coverage-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends:
-    python3-coverage (= ${binary:Version}),
-    ${shlibs:Depends},
-    ${misc:Depends}
-Recommends:
-    python3-dbg
-Description: code coverage tool for Python 3 – debug library
- Coverage.py is a tool for measuring code coverage of Python programs.
- It monitors your program, noting which parts of the code have been
- executed, then analyzes the source to identify code that could have
- been executed but was not.
- .
- Coverage measurement is typically used to gauge the effectiveness of
- tests. It can show which parts of your code are being exercised by
- tests, and which are not.
- .
- This package installs the debugging symbols and debug build for the C
- extension libraries in ‘python3-coverage’.
-
-Package: python-coverage-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends:
-    python-coverage (= ${binary:Version}),
-    ${shlibs:Depends},
-    ${misc:Depends}
-Recommends:
-    python-dbg
-Description: code coverage tool for Python 2 – debug library
- Coverage.py is a tool for measuring code coverage of Python programs.
- It monitors your program, noting which parts of the code have been
- executed, then analyzes the source to identify code that could have
- been executed but was not.
- .
- Coverage measurement is typically used to gauge the effectiveness of
- tests. It can show which parts of your code are being exercised by
- tests, and which are not.
- .
- This package installs the debugging symbols and debug build for the C
- extension libraries in ‘python-coverage’.

diff --git a/debian/python-coverage-dbg.postinst b/debian/python-coverage-dbg.postinst
deleted file mode 100644 (file)
index 7fb4a92..0000000
--- a/debian/python-coverage-dbg.postinst
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /bin/sh
-# Post-install script for ‘python-coverage-dbg’.
-#
-# Manpage: ‘dh_installdeb(1)’
-
-set -e
-
-# Summary of ways this script can be called:
-#   * <postinst> configure <most-recently-configured-version>
-#   * <old-postinst> abort-upgrade <new-version>
-#   * <conflictor's-postinst> abort-remove in-favour <package>
-#     <new-version>
-#   * <postinst> abort-remove
-#   * <deconfigured's-postinst> abort-deconfigure in-favour
-#     <failed-install-package> <version>
-#     [removing <conflicting-package> <version>]
-# For details, see the Debian Policy §6.5 in the ‘debian-policy’ package
-# or on the web at <URL:http://www.debian.org/doc/debian-policy/>.
-
-action="$1"
-
-main_package_name=python-coverage
-debug_package_name=${main_package_name}-dbg
-doc_root_dir="/usr/share/doc"
-main_doc_dir="${doc_root_dir}/${main_package_name}"
-debug_doc_dir="${doc_root_dir}/${debug_package_name}"
-
-case "$action" in
-    configure)
-        most_recent_version="$2"
-        if dpkg --compare-versions "$most_recent_version" lt-nl "3.6-1"; then
-            # Replace debug package doc directory with symlink to
-            # main doc directory.
-            if [ ! -L "$debug_doc_dir" ] && [ -d "$debug_doc_dir" ]; then
-                if rmdir "$debug_doc_dir" 2>/dev/null; then
-                    ln -sf $main_package_name "$debug_doc_dir"
-                fi
-            fi
-        fi
-        ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-        ;;
-
-    *)
-        printf "postinst called with unknown action ‘%s’\n" "$action" >&2
-        exit 1
-        ;;
-
-esac
-
-#DEBHELPER#
-
-exit 0

diff --git a/debian/python3-coverage-dbg.postinst b/debian/python3-coverage-dbg.postinst
deleted file mode 100644 (file)
index 41a3094..0000000
--- a/debian/python3-coverage-dbg.postinst
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /bin/sh
-# Post-install script for ‘python3-coverage-dbg’.
-#
-# Manpage: ‘dh_installdeb(1)’
-
-set -e
-
-# Summary of ways this script can be called:
-#   * <postinst> configure <most-recently-configured-version>
-#   * <old-postinst> abort-upgrade <new-version>
-#   * <conflictor's-postinst> abort-remove in-favour <package>
-#     <new-version>
-#   * <postinst> abort-remove
-#   * <deconfigured's-postinst> abort-deconfigure in-favour
-#     <failed-install-package> <version>
-#     [removing <conflicting-package> <version>]
-# For details, see the Debian Policy §6.5 in the ‘debian-policy’ package
-# or on the web at <URL:http://www.debian.org/doc/debian-policy/>.
-
-action="$1"
-
-main_package_name=python3-coverage
-debug_package_name=${main_package_name}-dbg
-doc_root_dir="/usr/share/doc"
-main_doc_dir="${doc_root_dir}/${main_package_name}"
-debug_doc_dir="${doc_root_dir}/${debug_package_name}"
-
-case "$action" in
-    configure)
-        most_recent_version="$2"
-        if dpkg --compare-versions "$most_recent_version" lt-nl "3.6-1"; then
-            # Replace debug package doc directory with symlink to
-            # main doc directory.
-            if [ ! -L "$debug_doc_dir" ] && [ -d "$debug_doc_dir" ]; then
-                if rmdir "$debug_doc_dir" 2>/dev/null; then
-                    ln -sf $main_package_name "$debug_doc_dir"
-                fi
-            fi
-        fi
-        ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-        ;;
-
-    *)
-        printf "postinst called with unknown action ‘%s’\n" "$action" >&2
-        exit 1
-        ;;
-
-esac
-
-#DEBHELPER#
-
-exit 0

diff --git a/debian/rules b/debian/rules
index 7616963..17308d3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -19,8 +19,6 @@ export PYBUILD_DISABLE = test
 
 PYTHON2_PACKAGE_NAME = python-${PYBUILD_NAME}
 PYTHON3_PACKAGE_NAME = python3-${PYBUILD_NAME}
-python2_debug_package_name = ${PYTHON2_PACKAGE_NAME}-dbg
-python3_debug_package_name = ${PYTHON3_PACKAGE_NAME}-dbg
 package_working_root = debian
 package_install_root = debian/{package}
 
@@ -139,21 +137,15 @@ export PYBUILD_AFTER_INSTALL = \
            "/${RESOURCES_DIR}/${htmlfiles_dirname}" \
            usr/lib/python{version}/dist-packages/${HTMLFILES_DIR}
 
-override_dh_strip:
-       dh_strip --package=${PYTHON2_PACKAGE_NAME} --dbg-package=${python2_debug_package_name}
-       dh_strip --package=${PYTHON3_PACKAGE_NAME} --dbg-package=${python3_debug_package_name}
-
 override_dh_installchangelogs:
        dh_installchangelogs CHANGES.rst
 
 override_dh_installdocs:
        dh_installdocs \
            --package=${PYTHON2_PACKAGE_NAME} \
-           --package=${python2_debug_package_name} \
            --link-doc=${PYTHON2_PACKAGE_NAME}
        dh_installdocs \
            --package=${PYTHON3_PACKAGE_NAME} \
-           --package=${python3_debug_package_name} \
            --link-doc=${PYTHON3_PACKAGE_NAME}
 
 override_dh_installman: manpage-aliases