r4553 - in glibc-package/branches/eglibc-2.13/debian: . patches/any
Author: aurel32
Date: 2011-02-28 11:05:05 +0000 (Mon, 28 Feb 2011)
New Revision: 4553
Modified:
glibc-package/branches/eglibc-2.13/debian/changelog
glibc-package/branches/eglibc-2.13/debian/patches/any/local-rtld.diff
Log:
Merge trunk into eglibc-2.13 branch
Modified: glibc-package/branches/eglibc-2.13/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/changelog 2011-02-28 11:00:56 UTC (rev 4552)
+++ glibc-package/branches/eglibc-2.13/debian/changelog 2011-02-28 11:05:05 UTC (rev 4553)
@@ -135,6 +135,12 @@
-- Aurelien Jarno <aurel32@debian.org> Mon, 21 Feb 2011 02:35:57 +0000
+eglibc (2.11.2-13) unstable; urgency=low
+
+ * Fix a typo in debian/patches/any/local-rtld.diff. Closes: #615806.
+
+ -- Aurelien Jarno <aurel32@debian.org> Mon, 28 Feb 2011 07:09:56 +0100
+
eglibc (2.11.2-12) unstable; urgency=medium
[ Aurelien Jarno ]
Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/local-rtld.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/local-rtld.diff 2011-02-28 11:00:56 UTC (rev 4552)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/local-rtld.diff 2011-02-28 11:05:05 UTC (rev 4553)
@@ -54,7 +54,7 @@
-common-ldd-rewrite = -e 's%@RTLD@%$(slibdir)/$(rtld-installed-name)%g' \
-+common-ldd-rewrite = -e 's%@RTLD@%$(rltddir)/$(rtld-installed-name)%g' \
++common-ldd-rewrite = -e 's%@RTLD@%$(rtlddir)/$(rtld-installed-name)%g' \
-e 's%@VERSION@%$(version)%g' \
-e 's%@PKGVERSION@%$(PKGVERSION)%g' \
-e 's%@REPORT_BUGS_TO@%$(REPORT_BUGS_TO)%g'
Reply to: