Package: src:glibc Version: 2.19-5 Severity: normal Tags: patch User: helm...@debian.org Usertags: rebootstrap
I introduced a regression in my patch for #752480. All non-dev packages were (correctly) marked with Build-Profiles: !stage1. For debhelper this means, that those packages no longer exist. In particular passing a non-existing package to dh_strip --dbg-package fails. Please apply the attached patch or something equivalent. Helmut
diff -Nru glibc-2.19/debian/rules.d/debhelper.mk glibc-2.19/debian/rules.d/debhelper.mk --- glibc-2.19/debian/rules.d/debhelper.mk +++ glibc-2.19/debian/rules.d/debhelper.mk @@ -8,6 +8,10 @@ non-debug-packages = $(filter-out %-dbg,$(DEB_ARCH_REGULAR_PACKAGES)) $(patsubst %,$(stamp)binaryinst_%,$(debug-packages)):: $(patsubst %,$(stamp)binaryinst_%,$(non-debug-packages)) +ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),) +DH_STRIP_DEBUG_PACKAGE=--dbg-package=$(libc)-dbg +endif + $(patsubst %,$(stamp)binaryinst_%,$(DEB_ARCH_REGULAR_PACKAGES) $(DEB_INDEP_REGULAR_PACKAGES)):: $(patsubst %,$(stamp)install_%,$(GLIBC_PASSES)) debhelper @echo Running debhelper for $(curpass) dh_testroot @@ -49,7 +53,7 @@ # strip *.o files as dh_strip does not (yet?) do it. if test "$(NOSTRIP_$(curpass))" != 1; then \ if test "$(NODEBUG_$(curpass))" != 1; then \ - dh_strip -p$(curpass) -Xlibpthread --dbg-package=$(libc)-dbg; \ + dh_strip -p$(curpass) -Xlibpthread $(DH_STRIP_DEBUG_PACKAGE); \ (cd debian/$(curpass); \ find . -name libpthread-\*.so -exec objcopy \ --only-keep-debug '{}' ../$(libc)-dbg/usr/lib/debug/'{}' \