[lintian] 01/01: t: Fix FTBFS with upcoming version of debhelper
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit 4af22cf6b2d217d10c2a5805f43b293fc84f13d1
Author: Niels Thykier <niels@thykier.net>
Date: Sat Apr 23 11:16:04 2016 +0000
t: Fix FTBFS with upcoming version of debhelper
The next version of debhelper requires debian/compat to be present.
Update tests that breaks without a debian/compat.
Signed-off-by: Niels Thykier <niels@thykier.net>
---
t/tests/generic-dh-make-2005/debian/debian/compat | 1 +
t/tests/generic-dh-make-2005/debian/debian/rules | 2 +-
t/tests/generic-dh-make-2005/desc | 1 -
t/tests/generic-dh-make-2005/pre_build | 7 ++++---
t/tests/generic-dh-make-2005/tags | 2 --
t/tests/legacy-debug/debian/debian/compat | 1 +
t/tests/legacy-debug/debian/debian/rules | 2 +-
t/tests/legacy-debug/pre_build | 5 -----
t/tests/legacy-debug/tags | 2 --
9 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/t/tests/generic-dh-make-2005/debian/debian/compat b/t/tests/generic-dh-make-2005/debian/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/t/tests/generic-dh-make-2005/debian/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/t/tests/generic-dh-make-2005/debian/debian/rules b/t/tests/generic-dh-make-2005/debian/debian/rules
index 6ba1e88..ee4bffb 100755
--- a/t/tests/generic-dh-make-2005/debian/debian/rules
+++ b/t/tests/generic-dh-make-2005/debian/debian/rules
@@ -9,7 +9,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-export DH_COMPAT=5 # Original 2, but debhelper does not support that any more
+
CFLAGS = -Wall -g
diff --git a/t/tests/generic-dh-make-2005/desc b/t/tests/generic-dh-make-2005/desc
index 9dd8b5d..7d9faad 100644
--- a/t/tests/generic-dh-make-2005/desc
+++ b/t/tests/generic-dh-make-2005/desc
@@ -9,7 +9,6 @@ Test-For:
changelog-is-dh_make-template
copyright-without-copyright-notice
debian-rules-ignores-make-clean-error
- debian-rules-sets-DH_COMPAT
debian-watch-file-is-missing
description-is-dh_make-template
extended-description-is-probably-too-short
diff --git a/t/tests/generic-dh-make-2005/pre_build b/t/tests/generic-dh-make-2005/pre_build
index eb81665..9429688 100755
--- a/t/tests/generic-dh-make-2005/pre_build
+++ b/t/tests/generic-dh-make-2005/pre_build
@@ -1,7 +1,8 @@
#!/bin/sh
#
-# dh_make in 2005 didn't generate a compat file for debhelper or a watch
-# file, so remove the ones that are copied over from the template.
+# Remove the watch file as dh_make in 2005 did not create it.
+# It did not create a compat file either, but debhelper does not forgive
+# that anymore.
+
-rm -f "$1"/debian/compat
rm -f "$1"/debian/watch
diff --git a/t/tests/generic-dh-make-2005/tags b/t/tests/generic-dh-make-2005/tags
index df8017d..06f948c 100644
--- a/t/tests/generic-dh-make-2005/tags
+++ b/t/tests/generic-dh-make-2005/tags
@@ -5,11 +5,9 @@ E: generic-dh-make-2005: section-is-dh_make-template
I: generic-dh-make-2005 source: debian-watch-file-is-missing
I: generic-dh-make-2005: extended-description-is-probably-too-short
W: generic-dh-make-2005 source: ancient-standards-version 3.6.2 (current is CURRENT)
-W: generic-dh-make-2005 source: debhelper-compat-file-is-missing
W: generic-dh-make-2005 source: debian-rules-ignores-make-clean-error line 47
W: generic-dh-make-2005 source: debian-rules-missing-recommended-target build-arch
W: generic-dh-make-2005 source: debian-rules-missing-recommended-target build-indep
-W: generic-dh-make-2005 source: debian-rules-sets-DH_COMPAT line 12
W: generic-dh-make-2005 source: dh-clean-k-is-deprecated
W: generic-dh-make-2005: copyright-without-copyright-notice
W: generic-dh-make-2005: new-package-should-close-itp-bug
diff --git a/t/tests/legacy-debug/debian/debian/compat b/t/tests/legacy-debug/debian/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/t/tests/legacy-debug/debian/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/t/tests/legacy-debug/debian/debian/rules b/t/tests/legacy-debug/debian/debian/rules
index 2992ba9..da46b7f 100755
--- a/t/tests/legacy-debug/debian/debian/rules
+++ b/t/tests/legacy-debug/debian/debian/rules
@@ -2,7 +2,7 @@
# Sample debian/rules that uses debhelper.
# This file is public domain software, originally written by Joey Hess.
-export DH_COMPAT := 5
+#export DH_COMPAT := 5
build-indep:
diff --git a/t/tests/legacy-debug/pre_build b/t/tests/legacy-debug/pre_build
deleted file mode 100755
index b5649a8..0000000
--- a/t/tests/legacy-debug/pre_build
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-DIR="$1"
-
-rm -f "$DIR/debian/compat"
diff --git a/t/tests/legacy-debug/tags b/t/tests/legacy-debug/tags
index 0cee9b9..b17c195 100644
--- a/t/tests/legacy-debug/tags
+++ b/t/tests/legacy-debug/tags
@@ -26,8 +26,6 @@ W: debug source: dbg-package-missing-depends hi-dbg
W: debug source: dbg-package-missing-depends libhello0-dbg
W: debug source: debhelper-but-no-misc-depends hello-hello-dbg
W: debug source: debhelper-but-no-misc-depends hi-dbg
-W: debug source: debhelper-compat-file-is-missing
-W: debug source: debian-rules-sets-DH_COMPAT line 5
W: debug source: dh-clean-k-is-deprecated
W: debug source: timewarp-standards-version (2006-04-04 < 2006-04-26)
W: hello-dbg: debug-file-with-no-debug-symbols usr/lib/debug/usr/bin/hello
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: