r1388 - in glibc-package/trunk/debian: . debhelper.in rules.d
Author: aurel32
Date: 2006-04-10 18:24:52 +0000 (Mon, 10 Apr 2006)
New Revision: 1388
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/libc-alt.install
glibc-package/trunk/debian/debhelper.in/libc-otherbuild.install
glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
Fix a few things caused by the previous revert, which was not easy because a lot of changes have been done after the package split.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-04-10 17:26:13 UTC (rev 1387)
+++ glibc-package/trunk/debian/changelog 2006-04-10 18:24:52 UTC (rev 1388)
@@ -29,7 +29,7 @@
* local/usr_sbin/tzconfig:
- Put a copy of the current timezone into /etc/localtime instead of a
symlink. (Closes: #346342)
- - Handle the case where /etc/localtime does not exists. (Closes:
+ - Handle the case where /etc/localtime does not exists. (Closes:
#360383).
* local/manpages/tzconfig.8: Update the manpage accordingly.
* script.in/kernelcheck.sh: Also take in account 64-bit mips(el) kernels.
@@ -52,7 +52,7 @@
* Add hurd-sysvshm.diff (implements SysV shared memory for GNU/Hurd)
by Marcus Brinkmann.
- -- Aurelien Jarno <aurel32@debian.org> Mon, 10 Apr 2006 03:22:15 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Mon, 10 Apr 2006 20:19:55 +0200
glibc (2.3.6-5) unstable; urgency=low
Modified: glibc-package/trunk/debian/debhelper.in/libc-alt.install
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-alt.install 2006-04-10 17:26:13 UTC (rev 1387)
+++ glibc-package/trunk/debian/debhelper.in/libc-alt.install 2006-04-10 18:24:52 UTC (rev 1388)
@@ -2,3 +2,5 @@
TMPDIR/SLIBDIR/*.so* SLIBDIR
TMPDIR/LIBDIR/gconv/*.so* LIBDIR/gconv/
TMPDIR/LIBDIR/gconv/gconv-modules LIBDIR/gconv
+
+log-test-*-FLAVOR usr/share/doc/LIBC-FLAVOR
Modified: glibc-package/trunk/debian/debhelper.in/libc-otherbuild.install
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-otherbuild.install 2006-04-10 17:26:13 UTC (rev 1387)
+++ glibc-package/trunk/debian/debhelper.in/libc-otherbuild.install 2006-04-10 18:24:52 UTC (rev 1388)
@@ -1,3 +1,5 @@
# This file is used for making NPTL and other
# optimized libraries.
TMPDIR/SLIBDIR/*.so* SLIBDIR
+
+log-test-*-FLAVOR usr/share/doc/LIBC-FLAVOR
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2006-04-10 17:26:13 UTC (rev 1387)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2006-04-10 18:24:52 UTC (rev 1388)
@@ -204,9 +204,9 @@
cp debian/debhelper.in/libc-alt.install $$z; \
zd=debian/$(libc)-dev-$$x.install; \
cp debian/debhelper.in/libc-alt-dev.install $$zd; \
- sed -e "s#TMPDIR#debian/tmp-$$x#g" -i $$zd;
+ sed -e "s#TMPDIR#debian/tmp-$$x#g" -i $$zd; \
sed -e "s#DEB_SRCDIR#$(DEB_SRCDIR)#g" -i $$zd; \
- sed -e "s#LIBC#$(libc)#" -i $$z; \
+ sed -e "s#LIBC#$(libc)#" -i $$z; \
sed -e "s#LIBDIR#$$libdir#g" -i $$zd; \
sed -e "s/^#.*//g" -i $$zd; \
;; \
@@ -241,6 +241,7 @@
cat debian/debhelper.in/libc-otherbuild.install >>$$z; \
sed -e "s#TMPDIR#debian/tmp-$$x#g" -i $$z; \
sed -e "s#DEB_SRCDIR#$(DEB_SRCDIR)#g" -i $$z; \
+ sed -e "s#LIBC-FLAVOR#$(libc)#g" -i $$z; \
sed -e "s#FLAVOR#nptl#g" -i $$z; \
sed -e "s#SLIBDIR#/lib/tls#g" -i $$z; \
case $$z in \
Reply to: