r3843 - in glibc-package/trunk/debian: . rules.d
Author: aurel32
Date: 2009-09-15 12:48:30 +0000 (Tue, 15 Sep 2009)
New Revision: 3843
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
Backport revision 3840 to trunk
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-09-15 08:40:33 UTC (rev 3842)
+++ glibc-package/trunk/debian/changelog 2009-09-15 12:48:30 UTC (rev 3843)
@@ -30,6 +30,11 @@
[ Petr Salinger ]
* kfreebsd/local-sysdeps.diff: update to revision 2779 (from glibc-bsd).
+ [ Clint Adams ]
+ * debian/rules.d/debhelper.mk: make sure that snippets are included
+ before doing CURRENT_VER substitution; fix thanks to Steve
+ Langasek.
+
-- Aurelien Jarno <aurel32@debian.org> Wed, 09 Sep 2009 20:08:58 +0200
eglibc (2.9-26) unstable; urgency=low
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2009-09-15 08:40:33 UTC (rev 3842)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2009-09-15 12:48:30 UTC (rev 3843)
@@ -142,11 +142,11 @@
cp $$x $$y; \
sed -e "s#BUILD-TREE#$(build-tree)#" -i $$y; \
sed -e "s#LIBC#$(libc)#" -i $$y; \
- sed -e "s#CURRENT_VER#$(DEB_VERSION)#" -i $$y; \
sed -e "s#EXIT_CHECK##" -i $$y; \
sed -e "s#DEB_HOST_ARCH#$(DEB_HOST_ARCH)#" -i $$y; \
sed -e "/NSS_CHECK/r debian/script.in/nsscheck.sh" -i $$y; \
sed -e "/NOHWCAP/r debian/script.in/nohwcap.sh" -i $$y; \
+ sed -e "s#CURRENT_VER#$(DEB_VERSION)#" -i $$y; \
case $$y in \
*.install) \
sed -e "s/^#.*//" -i $$y ; \
Reply to: