Author: aurel32
Date: 2007-06-11 12:18:36 +0000 (Mon, 11 Jun 2007)
New Revision: 2359
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
Merge from experimental:
[ Pierre Habouzit ]
* pass -X/usr/lib/debug to dh_makeshlibs so that libc6-dbg gets no useless
shlibs. Closes: #427637.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-06-11 09:30:50 UTC (rev
2358)
+++ glibc-package/trunk/debian/changelog 2007-06-11 12:18:36 UTC (rev
2359)
@@ -1,8 +1,13 @@
glibc (2.5-11) UNRELEASED; urgency=low
+ [ Aurelien Jarno ]
* patches/hppa/submitted-pie.diff: new patch to fix PIE on hppa. Patch by
Sébastien Bernard and John David Anglin. Closes: #427990.
+ [ Pierre Habouzit ]
+ * pass -X/usr/lib/debug to dh_makeshlibs so that libc6-dbg gets no useless
+ shlibs. Closes: #427637.
+
-- Aurelien Jarno <[EMAIL PROTECTED]> Mon, 11 Jun 2007 11:25:48 +0200
glibc (2.5-10) unstable; urgency=low
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2007-06-11 09:30:50 UTC
(rev 2358)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2007-06-11 12:18:36 UTC
(rev 2359)
@@ -116,7 +116,7 @@
-o -regex '.*lib[0-9]*/libpthread-.*so' \
-o -regex '.*lib[0-9]*/libc-.*so' \) \
-exec chmod a+x '{}' ';'
- dh_makeshlibs -p$(curpass) -V "$(call xx,shlib_dep)"
+ dh_makeshlibs -X/usr/lib/debug -p$(curpass) -V "$(call xx,shlib_dep)"
if [ -f debian/$(curpass).lintian ] ; then \
install -d -m 755 -o root -g root
debian/$(curpass)/usr/share/lintian/overrides/ ; \
@@ -157,7 +157,7 @@
-o -regex '.*lib[0-9]*/.*libpthread.*so.*' \
-o -regex '.*lib[0-9]*/libc[.-].*so.*' \) \
-exec chmod a+x '{}' ';'
- # dh_makeshlibs -p$(curpass) -V "$(call xx,shlib_dep)"
+ # dh_makeshlibs -X/usr/lib/debug -p$(curpass) -V "$(call xx,shlib_dep)"
dh_installdeb -p$(curpass)
# dh_shlibdeps -p$(curpass)
dh_gencontrol -p$(curpass)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
