[gcc-6] 135/401: * Tighten debhelper build dependency for cross build dependencies.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.

commit 67ae5b88ec1a157c41470363df00b5c07832701a
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Mon May 9 13:10:23 2016 +0000

      * Tighten debhelper build dependency for cross build dependencies.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8831 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                  | 1 +
 debian/control                    | 2 +-
 debian/control.m4                 | 4 ++--
 debian/libstdc++-BV-doc.overrides | 3 +++
 debian/rules.conf                 | 3 +++
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3ac96f4..71f770c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ gcc-6 (6.1.1-2) UNRELEASED; urgency=medium
   * Don't build gnat cross compilers on 32bit archs targeting 64bit targets.
     Addresses: #823126.
   * Avoid empty architecture lists in build dependencies. Closes: #823280.
+  * Tighten debhelper build dependency for cross build dependencies.
 
   [ Samuel Thibault ]
   * patches/ada-hurd.diff: Fix Get_Page_Size type.
diff --git a/debian/control b/debian/control
index 45524ab..5b96485 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian GCC Maintainers <debian-gcc at lists.debian.org>
 Uploaders: Matthias Klose <doko at debian.org>
 Standards-Version: 3.9.8
-Build-Depends: debhelper (>= 5.0.62), dpkg-dev (>= 1.17.14), 
+Build-Depends: debhelper (>= 9.20141010), dpkg-dev (>= 1.17.14), 
   g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel mipsn32 mipsn32el powerpc ppc64 s390 s390x sparc sparc64 x32] <!cross>, g++-5 [arm64] <!cross>, 
   libc6.1-dev (>= 2.13-5) [alpha ia64] | libc0.3-dev (>= 2.13-5) [hurd-i386] | libc0.1-dev (>= 2.13-5) [kfreebsd-i386 kfreebsd-amd64] | libc6-dev (>= 2.13-5), libc6-dev (>= 2.13-31) [armel armhf], libc6-dev-amd64 [i386 x32], libc6-dev-sparc64 [sparc], libc6-dev-sparc [sparc64], libc6-dev-s390 [s390x], libc6-dev-s390x [s390], libc6-dev-i386 [amd64 x32], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], libc0.1-dev-i386 [kfreebsd-amd64], lib32gcc1 [amd64 ppc64 kfreebsd-amd64 mipsn32 mi [...]
   kfreebsd-kernel-headers (>= 0.84) [kfreebsd-any], linux-libc-dev [m68k], 
diff --git a/debian/control.m4 b/debian/control.m4
index dcacdd9..013b3d0 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -58,7 +58,7 @@ Uploaders: Matthias Klose <doko at debian.org>
 ')dnl SRCNAME
 Standards-Version: 3.9.8
 ifdef(`TARGET',`dnl cross
-Build-Depends: debhelper (>= 9), DPKG_BUILD_DEP
+Build-Depends: DEBHELPER_BUILD_DEP DPKG_BUILD_DEP
   LIBC_BUILD_DEP, LIBC_BIARCH_BUILD_DEP
   kfreebsd-kernel-headers (>= 0.84) [kfreebsd-any], linux-libc-dev [m68k],
   LIBUNWIND_BUILD_DEP LIBATOMIC_OPS_BUILD_DEP AUTO_BUILD_DEP
@@ -68,7 +68,7 @@ Build-Depends: debhelper (>= 9), DPKG_BUILD_DEP
   zlib1g-dev, SDT_BUILD_DEP
   bison (>= 1:2.3), flex, realpath (>= 1.9.12), lsb-release, quilt
 ',`dnl native
-Build-Depends: debhelper (>= 5.0.62), DPKG_BUILD_DEP
+Build-Depends: DEBHELPER_BUILD_DEP DPKG_BUILD_DEP
   GCC_MULTILIB_BUILD_DEP
   LIBC_BUILD_DEP, LIBC_BIARCH_BUILD_DEP LIBC_DBG_DEP
   kfreebsd-kernel-headers (>= 0.84) [kfreebsd-any], linux-libc-dev [m68k],
diff --git a/debian/libstdc++-BV-doc.overrides b/debian/libstdc++-BV-doc.overrides
index 0522c3d..3ddfc4b 100644
--- a/debian/libstdc++-BV-doc.overrides
+++ b/debian/libstdc++-BV-doc.overrides
@@ -1,6 +1,9 @@
 libstdc++- at BV@-doc binary: hyphen-used-as-minus-sign
 libstdc++- at BV@-doc binary: manpage-has-bad-whatis-entry
 
+# 3xx used by intent to avoid conficts
+libstdc++- at BV@-doc binary: manpage-section-mismatch
+
 # some very long identifiers
 libstdc++- at BV@-doc binary: manpage-has-errors-from-man .*can't break line
 
diff --git a/debian/rules.conf b/debian/rules.conf
index 5b8b2ba..027d79e 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -442,10 +442,12 @@ _element = $(filter $1=%,$(arch_gnutype_map))
 _gnu_type = $(subst $1=,,$(filter $1=%,$(arch_gnutype_map)))
 
 ifneq (,$(filter $(distrelease),lenny etch squeeze wheezy wheezy dapper hardy jaunty karmic lucid maverick natty oneiric precise quantal raring saucy trusty utopic vivid))
+  DEBHELPER_BUILD_DEP = debhelper (>= 9),
   TARGET_TOOL_BUILD_DEP = bash, # non-empty line
   pf_cross =
   pf_ncross =
 else
+  DEBHELPER_BUILD_DEP = debhelper (>= 9.20141010),
   TARGET_TOOL_BUILD_DEP = \
 	$(foreach a, $(any_archs), \
 	  g++-$(BASE_VERSION)-$(call _gnu_type,$(a)) [$(a)] <cross>, \
@@ -689,6 +691,7 @@ ctrl_flags += \
 	-DGMP_BUILD_DEP="$(GMP_BUILD_DEP)" \
 	-DMPFR_BUILD_DEP="$(MPFR_BUILD_DEP)" \
 	-DMPC_BUILD_DEP="$(MPC_BUILD_DEP)" \
+	-DDEBHELPER_BUILD_DEP="$(DEBHELPER_BUILD_DEP)" \
 	-DDPKG_BUILD_DEP="$(DPKG_BUILD_DEP)" \
 	-DSOURCE_BUILD_DEP="$(SOURCE_BUILD_DEP)" \
 	-DCROSS_BUILD_DEP="$(CROSS_BUILD_DEP)" \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-6.git