[glibc] 01/01: debian/rules.d/debhelper.mk: relax the dependency on linux-libc-dev to the major upstream version.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch glibc-2.25
in repository glibc.
commit 3ba3cf74bb74b4d35b9414ae655fd492a89ff938
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Wed Nov 15 21:58:26 2017 +0100
debian/rules.d/debhelper.mk: relax the dependency on linux-libc-dev to the major upstream version.
---
debian/changelog | 4 +++-
debian/rules.d/debhelper.mk | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4cffa6e..278ca49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
glibc (2.25-0experimental5) UNRELEASED; urgency=medium
- *
+ [ Aurelien Jarno ]
+ * debian/rules.d/debhelper.mk: relax the dependency on linux-libc-dev
+ to the major upstream version.
-- Aurelien Jarno <aurel32@debian.org> Tue, 14 Nov 2017 23:45:57 +0100
diff --git a/debian/rules.d/debhelper.mk b/debian/rules.d/debhelper.mk
index ee6032e..b55ed05 100644
--- a/debian/rules.d/debhelper.mk
+++ b/debian/rules.d/debhelper.mk
@@ -164,7 +164,7 @@ ifeq ($(DEB_HOST_ARCH_OS),linux)
if [ -n "$$CTB_LIBC_DEV_DEPENDS" ]; then \
depends=$$CTB_LIBC_DEV_DEPENDS; \
else \
- depends=$$(dpkg-query -f '$${binary:Package} (>= $${source:Upstream-Version}) ' -W linux-libc-dev:$(DEB_HOST_ARCH) | sed -e 's/:\S\+//'); \
+ depends=$$(dpkg-query -f '$${binary:Package} (>= $${source:Upstream-Version}) ' -W linux-libc-dev:$(DEB_HOST_ARCH) | sed -e 's/:\S\+//' -e 's/(>= \([^.]\+\.[^.]\+\).*)/(>= \1)/'); \
fi; \
echo "libc-dev:Depends=$$depends" >> tmp.substvars
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: