r6609 - in glibc-package/branches/glibc-2.22/debian: . debhelper.in rules.d
Author: adconrad
Date: 2015-09-21 00:55:51 +0000 (Mon, 21 Sep 2015)
New Revision: 6609
Modified:
glibc-package/branches/glibc-2.22/debian/changelog
glibc-package/branches/glibc-2.22/debian/debhelper.in/libc-otherbuild.postinst
glibc-package/branches/glibc-2.22/debian/debhelper.in/libc-otherbuild.postrm
glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.postinst
glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.preinst
glibc-package/branches/glibc-2.22/debian/rules.d/debhelper.mk
Log:
Merge from 2.21 branch
Modified: glibc-package/branches/glibc-2.22/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.22/debian/changelog 2015-09-20 21:17:48 UTC (rev 6608)
+++ glibc-package/branches/glibc-2.22/debian/changelog 2015-09-21 00:55:51 UTC (rev 6609)
@@ -118,7 +118,7 @@
non-compliance is intentional. These tests were previously marked as
failing under the run-conformtest.out, but they have been lost during
the conversion to the new format.
- * testsuite-checking/compare.sh: reenable failures in case of regressions.
+ * testsuite-checking/compare.sh: re-enable failures in case of regressions.
* rules.d/build.mk: don't require flavours to be tested before being
installed. They are still tested when calling the build-arch or
binary-arch targets, but not anymore when calling the build-indep or
Modified: glibc-package/branches/glibc-2.22/debian/debhelper.in/libc-otherbuild.postinst
===================================================================
--- glibc-package/branches/glibc-2.22/debian/debhelper.in/libc-otherbuild.postinst 2015-09-20 21:17:48 UTC (rev 6608)
+++ glibc-package/branches/glibc-2.22/debian/debhelper.in/libc-otherbuild.postinst 2015-09-21 00:55:51 UTC (rev 6609)
@@ -4,7 +4,8 @@
if [ "$1" = "configure" ]
then
- # /etc/ld.so.nohwcap code: NOHWCAP
+ # /etc/ld.so.nohwcap code:
+ __NOHWCAP__
fi
#DEBHELPER#
Modified: glibc-package/branches/glibc-2.22/debian/debhelper.in/libc-otherbuild.postrm
===================================================================
--- glibc-package/branches/glibc-2.22/debian/debhelper.in/libc-otherbuild.postrm 2015-09-20 21:17:48 UTC (rev 6608)
+++ glibc-package/branches/glibc-2.22/debian/debhelper.in/libc-otherbuild.postrm 2015-09-21 00:55:51 UTC (rev 6609)
@@ -3,7 +3,8 @@
set -e
if [ "$1" = "remove" ]; then
- # /etc/ld.so.nohwcap code: NOHWCAP
+ # /etc/ld.so.nohwcap code
+ __NOHWCAP__
fi
#DEBHELPER#
Modified: glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.postinst 2015-09-20 21:17:48 UTC (rev 6608)
+++ glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.postinst 2015-09-21 00:55:51 UTC (rev 6609)
@@ -73,7 +73,8 @@
# We don't use a registry anymore, remove the old file
rm -f /etc/ld.so.hwcappkgs
- # /etc/ld.so.nohwcap code: NOHWCAP
+ # /etc/ld.so.nohwcap code:
+ __NOHWCAP__
# Load debconf module if available
if [ -f /usr/share/debconf/confmodule ] ; then
@@ -93,7 +94,8 @@
check="$check sasl2-bin slapd smail sendmail snmpd ssh"
check="$check spamassassin vsftpd wu-ftpd wu-ftpd-academ wwwoffle"
check="$check webmin dropbear gdm"
- # NSS services check: NSS_CHECK
+ # NSS services check:
+ __NSS_CHECK__
if [ -n "$services" ]; then
if [ -f /usr/share/debconf/confmodule ] ; then
Modified: glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.preinst 2015-09-20 21:17:48 UTC (rev 6608)
+++ glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.preinst 2015-09-21 00:55:51 UTC (rev 6609)
@@ -171,7 +171,8 @@
fi
check="kdm postgresql xdm"
- # NSS services check: NSS_CHECK
+ # NSS services check:
+ __NSS_CHECK__
if [ -n "$services" ]; then
if [ -f /usr/share/debconf/confmodule ] ; then
db_version 2.0
Modified: glibc-package/branches/glibc-2.22/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/rules.d/debhelper.mk 2015-09-20 21:17:48 UTC (rev 6608)
+++ glibc-package/branches/glibc-2.22/debian/rules.d/debhelper.mk 2015-09-21 00:55:51 UTC (rev 6609)
@@ -129,14 +129,15 @@
$(stamp)debhelper-common:
for x in `find debian/debhelper.in -maxdepth 1 -type f`; do \
y=debian/`basename $$x`; \
- sed -e "/NSS_CHECK/r debian/script.in/nsscheck.sh" \
- -e "/NOHWCAP/r debian/script.in/nohwcap.sh" \
- -e "/__PROVIDED_LOCALES__/r debian/tmp-libc/usr/share/i18n/SUPPORTED" \
- -e "s#GLIBC_VERSION#$(GLIBC_VERSION)#" \
- -e "s#CURRENT_VER#$(DEB_VERSION)#" \
- -e "s#BUILD-TREE#$(build-tree)#" \
- -e "s#LIBC#$(libc)#" \
- -e "s#DEB_HOST_ARCH#$(DEB_HOST_ARCH)#" \
+ perl -p \
+ -e 'BEGIN {undef $$/; open(IN, "debian/script.in/nsscheck.sh"); $$j=<IN>;} s/__NSS_CHECK__/$$j/g;' \
+ -e 'BEGIN {undef $$/; open(IN, "debian/script.in/nohwcap.sh"); $$k=<IN>;} s/__NOHWCAP__/$$k/g;' \
+ -e 'BEGIN {undef $$/; open(IN, "debian/tmp-libc/usr/share/i18n/SUPPORTED"); $$l=<IN>;} s/__PROVIDED_LOCALES__/$$l/g;' \
+ -e 's#GLIBC_VERSION#$(GLIBC_VERSION)#g;' \
+ -e 's#CURRENT_VER#$(DEB_VERSION)#g;' \
+ -e 's#BUILD-TREE#$(build-tree)#g;' \
+ -e 's#LIBC#$(libc)#g;' \
+ -e 's#DEB_HOST_ARCH#$(DEB_HOST_ARCH)#g;' \
$$x > $$y ; \
case $$y in \
*.install) \
Reply to: