r3840 - in glibc-package/branches/eglibc-2.10/debian: . rules.d
Author: schizo
Date: 2009-09-14 23:58:28 +0000 (Mon, 14 Sep 2009)
New Revision: 3840
Modified:
glibc-package/branches/eglibc-2.10/debian/changelog
glibc-package/branches/eglibc-2.10/debian/rules.d/debhelper.mk
Log:
debian/rules.d/debhelper.mk: make sure that snippets are included before doing CURRENT_VER substitution; fix thanks to Steve Langasek.
Modified: glibc-package/branches/eglibc-2.10/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/changelog 2009-09-14 04:58:27 UTC (rev 3839)
+++ glibc-package/branches/eglibc-2.10/debian/changelog 2009-09-14 23:58:28 UTC (rev 3840)
@@ -1,4 +1,4 @@
-eglibc (2.10.1-0exp1) experimental; urgency=low
+eglibc (2.10.1-0exp2) experimental; urgency=low
[ Aurelien Jarno ]
* New upstream release.
@@ -131,8 +131,13 @@
* sysdeps/hppa.mk: switch to NPTL. Closes: bug#538513.
* testsuite-checking/expected-results-hppa-linux-gnu-libc: update.
- -- Aurelien Jarno <aurel32@debian.org> Tue, 18 Aug 2009 21:39:16 +0200
+ [ Clint Adams ]
+ * debian/rules.d/debhelper.mk: make sure that snippets are included
+ before doing CURRENT_VER substitution; fix thanks to Steve
+ Langasek.
+ -- Clint Adams <schizo@debian.org> Mon, 14 Sep 2009 19:57:11 -0400
+
eglibc (2.9-27) UNRELEASED; urgency=low
[ Aurelien Jarno ]
Modified: glibc-package/branches/eglibc-2.10/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/rules.d/debhelper.mk 2009-09-14 04:58:27 UTC (rev 3839)
+++ glibc-package/branches/eglibc-2.10/debian/rules.d/debhelper.mk 2009-09-14 23:58:28 UTC (rev 3840)
@@ -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: