r1796 - in glibc-package: branches/glibc-2.4/debian branches/glibc-2.4/debian/rules.d trunk/debian trunk/debian/rules.d
Author: aurel32
Date: 2006-08-28 04:41:11 +0000 (Mon, 28 Aug 2006)
New Revision: 1796
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
* rules.d/debhelper.mk: don't make ld.so.8.gz or ld.so.conf executable.
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-08-27 22:31:03 UTC (rev 1795)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-08-28 04:41:11 UTC (rev 1796)
@@ -147,6 +147,7 @@
glibc (2.3.6.ds1-5) UNRELEASED; urgency=low
* debian/local/manpages/ldconfig.8: Update the description. Closes: #325921.
+ * rules.d/debhelper.mk: don't make ld.so.8.gz or ld.so.conf executable.
-- Aurelien Jarno <aurel32@debian.org> Thu, 24 Aug 2006 21:04:20 +0200
Modified: glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk 2006-08-27 22:31:03 UTC (rev 1795)
+++ glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk 2006-08-28 04:41:11 UTC (rev 1796)
@@ -116,9 +116,9 @@
# an unescaped regular expression. ld.so must be executable;
# libc.so and NPTL's libpthread.so print useful version
# information when executed.
- find debian/$(curpass) -type f \( -regex '.*lib.*/ld.*so.*' \
- -o -regex '.*lib.*/libpthread.*so.*' \
- -o -regex '.*lib.*/libc[.-].*so.*' \) \
+ find debian/$(curpass) -type f \( -regex '.*lib[0-9]*/ld.*so.*' \
+ -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)"
@@ -143,9 +143,9 @@
dh_compress -p$(curpass)
dh_fixperms -p$(curpass)
- find debian/$(curpass) -type f \( -regex '.*lib.*/ld.*so.*' \
- -o -regex '.*lib.*/tls/.*libpthread.*so.*' \
- -o -regex '.*lib.*/libc[.-].*so.*' \) \
+ find debian/$(curpass) -type f \( -regex '.*lib[0-9]*/ld.*so.*' \
+ -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_installdeb -p$(curpass)
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-08-27 22:31:03 UTC (rev 1795)
+++ glibc-package/trunk/debian/changelog 2006-08-28 04:41:11 UTC (rev 1796)
@@ -1,6 +1,7 @@
glibc (2.3.6.ds1-5) UNRELEASED; urgency=low
* debian/local/manpages/ldconfig.8: Update the description. Closes: #325921.
+ * rules.d/debhelper.mk: don't make ld.so.8.gz or ld.so.conf executable.
-- Aurelien Jarno <aurel32@debian.org> Thu, 24 Aug 2006 21:04:20 +0200
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2006-08-27 22:31:03 UTC (rev 1795)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2006-08-28 04:41:11 UTC (rev 1796)
@@ -118,9 +118,9 @@
# FIXME: LinuxThread's libpthread.so doesn't. It would be good
# to either fix that, or use a more robust method than searching
# for /tls/ in the path to identify NPTL.
- find debian/$(curpass) -type f \( -regex '.*lib.*/ld.*so.*' \
- -o -regex '.*lib.*/tls/.*libpthread.*so.*' \
- -o -regex '.*lib.*/libc[.-].*so.*' \) \
+ find debian/$(curpass) -type f \( -regex '.*lib[0-9]*/ld.*so.*' \
+ -o -regex '.*lib[0-9]*/tls/.*libpthread.*so.*' \
+ -o -regex '.*lib[0-9]*/libc[.-].*so.*' \) \
-exec chmod a+x '{}' ';'
dh_makeshlibs -p$(curpass) -V "$(call xx,shlib_dep)"
@@ -145,9 +145,9 @@
dh_compress -p$(curpass)
dh_fixperms -p$(curpass)
- find debian/$(curpass) -type f \( -regex '.*lib.*/ld.*so.*' \
- -o -regex '.*lib.*/tls/.*libpthread.*so.*' \
- -o -regex '.*lib.*/libc[.-].*so.*' \) \
+ find debian/$(curpass) -type f \( -regex '.*lib[0-9]*/ld.*so.*' \
+ -o -regex '.*lib[0-9]*/tls/.*libpthread.*so.*' \
+ -o -regex '.*lib[0-9]*/libc[.-].*so.*' \) \
-exec chmod a+x '{}' ';'
# dh_makeshlibs -p$(curpass) -V "$(call xx,shlib_dep)"
dh_installdeb -p$(curpass)
Reply to: