[glibc] 01/01: debian/control.in/libc, debian/rules.d/debhelper.mk: compute the linux-libc-dev dependency from the one installed at build time. Closes: #834706.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch glibc-2.24
in repository glibc.
commit f6bea0b106ef33b35f4469fd25527f0c740fceaa
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Sat Aug 20 10:29:51 2016 +0200
debian/control.in/libc, debian/rules.d/debhelper.mk: compute the linux-libc-dev dependency from the one installed at build time. Closes: #834706.
---
debian/changelog | 3 +++
debian/control | 8 ++++----
debian/control.in/libc | 2 +-
debian/rules.d/debhelper.mk | 3 +++
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index bdd1a9e..d1ec4b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ glibc (2.24-0experimental2) UNRELEASED; urgency=medium
denial-of-service vulnerability (CVE-2016-6323). Closes: #834752.
* debian/control.in/libc: drop ${locale-compat:Depends} as it was not used
anymore.
+ * debian/control.in/libc, debian/rules.d/debhelper.mk: compute the
+ linux-libc-dev dependency from the one installed at build time. Closes:
+ #834706.
-- Adam Conrad <adconrad@0c3.net> Tue, 16 Aug 2016 05:33:48 -0600
diff --git a/debian/control b/debian/control
index 6bfcb49..94ab43e 100644
--- a/debian/control
+++ b/debian/control
@@ -192,7 +192,7 @@ Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32
Section: libdevel
Priority: optional
Multi-Arch: same
-Depends: libc6 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386] | hurd-headers-dev [hurd-i386]
+Depends: libc6 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, ${libc-dev:Depends}, kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386] | hurd-headers-dev [hurd-i386]
Replaces: hurd-dev (<< 20120408-3) [hurd-i386]
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha hurd-i386 kfreebsd-i386 kfreebsd-amd64]
@@ -280,7 +280,7 @@ Architecture: alpha
Section: libdevel
Priority: optional
Multi-Arch: same
-Depends: libc6.1 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386] | hurd-headers-dev [hurd-i386]
+Depends: libc6.1 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, ${libc-dev:Depends}, kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386] | hurd-headers-dev [hurd-i386]
Replaces: hurd-dev (<< 20120408-3) [hurd-i386]
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha hurd-i386 kfreebsd-i386 kfreebsd-amd64]
@@ -368,7 +368,7 @@ Architecture: hurd-i386
Section: libdevel
Priority: optional
Multi-Arch: same
-Depends: libc0.3 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386] | hurd-headers-dev [hurd-i386]
+Depends: libc0.3 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, ${libc-dev:Depends}, kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386] | hurd-headers-dev [hurd-i386]
Replaces: hurd-dev (<< 20120408-3) [hurd-i386]
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha hurd-i386 kfreebsd-i386 kfreebsd-amd64]
@@ -456,7 +456,7 @@ Architecture: kfreebsd-amd64 kfreebsd-i386
Section: libdevel
Priority: optional
Multi-Arch: same
-Depends: libc0.1 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386] | hurd-headers-dev [hurd-i386]
+Depends: libc0.1 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, ${libc-dev:Depends}, kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386] | hurd-headers-dev [hurd-i386]
Replaces: hurd-dev (<< 20120408-3) [hurd-i386]
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha hurd-i386 kfreebsd-i386 kfreebsd-amd64]
diff --git a/debian/control.in/libc b/debian/control.in/libc
index a05ac7f..30d3080 100644
--- a/debian/control.in/libc
+++ b/debian/control.in/libc
@@ -34,7 +34,7 @@ Architecture: @archs@
Section: libdevel
Priority: optional
Multi-Arch: same
-Depends: @libc@ (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386] | hurd-headers-dev [hurd-i386]
+Depends: @libc@ (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, ${libc-dev:Depends}, kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386] | hurd-headers-dev [hurd-i386]
Replaces: hurd-dev (<< 20120408-3) [hurd-i386]
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha hurd-i386 kfreebsd-i386 kfreebsd-amd64]
diff --git a/debian/rules.d/debhelper.mk b/debian/rules.d/debhelper.mk
index fb1d0d7..33a1e0d 100644
--- a/debian/rules.d/debhelper.mk
+++ b/debian/rules.d/debhelper.mk
@@ -151,6 +151,9 @@ $(stamp)debhelper-common:
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
+endif
for pkg in $(DEB_ARCH_REGULAR_PACKAGES) $(DEB_INDEP_REGULAR_PACKAGES) $(DEB_UDEB_PACKAGES); do \
cp tmp.substvars debian/$$pkg.substvars; \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: