[glibc] 01/01: debian/rules.d/debhelper.mk: remove the arch-qualifier from the linux-libc-dev depends. Closes: #836446.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository glibc.
commit 33ce9ca14aa66da831f6ef92a7ece0fa887b9775
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Sat Sep 3 21:08:47 2016 +0200
debian/rules.d/debhelper.mk: remove the arch-qualifier from the linux-libc-dev depends. Closes: #836446.
---
debian/changelog | 4 ++++
debian/rules.d/debhelper.mk | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 5bb58e9..51c77c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ glibc (2.24-2) UNRELEASED; urgency=medium
* hurd-i386/tg-gsync-libc.diff: Fix for glibc 2.24.
* testsuite-xfail-debian.mk: Update header conformance results.
+ [ Aurelien Jarno ]
+ * debian/rules.d/debhelper.mk: remove the arch-qualifier from the
+ linux-libc-dev depends. Closes: #836446.
+
-- Aurelien Jarno <aurel32@debian.org> Wed, 31 Aug 2016 17:58:05 +0200
glibc (2.24-1) unstable; urgency=medium
diff --git a/debian/rules.d/debhelper.mk b/debian/rules.d/debhelper.mk
index 33a1e0d..14845f3 100644
--- a/debian/rules.d/debhelper.mk
+++ b/debian/rules.d/debhelper.mk
@@ -152,7 +152,7 @@ ifeq ($(filter stage2,$(DEB_BUILD_PROFILES)),)
echo 'libgcc:Depends=libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]' >> tmp.substvars
endif
ifeq ($(DEB_HOST_ARCH_OS),linux)
- echo "libc-dev:Depends=$(shell dpkg-query -f '$${binary:Package} (>= $${Version}) ' -W linux-libc-dev:$(DEB_HOST_ARCH))" >> tmp.substvars
+ echo "libc-dev:Depends=$$(dpkg-query -f '$${binary:Package} (>= $${Version}) ' -W linux-libc-dev:$(DEB_HOST_ARCH) | sed -e 's/:\S\+//')" >> tmp.substvars
endif
for pkg in $(DEB_ARCH_REGULAR_PACKAGES) $(DEB_INDEP_REGULAR_PACKAGES) $(DEB_UDEB_PACKAGES); do \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: