r4583 - in glibc-package/branches/eglibc-2.13/debian: . debhelper.in
Author: aurel32
Date: 2011-03-14 08:15:49 +0000 (Mon, 14 Mar 2011)
New Revision: 4583
Modified:
glibc-package/branches/eglibc-2.13/debian/changelog
glibc-package/branches/eglibc-2.13/debian/debhelper.in/libc.install
Log:
Revert part of r4581 (multiarch support)
Modified: glibc-package/branches/eglibc-2.13/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/changelog 2011-03-13 11:26:10 UTC (rev 4582)
+++ glibc-package/branches/eglibc-2.13/debian/changelog 2011-03-14 08:15:49 UTC (rev 4583)
@@ -152,9 +152,6 @@
* Set Multi-Arch: foreign on the appropriate packages.
* debian/rules.d/debhelper.mk: set $rtlddir in the debhelper substitution
rules, so we don't substitute an empty string.
- * debian/debhelper.in/libc.install: ld is always installed relative to
- RTLDDIR, not SLIBDIR; a no-op for the moment, but relevant once we start
- building for multiarch.
-- Aurelien Jarno <aurel32@debian.org> Mon, 28 Feb 2011 23:43:03 +0100
Modified: glibc-package/branches/eglibc-2.13/debian/debhelper.in/libc.install
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/debhelper.in/libc.install 2011-03-13 11:26:10 UTC (rev 4582)
+++ glibc-package/branches/eglibc-2.13/debian/debhelper.in/libc.install 2011-03-14 08:15:49 UTC (rev 4583)
@@ -1,4 +1,3 @@
-TMPDIR/RTLDDIR/*.so* RTLDDIR
TMPDIR/SLIBDIR/*.so* SLIBDIR
TMPDIR/LIBDIR/gconv/* LIBDIR/gconv
Reply to: