r1328 - in glibc-package/trunk/debian: . debhelper.in rules.d
Author: aurel32
Date: 2006-04-06 17:34:57 +0000 (Thu, 06 Apr 2006)
New Revision: 1328
Added:
glibc-package/trunk/debian/debhelper.in/libc-alt.dirs
glibc-package/trunk/debian/debhelper.in/libc-otherbuild.dirs
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/debhelper.in/libc.dirs
glibc-package/trunk/debian/debhelper.in/libc.install
glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
* Put each test log file in the corresponding package instead of putting all
of them in libc6.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-04-06 09:46:46 UTC (rev 1327)
+++ glibc-package/trunk/debian/changelog 2006-04-06 17:34:57 UTC (rev 1328)
@@ -5,6 +5,8 @@
should finally be built from a separate source package.
* Split out binaries from libc6 into libc-bin, and binaries from libc6-bin
into libc-bin-dev. (Closes: #330735)
+ * Put each test log file in the corresponding package instead of putting all
+ of them in libc6.
[ Denis Barbier ]
* debian/debhelper.in/locales.config: /etc/locale.gen was not generated at
Added: glibc-package/trunk/debian/debhelper.in/libc-alt.dirs
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-alt.dirs 2006-04-06 09:46:46 UTC (rev 1327)
+++ glibc-package/trunk/debian/debhelper.in/libc-alt.dirs 2006-04-06 17:34:57 UTC (rev 1328)
@@ -0,0 +1 @@
+usr/share/doc/libc-bin
Modified: glibc-package/trunk/debian/debhelper.in/libc-alt.install
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-alt.install 2006-04-06 09:46:46 UTC (rev 1327)
+++ glibc-package/trunk/debian/debhelper.in/libc-alt.install 2006-04-06 17:34:57 UTC (rev 1328)
@@ -1,3 +1,4 @@
# This file is used for biarch libraries.
TMPDIR/SLIBDIR/*.so* SLIBDIR
TMPDIR/LIBDIR/gconv/*.so* LIBDIR/gconv/
+log-test-*-FLAVOR usr/share/doc/libc-bin
Added: glibc-package/trunk/debian/debhelper.in/libc-otherbuild.dirs
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-otherbuild.dirs 2006-04-06 09:46:46 UTC (rev 1327)
+++ glibc-package/trunk/debian/debhelper.in/libc-otherbuild.dirs 2006-04-06 17:34:57 UTC (rev 1328)
@@ -0,0 +1 @@
+usr/share/doc/libc-bin
Modified: glibc-package/trunk/debian/debhelper.in/libc-otherbuild.install
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-otherbuild.install 2006-04-06 09:46:46 UTC (rev 1327)
+++ glibc-package/trunk/debian/debhelper.in/libc-otherbuild.install 2006-04-06 17:34:57 UTC (rev 1328)
@@ -1,3 +1,4 @@
# This file is used for making NPTL and other
# optimized libraries.
TMPDIR/SLIBDIR/*.so* SLIBDIR
+log-test-*-FLAVOR usr/share/doc/libc-bin
Modified: glibc-package/trunk/debian/debhelper.in/libc.dirs
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.dirs 2006-04-06 09:46:46 UTC (rev 1327)
+++ glibc-package/trunk/debian/debhelper.in/libc.dirs 2006-04-06 17:34:57 UTC (rev 1328)
@@ -0,0 +1 @@
+usr/share/doc/libc-bin
Modified: glibc-package/trunk/debian/debhelper.in/libc.install
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.install 2006-04-06 09:46:46 UTC (rev 1327)
+++ glibc-package/trunk/debian/debhelper.in/libc.install 2006-04-06 17:34:57 UTC (rev 1328)
@@ -5,3 +5,5 @@
debian/tmp-libc/lib/ldconfig/* lib/ldconfig
debian/tmp-libc/lib/*-*-gnu/ lib
debian/tmp-libc/usr/lib/*-*-gnu/ usr/lib
+
+log-test-*-libc usr/share/doc/libc-bin
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2006-04-06 09:46:46 UTC (rev 1327)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2006-04-06 17:34:57 UTC (rev 1328)
@@ -64,7 +64,7 @@
dh_installdocs -p$(curpass) ;; \
$(libc)-dev*) \
dh_link -p$(curpass) usr/share/doc/libc-dev-bin usr/share/doc/$(curpass) ;; \
- $(libc)-*) \
+ $(libc)-* | $(libc)) \
dh_link -p$(curpass) usr/share/doc/libc-bin usr/share/doc/$(curpass) ;; \
*) \
dh_installchangelogs -p$(curpass) ; \
@@ -218,6 +218,7 @@
sed -e "s#TMPDIR#debian/tmp-$$x#" -i $$zd; \
sed -e "s#DEB_SRCDIR#$(DEB_SRCDIR)#" -i $$zd; \
sed -e "s#LIBC#$(libc)#" -i $$z; \
+ sed -e "s#FLAVOR#$$x#" -i $$z; \
sed -e "s#LIBDIR#$$libdir#g" -i $$zd; \
sed -e "s/^#.*//" -i $$zd; \
;; \
@@ -250,6 +251,7 @@
cat debian/debhelper.in/libc-otherbuild.install >>$$z; \
sed -e "s#TMPDIR#debian/tmp-$$x#" -i $$z; \
sed -e "s#DEB_SRCDIR#$(DEB_SRCDIR)#" -i $$z; \
+ sed -e "s#FLAVOR#nptl#" -i $$z; \
sed -e "s#SLIBDIR#/lib/tls#g" -i $$z; \
case $$z in \
*.install) sed -e "s/^#.*//" -i $$z ;; \
Reply to: