[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r2935 - in glibc-package/trunk/debian: . rules.d



Author: aurel32
Date: 2008-05-11 10:15:06 +0000 (Sun, 11 May 2008)
New Revision: 2935

Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
  * rules.d/debhelper.mk: avoid creating empty directories when building
    libc6-dbg.



Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2008-05-11 10:13:38 UTC (rev 2934)
+++ glibc-package/trunk/debian/changelog	2008-05-11 10:15:06 UTC (rev 2935)
@@ -1,4 +1,4 @@
-glibc (2.7-11) UNRELEASED; urgency=low
+glibc (2.7-11) unstable; urgency=low
 
   [ Aurelien Jarno ]
   * Reenable testsuite on MIPS SB1 platforms.
@@ -36,6 +36,8 @@
   * rules.d/debhelper.mk: remove linda overrides installation.
   * debhelper.in/*lintian: update.
   * control.in/main: relax a few dependencies.
+  * rules.d/debhelper.mk: avoid creating empty directories when building
+    libc6-dbg.
 
   [ Pierre Habouzit ]
   * Add any/cvs-strerror_r.diff to make strerror_r actually thread safe.
@@ -45,7 +47,7 @@
   * patches/hurd-i386/cvs-termios.diff: new patch to revamp ioctls/termios
   bits.
 
- -- Aurelien Jarno <aurel32@debian.org>  Sun, 11 May 2008 00:29:48 +0200
+ -- Aurelien Jarno <aurel32@debian.org>  Sun, 11 May 2008 12:13:59 +0200
 
 glibc (2.7-10) unstable; urgency=low
 

Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk	2008-05-11 10:13:38 UTC (rev 2934)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk	2008-05-11 10:15:06 UTC (rev 2935)
@@ -76,15 +76,7 @@
 	if test "$(NOSTRIP_$(curpass))" != 1; then			\
 	  chmod a+x debian/wrapper/objcopy;				\
 	  export PATH=$(shell pwd)/debian/wrapper:$$PATH;		\
-	  dh_strip -p$(curpass) -Xlibpthread --keep-debug;		\
-	  mkdir -p debian/$(libc)-dbg/usr/lib/debug;			\
-	  if test -d debian/$(curpass)/usr/lib/debug; then		\
-	    cd debian/$(curpass)/usr/lib/debug;				\
-	    find . -type f -name \*.so\*				\
-	      | cpio -pd $(shell pwd)/debian/$(libc)-dbg/usr/lib/debug;	\
-	    cd ../../../../..;						\
-	    rm -rf debian/$(curpass)/usr/lib/debug;			\
-	  fi;								\
+	  dh_strip -p$(curpass) -Xlibpthread --dbg-package=$(libc)-dbg; \
 	  (cd debian/$(curpass);					\
 	   find . -name libpthread-\*.so -exec				\
 	     ../../debian/wrapper/objcopy --only-keep-debug '{}'	\


Reply to: