[linux] 01/01: Remove debug symbol packages from debian/control to work around dak bug

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch master
in repository linux.

commit 99d37f9b167059eff67405745834e6921ce12424
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Jan 7 18:49:52 2017 +0000

    Remove debug symbol packages from debian/control to work around dak bug
    
    Any packages listed in debian/control that are not installed in the
    main archive will always be seen as NEW.  This might be fixable by
    archive configuration changes, but for now we'll generate them in a
    similar way to debhelper.
---
 debian/bin/gencontrol.py              |  1 -
 debian/changelog                      |  1 +
 debian/rules.real                     | 21 ++++++++++++++++++++-
 debian/templates/control.image-dbg.in |  6 ------
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 1eeda45..a1f2253 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -416,7 +416,6 @@ class Gencontrol(Base):
 
         if build_debug:
             makeflags['DEBUG'] = True
-            packages_own.extend(self.process_packages(self.templates['control.image-dbg'], vars))
 
         merge_packages(packages, packages_own + packages_dummy, arch)
 
diff --git a/debian/changelog b/debian/changelog
index 6bd2889..51f7dbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ linux (4.9.1-1~exp2) UNRELEASED; urgency=medium
   * abiupdate.py: Update base URLs
   * abiupdate.py: Add support for incoming.ports.debian.org
   * Make the pickled config (config.defines.dump) reproducible
+  * Remove debug symbol packages from debian/control to work around dak bug
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 07 Jan 2017 17:41:34 +0000
 
diff --git a/debian/rules.real b/debian/rules.real
index cecbac4..899cb85 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -484,7 +484,26 @@ endif
 	ln -s boot/vmlinux-$(REAL_VERSION) $(DEBUG_DIR)/
 	mkdir -p $(DEBUG_DIR)/lib/modules/$(REAL_VERSION)
 	ln -s ../../../boot/vmlinux-$(REAL_VERSION) $(DEBUG_DIR)/lib/modules/$(REAL_VERSION)/vmlinux
-	+$(MAKE_SELF) install-base GENCONTROL_ARGS='-DAuto-Built-Package=debug-symbols'
+ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
+	dh_installdocs
+endif
+	dh_installchangelogs
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+# Workaround for dak bug: any packages listed in debian/control that
+# are not installed in the main archive will always be seen as NEW.
+# So we use the same hack as debhelper: start with the control stanza
+# for the corresponding package and replace almost all fields.
+	dpkg-gencontrol -p$(IMAGE_PACKAGE_NAME) -ldebian/changelog \
+		-Tdebian/$(PACKAGE_NAME).substvars -Pdebian/$(PACKAGE_NAME) \
+		-UPre-Depends -URecommends -USuggests -UProvides -UConflicts \
+		-DPriority=extra -DAuto-Built-Package=debug-symbols \
+		-DPackage=$(PACKAGE_NAME) -UDepends \
+		-DDescription='Debug symbols for linux-image-$(REAL_VERSION)' \
+		-DSection=debug -UMulti-Arch -UReplaces -UBreaks
+	dh_md5sums
+	dh_builddeb -- -Zxz
 
 install-udeb_$(ARCH): export KW_DEFCONFIG_DIR=debian/installer
 install-udeb_$(ARCH): export KW_CONFIG_DIR=debian/installer/$(ARCH)
diff --git a/debian/templates/control.image-dbg.in b/debian/templates/control.image-dbg.in
deleted file mode 100644
index c3c8d63..0000000
--- a/debian/templates/control.image-dbg.in
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: linux-image- at abiname@@localversion at -dbgsym
-Build-Profiles: <!stage1>
-Depends: ${misc:Depends}
-Section: debug
-Priority: extra
-Description: Debug symbols for linux-image- at abiname@@localversion@

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