[debhelper-devel] [debhelper] 01/02: Create jessie-backports version without dbgsym support

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch jessie-backports
in repository debhelper.

commit a963dbcd2868d76c9a840fee7d77af1abe1519d2
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Jun 11 12:09:40 2016 +0000

    Create jessie-backports version without dbgsym support
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 7 +++++++
 debian/control   | 4 ++--
 dh_strip         | 4 ++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d9f038d..e413b09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (9.20160403~bpo8+1) jessie-backports; urgency=medium
+
+  * Rebuild for jessie-backports.
+  * Disable automatic dbgsym as it requires dpkg-dev 1.18.2
+
+ -- Niels Thykier <niels at thykier.net>  Fri, 10 Jun 2016 17:48:34 +0000
+
 debhelper (9.20160403) unstable; urgency=medium
 
   * d/control: Requre dh-autoreconf (>= 12) to ensure
diff --git a/debian/control b/debian/control
index ca04945..b5b1708 100644
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,14 @@ Section: devel
 Priority: optional
 Maintainer: Debhelper Maintainers <debhelper-devel at lists.alioth.debian.org>
 Uploaders: Niels Thykier <niels at thykier.net>, Bernhard R. Link <brlink at debian.org>, Tianon Gravi <tianon at debian.org>
-Build-Depends: po4a (>= 0.24), dpkg-dev (>= 1.18.0~)
+Build-Depends: po4a (>= 0.24)
 Standards-Version: 3.9.7
 Vcs-Git: https://anonscm.debian.org/git/debhelper/debhelper.git
 Vcs-Browser: https://anonscm.debian.org/git/debhelper/debhelper.git
 
 Package: debhelper
 Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, file (>= 3.23), dpkg (>= 1.16.2), dpkg-dev (>= 1.18.2~), binutils, po-debconf, man-db (>= 2.5.1-1), libdpkg-perl (>= 1.17.14), dh-strip-nondeterminism, autotools-dev, dh-autoreconf (>= 12~)
+Depends: ${perl:Depends}, ${misc:Depends}, file (>= 3.23), dpkg (>= 1.16.2), dpkg-dev (>= 1.17.0), binutils, po-debconf, man-db (>= 2.5.1-1), libdpkg-perl (>= 1.17.14), dh-strip-nondeterminism, autotools-dev, dh-autoreconf (>= 12~)
 Suggests: dh-make
 Multi-Arch: foreign
 Description: helper programs for debian/rules
diff --git a/dh_strip b/dh_strip
index 752176e..89ac792 100755
--- a/dh_strip
+++ b/dh_strip
@@ -169,6 +169,10 @@ if ($dh{MIGRATE_DBGSYM} and not $dh{ENABLE_DBGSYM}) {
 	error("--dbgsym-migration and --no-automatic-dbgsym are mutually exclusive");
 }
 
+# UNCONDITIONALLY disable this as we need a new version of dpkg-dev
+# for this to work
+$dh{ENABLE_DBGSYM} = 0;
+
 # This variable can be used to turn off stripping (see Policy).
 if (get_buildoption('nostrip')) {
 	exit;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git