[SCM] Debian package checker branch, master, updated. 2.5.5-9-g0e75465
The following commit has been merged in the master branch:
commit 0e7546503011114ccc21a293eb72ddd8ebe5f51a
Author: Niels Thykier <niels@thykier.net>
Date: Wed Mar 7 00:51:45 2012 +0100
Use debhelper compat 9 by default in the test suite
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/debian/control b/debian/control
index b47a3a4..24be849 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Uploaders: Josip Rodin <joy-packages@debian.org>,
Build-Depends: binutils,
bzip2,
cdbs,
- debhelper (>= 8.1.0~),
+ debhelper (>= 9),
default-jdk,
diffstat,
docbook-utils,
diff --git a/t/templates/tests/pedantic/debian/compat b/t/templates/tests/pedantic/debian/compat
index 7f8f011..ec63514 100644
--- a/t/templates/tests/pedantic/debian/compat
+++ b/t/templates/tests/pedantic/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/t/templates/tests/pedantic/debian/control.in b/t/templates/tests/pedantic/debian/control.in
index 838998b..804aa8d 100644
--- a/t/templates/tests/pedantic/debian/control.in
+++ b/t/templates/tests/pedantic/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9~)
Homepage: http://lintian.debian.org/
Package: {$srcpkg}
diff --git a/t/templates/tests/skel/debian/compat b/t/templates/tests/skel/debian/compat
index 7f8f011..ec63514 100644
--- a/t/templates/tests/skel/debian/compat
+++ b/t/templates/tests/skel/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/t/templates/tests/skel/debian/control.in b/t/templates/tests/skel/debian/control.in
index 96cea01..d5718c0 100644
--- a/t/templates/tests/skel/debian/control.in
+++ b/t/templates/tests/skel/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9~)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/binaries-doesnt-match-sonames/debian/debian/control.in b/t/tests/binaries-doesnt-match-sonames/debian/debian/control.in
index 4b15828..817e000 100644
--- a/t/tests/binaries-doesnt-match-sonames/debian/debian/control.in
+++ b/t/tests/binaries-doesnt-match-sonames/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: libs
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: mylibany
Architecture: any
diff --git a/t/tests/binaries-misplaced/debian/debian/rules b/t/tests/binaries-misplaced/debian/debian/rules
index eb7d50e..e717577 100755
--- a/t/tests/binaries-misplaced/debian/debian/rules
+++ b/t/tests/binaries-misplaced/debian/debian/rules
@@ -2,11 +2,11 @@
pkg=binaries-misplaced
%:
dh $@
-binary:
- dh --before dh_install binary
+
+override_dh_install:
mkdir debian/$(pkg)/etc/
cp -a /bin/true debian/$(pkg)/etc/foo
# explicitly call dh_shlibdeps since debhelper is being
# "smart" and not calling it in newer versons (8.9.something)
dh_shlibdeps
- dh --remaining binary
+ dh_install
diff --git a/t/tests/binaries-missing-depends-on-libc/debian/debian/control.in b/t/tests/binaries-missing-depends-on-libc/debian/debian/control.in
index f24fb3f..fc1c7a3 100644
--- a/t/tests/binaries-missing-depends-on-libc/debian/debian/control.in
+++ b/t/tests/binaries-missing-depends-on-libc/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), perl
+Build-Depends: debhelper (>= 9), perl
Package: libbasic2
Architecture: any
diff --git a/t/tests/binaries-missing-depends/debian/debian/control.in b/t/tests/binaries-missing-depends/debian/debian/control.in
index 9f1b2a7..b8dc8de 100644
--- a/t/tests/binaries-missing-depends/debian/debian/control.in
+++ b/t/tests/binaries-missing-depends/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), perl
+Build-Depends: debhelper (>= 9), perl
Package: libbasic2
Architecture: any
diff --git a/t/tests/binaries-multiarch-same/debian/debian/control.in b/t/tests/binaries-multiarch-same/debian/debian/control.in
index d60094e..1a835c0 100644
--- a/t/tests/binaries-multiarch-same/debian/debian/control.in
+++ b/t/tests/binaries-multiarch-same/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: libs
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: libbasic2
Architecture: any
diff --git a/t/tests/binaries-multiarch/debian/debian/control.in b/t/tests/binaries-multiarch/debian/debian/control.in
index 28b4016..00035c6 100644
--- a/t/tests/binaries-multiarch/debian/debian/control.in
+++ b/t/tests/binaries-multiarch/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: libs
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: libbasic2
Architecture: any
diff --git a/t/tests/conffiles-general/debian/debian/rules b/t/tests/conffiles-general/debian/debian/rules
index 484bf2d..0a9c3b1 100755
--- a/t/tests/conffiles-general/debian/debian/rules
+++ b/t/tests/conffiles-general/debian/debian/rules
@@ -3,7 +3,6 @@ pkg=conffiles-general
%:
dh $@
-binary:
- dh --before dh_builddeb binary
+
+override_dh_builddeb:
dpkg-deb --nocheck --build debian/$(pkg) ../$(pkg)_1.0_all.deb
- dh --after dh_builddeb binary
diff --git a/t/tests/control-file-duplicate/debian/debian/control.in b/t/tests/control-file-duplicate/debian/debian/control.in
index 40f9600..fb9d455 100644
--- a/t/tests/control-file-duplicate/debian/debian/control.in
+++ b/t/tests/control-file-duplicate/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), debhelper
+Build-Depends: debhelper (>= 9), debhelper
Build-Depends-Indep: foobar, foo, foobar
Build-Conflicts: bar,
baz,
diff --git a/t/tests/control-file-duplicate/tags b/t/tests/control-file-duplicate/tags
index 6546629..c439e54 100644
--- a/t/tests/control-file-duplicate/tags
+++ b/t/tests/control-file-duplicate/tags
@@ -2,4 +2,4 @@ P: control-file-duplicate source: duplicate-in-relation-field in control-file-du
P: control-file-duplicate source: duplicate-in-relation-field in control-file-duplicate suggests: baz (= 1.0), baz, baz (>= 2.0)
P: control-file-duplicate source: duplicate-in-relation-field in source build-conflicts: bar, bar [i386]
P: control-file-duplicate source: duplicate-in-relation-field in source build-depends-indep: foobar, foobar
-P: control-file-duplicate source: duplicate-in-relation-field in source build-depends: debhelper (>= 7.0.50~), debhelper
+P: control-file-duplicate source: duplicate-in-relation-field in source build-depends: debhelper (>= 9), debhelper
diff --git a/t/tests/control-file-general/debian/debian/control.in b/t/tests/control-file-general/debian/debian/control.in
index e4f0cb6..58b3c45 100644
--- a/t/tests/control-file-general/debian/debian/control.in
+++ b/t/tests/control-file-general/debian/debian/control.in
@@ -2,7 +2,7 @@ Source: {$srcpkg}
Priority: extra
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 9),
fiddle [amd64 powerpc mips mipsel hppa s390],
faddle
(>>
diff --git a/t/tests/control-file-hardcoded-libc/debian/debian/control.in b/t/tests/control-file-hardcoded-libc/debian/debian/control.in
index 7be8d71..0511a67 100644
--- a/t/tests/control-file-hardcoded-libc/debian/debian/control.in
+++ b/t/tests/control-file-hardcoded-libc/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/control-file-library-dev/debian/debian/control.in b/t/tests/control-file-library-dev/debian/debian/control.in
index 1f7da14..c2376bb 100644
--- a/t/tests/control-file-library-dev/debian/debian/control.in
+++ b/t/tests/control-file-library-dev/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: libcontrol-file-foo1
Architecture: {$architecture}
diff --git a/t/tests/control-file-national-encoding/debian/debian/control.in b/t/tests/control-file-national-encoding/debian/debian/control.in
index 3ed608f..1d48f18 100644
--- a/t/tests/control-file-national-encoding/debian/debian/control.in
+++ b/t/tests/control-file-national-encoding/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: all
diff --git a/t/tests/control-file-pedantic-space/debian/debian/control.in b/t/tests/control-file-pedantic-space/debian/debian/control.in
index 9320da8..af5c224 100644
--- a/t/tests/control-file-pedantic-space/debian/debian/control.in
+++ b/t/tests/control-file-pedantic-space/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority:extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Homepage: http://lintian.debian.org/
Package: {$srcpkg}
diff --git a/t/tests/control-file-pedantic/debian/debian/control.in b/t/tests/control-file-pedantic/debian/debian/control.in
index ab3a9d0..26d4a69 100644
--- a/t/tests/control-file-pedantic/debian/debian/control.in
+++ b/t/tests/control-file-pedantic/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Homepage: http://lintian.debian.org/
Package: {$srcpkg}-udeb
diff --git a/t/tests/control-file-suggests-itself/debian/debian/control.in b/t/tests/control-file-suggests-itself/debian/debian/control.in
index 86553ca..c1fc9c8 100644
--- a/t/tests/control-file-suggests-itself/debian/debian/control.in
+++ b/t/tests/control-file-suggests-itself/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/copyright-file-doc-symlink/debian/debian/control.in b/t/tests/copyright-file-doc-symlink/debian/debian/control.in
index b933d68..f1b8951 100644
--- a/t/tests/copyright-file-doc-symlink/debian/debian/control.in
+++ b/t/tests/copyright-file-doc-symlink/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/copyright-file-doc-symlink/debian/debian/rules b/t/tests/copyright-file-doc-symlink/debian/debian/rules
index e242291..32f23a0 100755
--- a/t/tests/copyright-file-doc-symlink/debian/debian/rules
+++ b/t/tests/copyright-file-doc-symlink/debian/debian/rules
@@ -5,12 +5,8 @@ pkg := copyright-file-doc-symlink
%:
dh $@
-binary: binary-indep
-binary-arch:
-binary-indep:
- dh binary-indep --until dh_prep
+override_dh_prep:
mkdir -p debian/$(pkg)-helper/usr/share/doc
ln -s $(pkg) debian/$(pkg)-helper/usr/share/doc/$(pkg)-helper
mkdir -p debian/$(pkg)-weak/usr/share/doc
ln -s $(pkg) debian/$(pkg)-weak/usr/share/doc/$(pkg)-weak
- dh binary --remaining
diff --git a/t/tests/copyright-file-general/debian/debian/control.in b/t/tests/copyright-file-general/debian/debian/control.in
index 26cac4c..423b9cb 100644
--- a/t/tests/copyright-file-general/debian/debian/control.in
+++ b/t/tests/copyright-file-general/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: copyright-iso-8859-1
Architecture: all
diff --git a/t/tests/copyright-file-general/debian/debian/rules b/t/tests/copyright-file-general/debian/debian/rules
index 882cf02..100a695 100755
--- a/t/tests/copyright-file-general/debian/debian/rules
+++ b/t/tests/copyright-file-general/debian/debian/rules
@@ -2,14 +2,12 @@
%:
dh $@
-binary: binary-arch binary-indep
-binary-arch:
-binary-indep:
- dh binary-indep --until dh_installdocs
+override_dh_installdocs:
+ dh_installdocs
install -m 644 debian/copyright-no-errors.copyright debian/copyright-symlink/usr/share/doc/copyright-symlink/symlink
rm debian/copyright-symlink/usr/share/doc/copyright-symlink/copyright
ln -s symlink debian/copyright-symlink/usr/share/doc/copyright-symlink/copyright
gzip -9 debian/copyright-compressed/usr/share/doc/copyright-compressed/copyright
mkdir -p debian/copyright-old-style/usr/doc/copyright
mv debian/copyright-old-style/usr/share/doc/copyright-old-style/copyright debian/copyright-old-style/usr/doc/copyright/copyright-old-style
- dh binary-indep --remaining
+
diff --git a/t/tests/copyright-file-license-symlink/debian/debian/control.in b/t/tests/copyright-file-license-symlink/debian/debian/control.in
index 19e272b..9314708 100644
--- a/t/tests/copyright-file-license-symlink/debian/debian/control.in
+++ b/t/tests/copyright-file-license-symlink/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Homepage: http://lintian.debian.org/
Package: {$srcpkg}-bad
diff --git a/t/tests/copyright-file-symlink/debian/debian/control.in b/t/tests/copyright-file-symlink/debian/debian/control.in
index 0949e02..6168e8a 100644
--- a/t/tests/copyright-file-symlink/debian/debian/control.in
+++ b/t/tests/copyright-file-symlink/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: symlink-to-foreign
Architecture: all
diff --git a/t/tests/cruft-crlf-eols/debian/debian/control.in b/t/tests/cruft-crlf-eols/debian/debian/control.in
index b2cd55a..331fc6e 100644
--- a/t/tests/cruft-crlf-eols/debian/debian/control.in
+++ b/t/tests/cruft-crlf-eols/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/cruft-updated-libtool/debian/debian/control.in b/t/tests/cruft-updated-libtool/debian/debian/control.in
index 82de9d0..92c7e81 100644
--- a/t/tests/cruft-updated-libtool/debian/debian/control.in
+++ b/t/tests/cruft-updated-libtool/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7), libtool
+Build-Depends: debhelper (>= 9), libtool
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/deb-format-udeb-compression/debian/debian/control.in b/t/tests/deb-format-udeb-compression/debian/debian/control.in
index 37dc7d7..a337806 100644
--- a/t/tests/deb-format-udeb-compression/debian/debian/control.in
+++ b/t/tests/deb-format-udeb-compression/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: debian-installer
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: some-udeb
Architecture: all
diff --git a/t/tests/debhelper-arch-depends/debian/debian/control.in b/t/tests/debhelper-arch-depends/debian/debian/control.in
index 4575b04..163b5e8 100644
--- a/t/tests/debhelper-arch-depends/debian/debian/control.in
+++ b/t/tests/debhelper-arch-depends/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7),
+Build-Depends: debhelper (>= 9),
cli-common-dev (>= 0.5.7) [i386 sparc amd64 ia64]
Package: {$srcpkg}
diff --git a/t/tests/debhelper-deprecated/debian/debian/control.in b/t/tests/debhelper-deprecated/debian/debian/control.in
index e877baa..16fc0b0 100644
--- a/t/tests/debhelper-deprecated/debian/debian/control.in
+++ b/t/tests/debhelper-deprecated/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), python-central, python-ply (>= 3.4-1~)
+Build-Depends: debhelper (>= 9), python-central, python-ply (>= 3.4-1~)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/debhelper-dh-compat/tags b/t/tests/debhelper-dh-compat/tags
index 6d6a9b6..a62739c 100644
--- a/t/tests/debhelper-dh-compat/tags
+++ b/t/tests/debhelper-dh-compat/tags
@@ -1,4 +1,4 @@
E: debhelper-dh-compat source: debhelper-compatibility-level-not-a-number '{3'
-E: debhelper-dh-compat source: declares-possibly-conflicting-debhelper-compat-versions rules='{3' compat=7
+E: debhelper-dh-compat source: declares-possibly-conflicting-debhelper-compat-versions rules='{3' compat=9
W: debhelper-dh-compat source: debian-rules-sets-DH_COMPAT line 3
W: debhelper-dh-compat source: package-uses-deprecated-debhelper-compat-version 3
diff --git a/t/tests/debhelper-dh-nativejava/debian/debian/control.in b/t/tests/debhelper-dh-nativejava/debian/debian/control.in
index ccc9a46..0186893 100644
--- a/t/tests/debhelper-dh-nativejava/debian/debian/control.in
+++ b/t/tests/debhelper-dh-nativejava/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7), gcj-native-helper
+Build-Depends: debhelper (>= 9), gcj-native-helper
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/debhelper-dh-python-helpers/debian/debian/control.in b/t/tests/debhelper-dh-python-helpers/debian/debian/control.in
index f4dbf05..4f2fd57 100644
--- a/t/tests/debhelper-dh-python-helpers/debian/debian/control.in
+++ b/t/tests/debhelper-dh-python-helpers/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: python-cheshire
Section: python
diff --git a/t/tests/debhelper-no-depends/debian/debian/compat b/t/tests/debhelper-executable-files/debian/debian/compat
similarity index 100%
copy from t/tests/debhelper-no-depends/debian/debian/compat
copy to t/tests/debhelper-executable-files/debian/debian/compat
diff --git a/debian/compat b/t/tests/debhelper-maintscripts-depends/debian/debian/compat
similarity index 100%
copy from debian/compat
copy to t/tests/debhelper-maintscripts-depends/debian/debian/compat
diff --git a/t/tests/debhelper-maintscripts-depends/debian/debian/control.in b/t/tests/debhelper-maintscripts-depends/debian/debian/control.in
index e5e58ed..1100475 100644
--- a/t/tests/debhelper-maintscripts-depends/debian/debian/control.in
+++ b/t/tests/debhelper-maintscripts-depends/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7.0.50~)
Package: debhelper-maint
Architecture: all
diff --git a/t/tests/debhelper-misc-depends-fp/debian/debian/control.in b/t/tests/debhelper-misc-depends-fp/debian/debian/control.in
index ebad94c..83171e8 100644
--- a/t/tests/debhelper-misc-depends-fp/debian/debian/control.in
+++ b/t/tests/debhelper-misc-depends-fp/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/debian/compat b/t/tests/debhelper-override-depends/debian/debian/compat
similarity index 100%
copy from debian/compat
copy to t/tests/debhelper-override-depends/debian/debian/compat
diff --git a/t/tests/debhelper-unused-cdbs/debian/debian/control.in b/t/tests/debhelper-unused-cdbs/debian/debian/control.in
index 19b8773..5cbffe7 100644
--- a/t/tests/debhelper-unused-cdbs/debian/debian/control.in
+++ b/t/tests/debhelper-unused-cdbs/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7), cdbs
+Build-Depends: debhelper (>= 9), cdbs
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/description-empty-paragraph/debian/debian/control.in b/t/tests/description-empty-paragraph/debian/debian/control.in
index 05533ed..7c0ca51 100644
--- a/t/tests/description-empty-paragraph/debian/debian/control.in
+++ b/t/tests/description-empty-paragraph/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/description-general/debian/debian/control.in b/t/tests/description-general/debian/debian/control.in
index db89089..8c9eb3d 100644
--- a/t/tests/description-general/debian/debian/control.in
+++ b/t/tests/description-general/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/description-homepage/debian/debian/control.in b/t/tests/description-homepage/debian/debian/control.in
index 6b34296..57c1191 100644
--- a/t/tests/description-homepage/debian/debian/control.in
+++ b/t/tests/description-homepage/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/description-wording/debian/debian/control.in b/t/tests/description-wording/debian/debian/control.in
index 60f4ef8..fb07f9c 100644
--- a/t/tests/description-wording/debian/debian/control.in
+++ b/t/tests/description-wording/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/fields-aspell/debian/debian/control.in b/t/tests/fields-aspell/debian/debian/control.in
index 401aa6d..64f646c 100644
--- a/t/tests/fields-aspell/debian/debian/control.in
+++ b/t/tests/fields-aspell/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: aspell-en
Architecture: {$architecture}
diff --git a/t/tests/fields-bad-homepage/debian/debian/control.in b/t/tests/fields-bad-homepage/debian/debian/control.in
index 0cdefad..6aab75d 100644
--- a/t/tests/fields-bad-homepage/debian/debian/control.in
+++ b/t/tests/fields-bad-homepage/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
# Whoops, typo
Homepage: ttp://lintian.debian.org/
diff --git a/t/tests/fields-build-depends-general/debian/debian/control.in b/t/tests/fields-build-depends-general/debian/debian/control.in
index bd807fc..a73bb42 100644
--- a/t/tests/fields-build-depends-general/debian/debian/control.in
+++ b/t/tests/fields-build-depends-general/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), bd-conflict, revision-1 (>= 1.0-1),
+Build-Depends: debhelper (>= 9), bd-conflict, revision-1 (>= 1.0-1),
bash, make, x-dev, build-essential, new-package | xlibmesa-gl-dev,
xorg-dev, java-propose-classpath, python3.2-dev, foo [all],
bar [i386 any], baz [source i3!86], baz [i386 !amd64],
diff --git a/t/tests/fields-cpan-homepage/debian/debian/control.in b/t/tests/fields-cpan-homepage/debian/debian/control.in
index 4c2f323..e2fffb5 100644
--- a/t/tests/fields-cpan-homepage/debian/debian/control.in
+++ b/t/tests/fields-cpan-homepage/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Homepage: http://search.cpan.org/Foo-Bar-9.0_01/
Package: {$srcpkg}
diff --git a/t/tests/fields-debug-bad/debian/debian/control.in b/t/tests/fields-debug-bad/debian/debian/control.in
index 7902aeb..e04ffe2 100644
--- a/t/tests/fields-debug-bad/debian/debian/control.in
+++ b/t/tests/fields-debug-bad/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: optional
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/fields-depends-general/debian/debian/control.in b/t/tests/fields-depends-general/debian/debian/control.in
index bc0fd42..08e7507 100644
--- a/t/tests/fields-depends-general/debian/debian/control.in
+++ b/t/tests/fields-depends-general/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/fields-depends-metapackage/debian/debian/control.in b/t/tests/fields-depends-metapackage/debian/debian/control.in
index e63ee3b..c266380 100644
--- a/t/tests/fields-depends-metapackage/debian/debian/control.in
+++ b/t/tests/fields-depends-metapackage/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), xorg-dev
+Build-Depends: debhelper (>= 9), xorg-dev
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/fields-depends-wildcard/debian/debian/control.in b/t/tests/fields-depends-wildcard/debian/debian/control.in
index 9119132..7df2dab 100644
--- a/t/tests/fields-depends-wildcard/debian/debian/control.in
+++ b/t/tests/fields-depends-wildcard/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/fields-dmua/debian/debian/control.in b/t/tests/fields-dmua/debian/debian/control.in
index 4d1515c..03f6a00 100644
--- a/t/tests/fields-dmua/debian/debian/control.in
+++ b/t/tests/fields-dmua/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
DM-Upload-Allowed: no
Package: {$srcpkg}
diff --git a/t/tests/fields-doc-pkg-wrong-arch/debian/debian/control.in b/t/tests/fields-doc-pkg-wrong-arch/debian/debian/control.in
index 2639de4..189ffb7 100644
--- a/t/tests/fields-doc-pkg-wrong-arch/debian/debian/control.in
+++ b/t/tests/fields-doc-pkg-wrong-arch/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: doc
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}-doc
Architecture: any
diff --git a/t/tests/fields-duplicate-build/debian/debian/control.in b/t/tests/fields-duplicate-build/debian/debian/control.in
index dca5eef..bbe2d72 100644
--- a/t/tests/fields-duplicate-build/debian/debian/control.in
+++ b/t/tests/fields-duplicate-build/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), perl (>= 5.10) | libmodule-build-perl
+Build-Depends: debhelper (>= 9), perl (>= 5.10) | libmodule-build-perl
Build-Depends-Indep: perl (>= 5.10)
Package: {$srcpkg}
diff --git a/t/tests/fields-essential-yes-source/debian/debian/control.in b/t/tests/fields-essential-yes-source/debian/debian/control.in
index 5c773d4..9364893 100644
--- a/t/tests/fields-essential-yes-source/debian/debian/control.in
+++ b/t/tests/fields-essential-yes-source/debian/debian/control.in
@@ -4,7 +4,7 @@ Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
Essential: yes
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/fields-essential/debian/debian/control.in b/t/tests/fields-essential/debian/debian/control.in
index 2bd06d9..1252693 100644
--- a/t/tests/fields-essential/debian/debian/control.in
+++ b/t/tests/fields-essential/debian/debian/control.in
@@ -4,7 +4,7 @@ Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
XS-Essential: no
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Essential: yes
diff --git a/t/tests/fields-essential/debian/debian/rules b/t/tests/fields-essential/debian/debian/rules
index 4f47599..41937bf 100755
--- a/t/tests/fields-essential/debian/debian/rules
+++ b/t/tests/fields-essential/debian/debian/rules
@@ -3,8 +3,7 @@ pkg=fields-essential
export DH_VERBOSE=1
%:
dh $@
-binary:
- dh --before dh_builddeb binary
+
+override_dh_builddeb:
dh_builddeb --package=$(pkg)
dpkg-deb --nocheck --build debian/$(pkg)2 ../$(pkg)2_1.0_all.deb
- dh --after dh_builddeb binary
diff --git a/t/tests/fields-indep-without-arch-indep/debian/debian/control.in b/t/tests/fields-indep-without-arch-indep/debian/debian/control.in
index 02b3605..17fa001 100644
--- a/t/tests/fields-indep-without-arch-indep/debian/debian/control.in
+++ b/t/tests/fields-indep-without-arch-indep/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Build-Depends-Indep: some-package
Package: {$srcpkg}
diff --git a/t/tests/fields-java/debian/debian/control.in b/t/tests/fields-java/debian/debian/control.in
index 7962716..962e5ce 100644
--- a/t/tests/fields-java/debian/debian/control.in
+++ b/t/tests/fields-java/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: java
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), openjdk-6-doc
+Build-Depends: debhelper (>= 9), openjdk-6-doc
Package: lib{$srcpkg}-java
Architecture: all
diff --git a/t/tests/fields-maintainer-bounces/debian/debian/control.in b/t/tests/fields-maintainer-bounces/debian/debian/control.in
index 2a44bdf..b16dc63 100644
--- a/t/tests/fields-maintainer-bounces/debian/debian/control.in
+++ b/t/tests/fields-maintainer-bounces/debian/debian/control.in
@@ -5,7 +5,7 @@ Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Uploaders: I Will Loop <fields-maintainer-bounces@packages.debian.org>,
I Will Loop Too <fields-maintainer-bounces@PACKAGES.QA.DEBIAN.ORG>
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/fields-maintainer-general/debian/debian/control.in b/t/tests/fields-maintainer-general/debian/debian/control.in
index 3eaf05a..3ef0f1e 100644
--- a/t/tests/fields-maintainer-general/debian/debian/control.in
+++ b/t/tests/fields-maintainer-general/debian/debian/control.in
@@ -8,7 +8,7 @@ Uploaders: <lintian-maint@debian.org>, Russ Allbery <rra@debian.org>,
Mr. Missing Comma <mrmc@comma.com>
Mrs. Missing Comma <mrsmc@comma.com>
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/fields-maintainer/debian/debian/control.in b/t/tests/fields-maintainer/debian/debian/control.in
index 4ef1a57..c5bc253 100644
--- a/t/tests/fields-maintainer/debian/debian/control.in
+++ b/t/tests/fields-maintainer/debian/debian/control.in
@@ -4,7 +4,7 @@ Section: devel
Maintainer: Mrs. Localhost<user@localhost>
Uploaders: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/fields-malformed-vcs-fields/debian/debian/control.in b/t/tests/fields-malformed-vcs-fields/debian/debian/control.in
index 6cd79b2..8b1b1a8 100644
--- a/t/tests/fields-malformed-vcs-fields/debian/debian/control.in
+++ b/t/tests/fields-malformed-vcs-fields/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Vcs-Browser: svn.debian.org/wsvn/foobar/trunk
Vcs-Svn: svn+ssh://svn.debian.org/svn/foobar/trunk
diff --git a/t/tests/fields-multi-arch/debian/debian/control.in b/t/tests/fields-multi-arch/debian/debian/control.in
index 3bea942..524f823 100644
--- a/t/tests/fields-multi-arch/debian/debian/control.in
+++ b/t/tests/fields-multi-arch/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}-same
Architecture: any
diff --git a/t/tests/fields-multiple-x-deps/debian/debian/control.in b/t/tests/fields-multiple-x-deps/debian/debian/control.in
index 2863a24..91a6f4a 100644
--- a/t/tests/fields-multiple-x-deps/debian/debian/control.in
+++ b/t/tests/fields-multiple-x-deps/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/fields-no-homepage/debian/debian/control.in b/t/tests/fields-no-homepage/debian/debian/control.in
index 19297ed..b0f4d2d 100644
--- a/t/tests/fields-no-homepage/debian/debian/control.in
+++ b/t/tests/fields-no-homepage/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/fields-perl-provides/debian/debian/control.in b/t/tests/fields-perl-provides/debian/debian/control.in
index 0ffb2ce..07ef20b 100644
--- a/t/tests/fields-perl-provides/debian/debian/control.in
+++ b/t/tests/fields-perl-provides/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: libsys-syslog-perl
Section: perl
diff --git a/t/tests/fields-qa-maint-address/debian/debian/control.in b/t/tests/fields-qa-maint-address/debian/debian/control.in
index b40e436..cfe3b7b 100644
--- a/t/tests/fields-qa-maint-address/debian/debian/control.in
+++ b/t/tests/fields-qa-maint-address/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: devel
Maintainer: Debian QA Group <debian-qa@lists.debian.org>
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: all
diff --git a/t/tests/fields-qa-maint-name/debian/debian/control.in b/t/tests/fields-qa-maint-name/debian/debian/control.in
index 1f12d5a..aa4732e 100644
--- a/t/tests/fields-qa-maint-name/debian/debian/control.in
+++ b/t/tests/fields-qa-maint-name/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: devel
Maintainer: Debian QA <packages@qa.debian.org>
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: all
diff --git a/t/tests/fields-redundant/debian/debian/control.in b/t/tests/fields-redundant/debian/debian/control.in
index f70f923..2e03f97 100644
--- a/t/tests/fields-redundant/debian/debian/control.in
+++ b/t/tests/fields-redundant/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Bugs: debbugs://bugs.debian.org/
Origin: debian
diff --git a/t/tests/fields-section-general/debian/debian/control.in b/t/tests/fields-section-general/debian/debian/control.in
index 808c553..83b0b2f 100644
--- a/t/tests/fields-section-general/debian/debian/control.in
+++ b/t/tests/fields-section-general/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: contrib/{$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: all
diff --git a/t/tests/fields-section-udeb/debian/debian/control.in b/t/tests/fields-section-udeb/debian/debian/control.in
index 928116b..8785bee 100644
--- a/t/tests/fields-section-udeb/debian/debian/control.in
+++ b/t/tests/fields-section-udeb/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: all
diff --git a/t/tests/fields-transitional/debian/debian/control.in b/t/tests/fields-transitional/debian/debian/control.in
index f2eb9da..20829f1 100644
--- a/t/tests/fields-transitional/debian/debian/control.in
+++ b/t/tests/fields-transitional/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: standard
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: all
diff --git a/t/tests/fields-unknown-obsolete-fields/debian/debian/control.in b/t/tests/fields-unknown-obsolete-fields/debian/debian/control.in
index 29b93a7..5197fd0 100644
--- a/t/tests/fields-unknown-obsolete-fields/debian/debian/control.in
+++ b/t/tests/fields-unknown-obsolete-fields/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
XS-Comment: This is random comment ending up in the dsc file.
Package: {$srcpkg}
diff --git a/t/tests/fields-uploaders/debian/debian/control.in b/t/tests/fields-uploaders/debian/debian/control.in
index 450018b..5d561d3 100644
--- a/t/tests/fields-uploaders/debian/debian/control.in
+++ b/t/tests/fields-uploaders/debian/debian/control.in
@@ -8,7 +8,7 @@ Uploaders: Mrs. Localhost <user@localhost>,
John A. J. Doe <i.am.ok@somewhere.com>,
Doris Double-Email <Doris Double-Email <doris@demail.com>>
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/fields-vcs-fields/debian/debian/control.in b/t/tests/fields-vcs-fields/debian/debian/control.in
index 9908189..0aa9a61 100644
--- a/t/tests/fields-vcs-fields/debian/debian/control.in
+++ b/t/tests/fields-vcs-fields/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Vcs-Browser: https://svn.debian.org/wsvn/foobar/trunk
Vcs-Svn: svn://svn.debian.org/svn/foobar/trunk
Vcs-Mtn: www.example.org org.debian.foobar
diff --git a/t/tests/fields-virtual-packages/debian/debian/control.in b/t/tests/fields-virtual-packages/debian/debian/control.in
index 41fc040..41a0afb 100644
--- a/t/tests/fields-virtual-packages/debian/debian/control.in
+++ b/t/tests/fields-virtual-packages/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: any
diff --git a/t/tests/fields-wrong-section/debian/debian/control.in b/t/tests/fields-wrong-section/debian/debian/control.in
index ffce561..0ff8293 100644
--- a/t/tests/fields-wrong-section/debian/debian/control.in
+++ b/t/tests/fields-wrong-section/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: any
diff --git a/t/tests/files-arch-indep-not-marked-all/debian/debian/control.in b/t/tests/files-arch-indep-not-marked-all/debian/debian/control.in
index fc7a0e1..6e01873 100644
--- a/t/tests/files-arch-indep-not-marked-all/debian/debian/control.in
+++ b/t/tests/files-arch-indep-not-marked-all/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/files-bad-perm-owner/debian/debian/control.in b/t/tests/files-bad-perm-owner/debian/debian/control.in
index 686a2bb..cae6c04 100644
--- a/t/tests/files-bad-perm-owner/debian/debian/control.in
+++ b/t/tests/files-bad-perm-owner/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: binary
Architecture: all
diff --git a/t/tests/files-empty/debian/debian/control.in b/t/tests/files-empty/debian/debian/control.in
index fc7a0e1..6e01873 100644
--- a/t/tests/files-empty/debian/debian/control.in
+++ b/t/tests/files-empty/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/files-flash-non-free/debian/debian/control.in b/t/tests/files-flash-non-free/debian/debian/control.in
index b531357..90047d6 100644
--- a/t/tests/files-flash-non-free/debian/debian/control.in
+++ b/t/tests/files-flash-non-free/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Homepage: http://lintian.debian.org/
Package: {$srcpkg}
diff --git a/t/tests/files-fonts/debian/debian/control.in b/t/tests/files-fonts/debian/debian/control.in
index 2fe3f15..88b4e43 100644
--- a/t/tests/files-fonts/debian/debian/control.in
+++ b/t/tests/files-fonts/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Homepage: http://lintian.debian.org/
Package: {$srcpkg}
diff --git a/t/tests/files-games-section/debian/debian/control.in b/t/tests/files-games-section/debian/debian/control.in
index 43ef52a..fb2c2ca 100644
--- a/t/tests/files-games-section/debian/debian/control.in
+++ b/t/tests/files-games-section/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}-both
Architecture: {$architecture}
diff --git a/t/tests/files-gzip-ma-same/debian/debian/control.in b/t/tests/files-gzip-ma-same/debian/debian/control.in
index 0926b88..fa044dd 100644
--- a/t/tests/files-gzip-ma-same/debian/debian/control.in
+++ b/t/tests/files-gzip-ma-same/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: any
diff --git a/t/tests/files-gzip/debian/debian/rules b/t/tests/files-gzip/debian/debian/rules
index ece1c4a..f9cc447 100755
--- a/t/tests/files-gzip/debian/debian/rules
+++ b/t/tests/files-gzip/debian/debian/rules
@@ -2,7 +2,7 @@
pkg=files-gzip
%:
dh $@
-binary:
- dh --until install binary
+
+override_dh_installdocs:
+ dh_installdocs
echo "Hello world :)" > debian/$(pkg)/usr/share/doc/$(pkg)/changelog.gz
- dh --after install binary
diff --git a/t/tests/files-multiarch-missing-pre-deps/debian/debian/control.in b/t/tests/files-multiarch-missing-pre-deps/debian/debian/control.in
index a3c6506..1fd8f17 100644
--- a/t/tests/files-multiarch-missing-pre-deps/debian/debian/control.in
+++ b/t/tests/files-multiarch-missing-pre-deps/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: libs
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: libbasic2
Architecture: any
diff --git a/t/tests/files-multiarch-so-script/debian/debian/control.in b/t/tests/files-multiarch-so-script/debian/debian/control.in
index a3c6506..1fd8f17 100644
--- a/t/tests/files-multiarch-so-script/debian/debian/control.in
+++ b/t/tests/files-multiarch-so-script/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: libs
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: libbasic2
Architecture: any
diff --git a/debian/compat b/t/tests/files-python-general/debian/debian/compat
similarity index 100%
copy from debian/compat
copy to t/tests/files-python-general/debian/debian/compat
diff --git a/t/tests/files-python-helpers/debian/debian/control.in b/t/tests/files-python-helpers/debian/debian/control.in
index a0ca828..1d16f0c 100644
--- a/t/tests/files-python-helpers/debian/debian/control.in
+++ b/t/tests/files-python-helpers/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: python
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: python-foo
Architecture: all
diff --git a/t/tests/files-python-modules/debian/debian/control.in b/t/tests/files-python-modules/debian/debian/control.in
index 1b72861..1d16f0c 100644
--- a/t/tests/files-python-modules/debian/debian/control.in
+++ b/t/tests/files-python-modules/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: python
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: python-foo
Architecture: all
diff --git a/t/tests/files-uses-perl4-libs-with-dep/debian/debian/control.in b/t/tests/files-uses-perl4-libs-with-dep/debian/debian/control.in
index 475f52a..50bb12a 100644
--- a/t/tests/files-uses-perl4-libs-with-dep/debian/debian/control.in
+++ b/t/tests/files-uses-perl4-libs-with-dep/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/files-uses-perl4-libs-without-dep/debian/debian/control.in b/t/tests/files-uses-perl4-libs-without-dep/debian/debian/control.in
index 9f42d6b..086ae00 100644
--- a/t/tests/files-uses-perl4-libs-without-dep/debian/debian/control.in
+++ b/t/tests/files-uses-perl4-libs-without-dep/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), perl
+Build-Depends: debhelper (>= 9), perl
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/group-checks-circular-deps/debian/debian/control.in b/t/tests/group-checks-circular-deps/debian/debian/control.in
index 5c43b3e..5a6cf76 100644
--- a/t/tests/group-checks-circular-deps/debian/debian/control.in
+++ b/t/tests/group-checks-circular-deps/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: root
Architecture: all
diff --git a/t/tests/group-checks-file-conflict/debian/debian/control.in b/t/tests/group-checks-file-conflict/debian/debian/control.in
index 9a2d6cf..0df84e6 100644
--- a/t/tests/group-checks-file-conflict/debian/debian/control.in
+++ b/t/tests/group-checks-file-conflict/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: pkga
Architecture: all
diff --git a/t/tests/group-checks-multi-arch/debian/debian/control.in b/t/tests/group-checks-multi-arch/debian/debian/control.in
index 763e4c0..0b5cbf8 100644
--- a/t/tests/group-checks-multi-arch/debian/debian/control.in
+++ b/t/tests/group-checks-multi-arch/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: pkg-foreign
Architecture: all
diff --git a/t/tests/group-checks-wrong-priorities/debian/debian/control.in b/t/tests/group-checks-wrong-priorities/debian/debian/control.in
index ce480e7..bb06ffa 100644
--- a/t/tests/group-checks-wrong-priorities/debian/debian/control.in
+++ b/t/tests/group-checks-wrong-priorities/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: pkg-optional
Architecture: all
diff --git a/t/tests/init.d-general/debian/debian/control.in b/t/tests/init.d-general/debian/debian/control.in
index fb87297..7b01af0 100644
--- a/t/tests/init.d-general/debian/debian/control.in
+++ b/t/tests/init.d-general/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/init.d-lsb-headers/debian/debian/control.in b/t/tests/init.d-lsb-headers/debian/debian/control.in
index d70d06d..a34d2a2 100644
--- a/t/tests/init.d-lsb-headers/debian/debian/control.in
+++ b/t/tests/init.d-lsb-headers/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/java-classpath/debian/debian/control.in b/t/tests/java-classpath/debian/debian/control.in
index 21731e8..4226e5e 100644
--- a/t/tests/java-classpath/debian/debian/control.in
+++ b/t/tests/java-classpath/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), javahelper (>= 0.32~), default-jdk
+Build-Depends: debhelper (>= 9), javahelper (>= 0.32~), default-jdk
Package: libcp-missing-java
Architecture: {$architecture}
diff --git a/t/tests/java-jars/debian/debian/control.in b/t/tests/java-jars/debian/debian/control.in
index 26bfb69..2af6a8d 100644
--- a/t/tests/java-jars/debian/debian/control.in
+++ b/t/tests/java-jars/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), javahelper, default-jdk
+Build-Depends: debhelper (>= 9), javahelper, default-jdk
Package: libtesta-java
Architecture: {$architecture}
diff --git a/t/tests/lintian-check-tags-file/debian/debian/control.in b/t/tests/lintian-check-tags-file/debian/debian/control.in
index 1bae287..673b607 100644
--- a/t/tests/lintian-check-tags-file/debian/debian/control.in
+++ b/t/tests/lintian-check-tags-file/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Section: unknown
diff --git a/t/tests/lintian-display-level/debian/debian/control.in b/t/tests/lintian-display-level/debian/debian/control.in
index 1f4bd68..89e0bc3 100644
--- a/t/tests/lintian-display-level/debian/debian/control.in
+++ b/t/tests/lintian-display-level/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/lintian-ftp-rejects/debian/debian/control.in b/t/tests/lintian-ftp-rejects/debian/debian/control.in
index 1f4bd68..89e0bc3 100644
--- a/t/tests/lintian-ftp-rejects/debian/debian/control.in
+++ b/t/tests/lintian-ftp-rejects/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/lintian-output-colons/debian/debian/control.in b/t/tests/lintian-output-colons/debian/debian/control.in
index 10055d9..3302f97 100644
--- a/t/tests/lintian-output-colons/debian/debian/control.in
+++ b/t/tests/lintian-output-colons/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/lintian-output-letter/debian/debian/control.in b/t/tests/lintian-output-letter/debian/debian/control.in
index 10055d9..3302f97 100644
--- a/t/tests/lintian-output-letter/debian/debian/control.in
+++ b/t/tests/lintian-output-letter/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/lintian-output-xml/debian/debian/control.in b/t/tests/lintian-output-xml/debian/debian/control.in
index 10055d9..3302f97 100644
--- a/t/tests/lintian-output-xml/debian/debian/control.in
+++ b/t/tests/lintian-output-xml/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/lintian-suppress-tags/debian/debian/control.in b/t/tests/lintian-suppress-tags/debian/debian/control.in
index f2825d9..743f663 100644
--- a/t/tests/lintian-suppress-tags/debian/debian/control.in
+++ b/t/tests/lintian-suppress-tags/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Section: unknown
diff --git a/t/tests/manpages-dependencies/debian/debian/control.in b/t/tests/manpages-dependencies/debian/debian/control.in
index cfd4133..fe6d235 100644
--- a/t/tests/manpages-dependencies/debian/debian/control.in
+++ b/t/tests/manpages-dependencies/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: pecho
Architecture: all
diff --git a/t/tests/menu-format-general/debian/debian/control.in b/t/tests/menu-format-general/debian/debian/control.in
index 1a240a1..17b6fd1 100644
--- a/t/tests/menu-format-general/debian/debian/control.in
+++ b/t/tests/menu-format-general/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: menu-none
Architecture: all
diff --git a/t/tests/menus-doc-base-registration/debian/debian/control.in b/t/tests/menus-doc-base-registration/debian/debian/control.in
index 9664fc6..dd358bf 100644
--- a/t/tests/menus-doc-base-registration/debian/debian/control.in
+++ b/t/tests/menus-doc-base-registration/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}-pdf
Architecture: {$architecture}
diff --git a/t/tests/ocaml-general/debian/debian/control.in b/t/tests/ocaml-general/debian/debian/control.in
index 4b3ab65..347ca31 100644
--- a/t/tests/ocaml-general/debian/debian/control.in
+++ b/t/tests/ocaml-general/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: libocaml-general-ocaml
Architecture: {$architecture}
diff --git a/t/tests/patch-systems-dpatch-description/debian/debian/control.in b/t/tests/patch-systems-dpatch-description/debian/debian/control.in
index 6c46c46..177d91a 100644
--- a/t/tests/patch-systems-dpatch-description/debian/debian/control.in
+++ b/t/tests/patch-systems-dpatch-description/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), dpatch
+Build-Depends: debhelper (>= 9), dpatch
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/patch-systems-empty-series/debian/debian/control.in b/t/tests/patch-systems-empty-series/debian/debian/control.in
index 5f56ffb..e3a3628 100644
--- a/t/tests/patch-systems-empty-series/debian/debian/control.in
+++ b/t/tests/patch-systems-empty-series/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: quilt, debhelper (>= 7)
+Build-Depends: quilt, debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/patch-systems-no-readme-source/debian/debian/control.in b/t/tests/patch-systems-no-readme-source/debian/debian/control.in
index 5f56ffb..e3a3628 100644
--- a/t/tests/patch-systems-no-readme-source/debian/debian/control.in
+++ b/t/tests/patch-systems-no-readme-source/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: quilt, debhelper (>= 7)
+Build-Depends: quilt, debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/patch-systems-quilt-description/debian/debian/control.in b/t/tests/patch-systems-quilt-description/debian/debian/control.in
index 5f56ffb..e3a3628 100644
--- a/t/tests/patch-systems-quilt-description/debian/debian/control.in
+++ b/t/tests/patch-systems-quilt-description/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: quilt, debhelper (>= 7)
+Build-Depends: quilt, debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/patch-systems-quilt-general/debian/debian/control.in b/t/tests/patch-systems-quilt-general/debian/debian/control.in
index d76a4bb..a5312e6 100644
--- a/t/tests/patch-systems-quilt-general/debian/debian/control.in
+++ b/t/tests/patch-systems-quilt-general/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), quilt, dpatch
+Build-Depends: debhelper (>= 9), quilt, dpatch
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/patch-systems-quilt-no-series/debian/debian/control.in b/t/tests/patch-systems-quilt-no-series/debian/debian/control.in
index 5f56ffb..e3a3628 100644
--- a/t/tests/patch-systems-quilt-no-series/debian/debian/control.in
+++ b/t/tests/patch-systems-quilt-no-series/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: quilt, debhelper (>= 7)
+Build-Depends: quilt, debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/patch-systems-quilt-source/debian/debian/control.in b/t/tests/patch-systems-quilt-source/debian/debian/control.in
index 07c8950..c35b565 100644
--- a/t/tests/patch-systems-quilt-source/debian/debian/control.in
+++ b/t/tests/patch-systems-quilt-source/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), quilt
+Build-Depends: debhelper (>= 9), quilt
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/rules-build-dep-pattern/debian/debian/control.in b/t/tests/rules-build-dep-pattern/debian/debian/control.in
index 6a076f1..410c914 100644
--- a/t/tests/rules-build-dep-pattern/debian/debian/control.in
+++ b/t/tests/rules-build-dep-pattern/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/rules-general/debian/debian/control.in b/t/tests/rules-general/debian/debian/control.in
index a50c22a..52d715e 100644
--- a/t/tests/rules-general/debian/debian/control.in
+++ b/t/tests/rules-general/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends-Indep: debhelper (>= 7.0.50~), python
+Build-Depends-Indep: debhelper (>= 9), python
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/rules-including-deprecated-makefiles/debian/debian/control.in b/t/tests/rules-including-deprecated-makefiles/debian/debian/control.in
index 2ac6fdd..43c0a4f 100644
--- a/t/tests/rules-including-deprecated-makefiles/debian/debian/control.in
+++ b/t/tests/rules-including-deprecated-makefiles/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), cdbs
+Build-Depends: debhelper (>= 9), cdbs
Package: {$srcpkg}
Architecture: all
diff --git a/t/tests/rules-missing-targets/debian/debian/control.in b/t/tests/rules-missing-targets/debian/debian/control.in
index 7c2832e..6f46af7 100644
--- a/t/tests/rules-missing-targets/debian/debian/control.in
+++ b/t/tests/rules-missing-targets/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: any
diff --git a/t/tests/scripts-control-interpreters/debian/debian/control.in b/t/tests/scripts-control-interpreters/debian/debian/control.in
index 8a2d266..c5a25b0 100644
--- a/t/tests/scripts-control-interpreters/debian/debian/control.in
+++ b/t/tests/scripts-control-interpreters/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}-paths
Architecture: {$architecture}
diff --git a/t/tests/scripts-interpreters/debian/debian/control.in b/t/tests/scripts-interpreters/debian/debian/control.in
index c14dbca..f267952 100644
--- a/t/tests/scripts-interpreters/debian/debian/control.in
+++ b/t/tests/scripts-interpreters/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/scripts-ocamlrun/debian/debian/control.in b/t/tests/scripts-ocamlrun/debian/debian/control.in
index ec300aa..90bcc3f 100644
--- a/t/tests/scripts-ocamlrun/debian/debian/control.in
+++ b/t/tests/scripts-ocamlrun/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/scripts-uses-perl4-libs-with-dep/debian/debian/control.in b/t/tests/scripts-uses-perl4-libs-with-dep/debian/debian/control.in
index b3a9738..251a310 100644
--- a/t/tests/scripts-uses-perl4-libs-with-dep/debian/debian/control.in
+++ b/t/tests/scripts-uses-perl4-libs-with-dep/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), perl
+Build-Depends: debhelper (>= 9), perl
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/scripts-uses-perl4-libs-without-dep/debian/debian/control.in b/t/tests/scripts-uses-perl4-libs-without-dep/debian/debian/control.in
index 9f42d6b..086ae00 100644
--- a/t/tests/scripts-uses-perl4-libs-without-dep/debian/debian/control.in
+++ b/t/tests/scripts-uses-perl4-libs-without-dep/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), perl
+Build-Depends: debhelper (>= 9), perl
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/shared-libs-control-file/debian/debian/control.in b/t/tests/shared-libs-control-file/debian/debian/control.in
index 4c40bf4..b97b985 100644
--- a/t/tests/shared-libs-control-file/debian/debian/control.in
+++ b/t/tests/shared-libs-control-file/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: libs
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: libnoshf1
Architecture: any
diff --git a/t/tests/shared-libs-exec-bit/debian/debian/control.in b/t/tests/shared-libs-exec-bit/debian/debian/control.in
index 8119117..deafe45 100644
--- a/t/tests/shared-libs-exec-bit/debian/debian/control.in
+++ b/t/tests/shared-libs-exec-bit/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: libs
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: libexecbit1
Architecture: any
diff --git a/t/tests/shared-libs-exit-fork/debian/debian/control.in b/t/tests/shared-libs-exit-fork/debian/debian/control.in
index 8119117..deafe45 100644
--- a/t/tests/shared-libs-exit-fork/debian/debian/control.in
+++ b/t/tests/shared-libs-exit-fork/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: libs
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: libexecbit1
Architecture: any
diff --git a/t/tests/shared-libs-exit/debian/debian/control.in b/t/tests/shared-libs-exit/debian/debian/control.in
index 8119117..deafe45 100644
--- a/t/tests/shared-libs-exit/debian/debian/control.in
+++ b/t/tests/shared-libs-exit/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: libs
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: libexecbit1
Architecture: any
diff --git a/t/tests/shared-libs-la-files/debian/debian/control.in b/t/tests/shared-libs-la-files/debian/debian/control.in
index da1368a..84f3ca4 100644
--- a/t/tests/shared-libs-la-files/debian/debian/control.in
+++ b/t/tests/shared-libs-la-files/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: all
diff --git a/t/tests/shared-libs-ldconfig-scripts/debian/debian/control.in b/t/tests/shared-libs-ldconfig-scripts/debian/debian/control.in
index ab166c4..dc0e1a4 100644
--- a/t/tests/shared-libs-ldconfig-scripts/debian/debian/control.in
+++ b/t/tests/shared-libs-ldconfig-scripts/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: libs
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: libfoo1
Architecture: any
diff --git a/t/tests/shared-libs-missing-ldconfig-symlink/debian/debian/control.in b/t/tests/shared-libs-missing-ldconfig-symlink/debian/debian/control.in
index 8119117..deafe45 100644
--- a/t/tests/shared-libs-missing-ldconfig-symlink/debian/debian/control.in
+++ b/t/tests/shared-libs-missing-ldconfig-symlink/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: libs
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: libexecbit1
Architecture: any
diff --git a/t/tests/shared-libs-multi-arch-foreign/debian/debian/control.in b/t/tests/shared-libs-multi-arch-foreign/debian/debian/control.in
index 7f312bc..61c40a1 100644
--- a/t/tests/shared-libs-multi-arch-foreign/debian/debian/control.in
+++ b/t/tests/shared-libs-multi-arch-foreign/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: libs
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: libhallo1
Architecture: any
diff --git a/t/tests/shared-libs-non-pic-i386/debian/debian/control.in b/t/tests/shared-libs-non-pic-i386/debian/debian/control.in
index e7d07c3..c14dce1 100644
--- a/t/tests/shared-libs-non-pic-i386/debian/debian/control.in
+++ b/t/tests/shared-libs-non-pic-i386/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: libs
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: libbaz3-1
Architecture: {$architecture}
diff --git a/t/tests/shared-libs-symbols-file/debian/debian/control.in b/t/tests/shared-libs-symbols-file/debian/debian/control.in
index 77455c2..bb4c38d 100644
--- a/t/tests/shared-libs-symbols-file/debian/debian/control.in
+++ b/t/tests/shared-libs-symbols-file/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: libs
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: libfoo1
Architecture: any
diff --git a/t/tests/shared-libs-unversioned/debian/debian/control.in b/t/tests/shared-libs-unversioned/debian/debian/control.in
index b59e74b..3f8c109 100644
--- a/t/tests/shared-libs-unversioned/debian/debian/control.in
+++ b/t/tests/shared-libs-unversioned/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: libs
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: libfoo
Architecture: {$architecture}
diff --git a/t/tests/spelling-multiword/debian/debian/control.in b/t/tests/spelling-multiword/debian/debian/control.in
index 433699a..77355cd 100644
--- a/t/tests/spelling-multiword/debian/debian/control.in
+++ b/t/tests/spelling-multiword/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/spelling-package-name/debian/debian/control.in b/t/tests/spelling-package-name/debian/debian/control.in
index d42604a..9b91ee5 100644
--- a/t/tests/spelling-package-name/debian/debian/control.in
+++ b/t/tests/spelling-package-name/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: nam
Architecture: all
diff --git a/t/tests/standards-version-invalid/debian/debian/control.in b/t/tests/standards-version-invalid/debian/debian/control.in
index 27b5ea1..dac82f2 100644
--- a/t/tests/standards-version-invalid/debian/debian/control.in
+++ b/t/tests/standards-version-invalid/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: 3.8
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/standards-version-newer/debian/debian/control.in b/t/tests/standards-version-newer/debian/debian/control.in
index 22339f7..c2c086b 100644
--- a/t/tests/standards-version-newer/debian/debian/control.in
+++ b/t/tests/standards-version-newer/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: 5.15.0.0
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/standards-version-old/debian/debian/control.in b/t/tests/standards-version-old/debian/debian/control.in
index 1d9daf8..50f3660 100644
--- a/t/tests/standards-version-old/debian/debian/control.in
+++ b/t/tests/standards-version-old/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: 3.9.0
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/strings-elf-detection/debian/debian/clean b/t/tests/strings-elf-detection/debian/debian/clean
new file mode 100644
index 0000000..3a78b69
--- /dev/null
+++ b/t/tests/strings-elf-detection/debian/debian/clean
@@ -0,0 +1,3 @@
+true
+foo
+bar::ELF
diff --git a/t/tests/strings-elf-detection/debian/debian/rules b/t/tests/strings-elf-detection/debian/debian/rules
index c3c9f8a..9225aff 100755
--- a/t/tests/strings-elf-detection/debian/debian/rules
+++ b/t/tests/strings-elf-detection/debian/debian/rules
@@ -2,14 +2,11 @@
pkg=strings-elf-detection
%:
dh $@
-binary:
- dh --before dh_install binary
+
+override_dh_install:
cp /bin/true .
touch foo bar::ELF
mkdir -p debian/$(pkg)/usr/lib/foo
cp /bin/true debian/$(pkg)/usr/lib/foo/true\ false
- dh --remaining binary
+ dh_install
-clean:
- dh clean
- $(RM) true foo bar::ELF
diff --git a/t/tests/symlinks-broken/debian/debian/control.in b/t/tests/symlinks-broken/debian/debian/control.in
index 230faf0..e97c126 100644
--- a/t/tests/symlinks-broken/debian/debian/control.in
+++ b/t/tests/symlinks-broken/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: broken-links
Architecture: all
diff --git a/t/tests/unpack-slashes-in-field-name/debian/debian/control.in b/t/tests/unpack-slashes-in-field-name/debian/debian/control.in
index 13d0688..287e98b 100644
--- a/t/tests/unpack-slashes-in-field-name/debian/debian/control.in
+++ b/t/tests/unpack-slashes-in-field-name/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
XS-../foo: bar
Package: {$srcpkg}
diff --git a/t/tests/version-substvars-general/debian/debian/control.in b/t/tests/version-substvars-general/debian/debian/control.in
index d8f5c9b..c5f7454 100644
--- a/t/tests/version-substvars-general/debian/debian/control.in
+++ b/t/tests/version-substvars-general/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: program-bin
Architecture: any
--
Debian package checker
Reply to: