r6524 - in glibc-package/branches/glibc-2.21/debian: . rules.d
Author: aurel32
Date: 2015-09-08 16:49:26 +0000 (Tue, 08 Sep 2015)
New Revision: 6524
Modified:
glibc-package/branches/glibc-2.21/debian/changelog
glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk
Log:
rules.d/debhelper.mk: replace GLIBC_VERSION before LIBC. Closes:
#797538.
Modified: glibc-package/branches/glibc-2.21/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.21/debian/changelog 2015-09-07 23:32:09 UTC (rev 6523)
+++ glibc-package/branches/glibc-2.21/debian/changelog 2015-09-08 16:49:26 UTC (rev 6524)
@@ -12,6 +12,10 @@
libpthread/sysdeps/pthread/semaphore.h instead of the latter just
including the former, since the latter is what gets installed.
+ [ Aurelien Jarno ]
+ * rules.d/debhelper.mk: replace GLIBC_VERSION before LIBC. Closes:
+ #797538.
+
-- Aurelien Jarno <aurel32@debian.org> Sat, 29 Aug 2015 00:43:44 +0200
glibc (2.21-0experimental1) experimental; urgency=medium
Modified: glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk 2015-09-07 23:32:09 UTC (rev 6523)
+++ glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk 2015-09-08 16:49:26 UTC (rev 6524)
@@ -160,14 +160,14 @@
for x in `find debian/debhelper.in -maxdepth 1 -type f`; do \
y=debian/`basename $$x`; \
cp $$x $$y; \
+ sed -e "s#GLIBC_VERSION#$(GLIBC_VERSION)#" -i $$y; \
+ sed -e "s#CURRENT_VER#$(DEB_VERSION)#" -i $$y; \
sed -e "s#BUILD-TREE#$(build-tree)#" -i $$y; \
sed -e "s#LIBC#$(libc)#" -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; \
- sed -e "s#GLIBC_VERSION#$(GLIBC_VERSION)#" -i $$y; \
case $$y in \
*.install) \
sed -e "s/^#.*//" -i $$y ; \
Reply to: