This is an automated email from the git hooks/post-receive script. aurel32 pushed a commit to branch sid in repository glibc.
commit 0f960b389dd8ad8aca62d625087e8ced72c4a9ac Author: Aurelien Jarno <aurel...@aurel32.net> Date: Sat Dec 9 10:27:10 2017 +0100 debian/rules, debian/rules.d/debhelper.mk: revert the logic to build libc6-dbg. Only fill it with files from the main libc and optimized flavours. Other debugging symbols are available in the dbgsym packages. Closes: #520680. --- debian/changelog | 4 ++++ debian/rules | 19 ++++--------------- debian/rules.d/debhelper.mk | 2 +- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index dc8eb20..4fc999b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,10 @@ glibc (2.25-4) UNRELEASED; urgency=medium kept when upgrading from stretch. * debian/patches/any/local-ldso-disable-hwcap.diff: use __access_noerrno instead of __access. Closes: #877493. + * debian/rules, debian/rules.d/debhelper.mk: revert the logic to build + libc6-dbg. Only fill it with files from the main libc and optimized + flavours. Other debugging symbols are available in the dbgsym packages. + Closes: #520680. -- Aurelien Jarno <aure...@debian.org> Sat, 02 Dec 2017 13:13:06 +0100 diff --git a/debian/rules b/debian/rules index 62109c4..c7bae7f 100755 --- a/debian/rules +++ b/debian/rules @@ -172,21 +172,10 @@ endif # Don't run dh_strip on this package NOSTRIP_$(libc)-dbg = 1 -# Don't put debug files from these packages in libc-dbg -NODEBUG_libc-bin = 1 -NODEBUG_libc-dev-bin = 1 -NODEBUG_libc0.1-i386 = 1 -NODEBUG_libc6-amd64 = 1 -NODEBUG_libc6-i386 = 1 -NODEBUG_libc6-x32 = 1 -NODEBUG_libc6-mips32 =1 -NODEBUG_libc6-mips64 = 1 -NODEBUG_libc6-mipsn32 = 1 -NODEBUG_libc6-powerpc = 1 -NODEBUG_libc6-ppc64 = 1 -NODEBUG_libc6-s390 = 1 -NODEBUG_libc6-sparc64 = 1 -NODEBUG_nscd = 1 +# Put the debug files from these packages in $(libc)-dbg +DEBUG_$(libc) = 1 +DEBUG_libc6-xen = 1 +DEBUG_libc6.1-alphaev67 = 1 ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),) ifeq ($(threads),yes) diff --git a/debian/rules.d/debhelper.mk b/debian/rules.d/debhelper.mk index b55ed05..840e059 100644 --- a/debian/rules.d/debhelper.mk +++ b/debian/rules.d/debhelper.mk @@ -43,7 +43,7 @@ ifeq ($(filter nostrip,$(DEB_BUILD_OPTIONS)),) # table in libc6-dbg but basic thread debugging should # work even without that package installed. if test "$(NOSTRIP_$(curpass))" != 1; then \ - if test "$(NODEBUG_$(curpass))" != 1; then \ + if test "$(DEBUG_$(curpass))" = 1; then \ dh_strip -p$(curpass) -Xlibpthread $(DH_STRIP_DEBUG_PACKAGE); \ for f in $$(find debian/$(curpass) -name libpthread-\*.so) ; do \ dbgfile=$$(LC_ALL=C readelf -n $$f | sed -e '/Build ID:/!d' \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git