[lintian] 01/01: t: Update some tests to cope with dh compat removals
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit e093d51591d6a263708d8b4cc858e7f82e84656d
Author: Niels Thykier <niels@thykier.net>
Date: Sat Nov 7 10:23:30 2015 +0100
t: Update some tests to cope with dh compat removals
Signed-off-by: Niels Thykier <niels@thykier.net>
---
t/tests/debhelper-dh-compat/debian/debian/rules | 2 +-
t/tests/debhelper-dh-compat/desc | 1 -
t/tests/debhelper-dh-compat/tags | 4 +---
t/tests/generic-dh-make-2005/debian/debian/rules | 2 +-
t/tests/generic-dh-make-2005/desc | 1 -
t/tests/generic-dh-make-2005/tags | 1 -
t/tests/legacy-maintainer-scripts/debian/debian/control | 2 +-
t/tests/legacy-maintainer-scripts/pre_build | 5 -----
t/tests/legacy-maintainer-scripts/tags | 2 --
9 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/t/tests/debhelper-dh-compat/debian/debian/rules b/t/tests/debhelper-dh-compat/debian/debian/rules
index a36f8fd..260f917 100755
--- a/t/tests/debhelper-dh-compat/debian/debian/rules
+++ b/t/tests/debhelper-dh-compat/debian/debian/rules
@@ -5,4 +5,4 @@ export DH_COMPAT=7
%:
dh $@
-DH_COMPAT='{3'
+DH_COMPAT=5
diff --git a/t/tests/debhelper-dh-compat/desc b/t/tests/debhelper-dh-compat/desc
index 0d3ff35..60c4786 100644
--- a/t/tests/debhelper-dh-compat/desc
+++ b/t/tests/debhelper-dh-compat/desc
@@ -3,6 +3,5 @@ Sequence: 6000
Version: 1.0
Description: Test the value of DH_COMPAT
Test-For:
- debhelper-compatibility-level-not-a-number
debian-rules-sets-DH_COMPAT
declares-possibly-conflicting-debhelper-compat-versions
diff --git a/t/tests/debhelper-dh-compat/tags b/t/tests/debhelper-dh-compat/tags
index a62739c..57e0969 100644
--- a/t/tests/debhelper-dh-compat/tags
+++ b/t/tests/debhelper-dh-compat/tags
@@ -1,4 +1,2 @@
-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=9
+E: debhelper-dh-compat source: declares-possibly-conflicting-debhelper-compat-versions rules=5 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/generic-dh-make-2005/debian/debian/rules b/t/tests/generic-dh-make-2005/debian/debian/rules
index 67fe085..293025d 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=2
+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 c4b7987..1ef3b37 100644
--- a/t/tests/generic-dh-make-2005/desc
+++ b/t/tests/generic-dh-make-2005/desc
@@ -16,7 +16,6 @@ Test-For:
extended-description-is-probably-too-short
helper-templates-in-copyright
new-package-should-close-itp-bug
- package-uses-deprecated-debhelper-compat-version
readme-debian-contains-debmake-template
section-is-dh_make-template
wrong-bug-number-in-closes
diff --git a/t/tests/generic-dh-make-2005/tags b/t/tests/generic-dh-make-2005/tags
index abf85a6..6b3ebc4 100644
--- a/t/tests/generic-dh-make-2005/tags
+++ b/t/tests/generic-dh-make-2005/tags
@@ -12,7 +12,6 @@ W: generic-dh-make-2005 source: debian-rules-missing-recommended-target build-in
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 source: dh_suidregister-is-obsolete line 85
-W: generic-dh-make-2005 source: package-uses-deprecated-debhelper-compat-version 2
W: generic-dh-make-2005: copyright-without-copyright-notice
W: generic-dh-make-2005: new-package-should-close-itp-bug
W: generic-dh-make-2005: readme-debian-contains-debmake-template
diff --git a/t/tests/legacy-maintainer-scripts/debian/debian/control b/t/tests/legacy-maintainer-scripts/debian/debian/control
index 0b9a1d9..a1a4591 100644
--- a/t/tests/legacy-maintainer-scripts/debian/debian/control
+++ b/t/tests/legacy-maintainer-scripts/debian/debian/control
@@ -3,7 +3,7 @@ Section: misc
Priority: optional
Maintainer: QA group <packages@qa.debian.org>
Uploaders: Anyone but Jeroen <jeroen@wolffelaar.nl>
-Build-Depends: debhelper
+Build-Depends: debhelper (>= 9)
Standards-Version: 3.1.1
XS-Dm-Upload-Allowed: Yes
diff --git a/t/tests/legacy-maintainer-scripts/pre_build b/t/tests/legacy-maintainer-scripts/pre_build
deleted file mode 100755
index b5649a8..0000000
--- a/t/tests/legacy-maintainer-scripts/pre_build
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-DIR="$1"
-
-rm -f "$DIR/debian/compat"
diff --git a/t/tests/legacy-maintainer-scripts/tags b/t/tests/legacy-maintainer-scripts/tags
index d75c51a..48fbf15 100644
--- a/t/tests/legacy-maintainer-scripts/tags
+++ b/t/tests/legacy-maintainer-scripts/tags
@@ -44,14 +44,12 @@ I: maintainer-scripts: output-of-updaterc.d-not-redirected-to-dev-null bar postr
W: maintainer-scripts source: ancient-standards-version 3.1.1 (current is CURRENT)
W: maintainer-scripts source: changelog-should-mention-qa
W: maintainer-scripts source: debhelper-but-no-misc-depends maintainer-scripts
-W: maintainer-scripts source: debhelper-compat-file-is-missing
W: maintainer-scripts source: debian-watch-file-in-native-package
W: maintainer-scripts source: debian-watch-file-should-mangle-version line 11
W: maintainer-scripts source: debian-watch-file-should-mangle-version line 7
W: maintainer-scripts source: debian-watch-file-unknown-version 4
W: maintainer-scripts source: dfsg-version-in-native-package 7+dfsg-0.1
W: maintainer-scripts source: dm-upload-allowed-is-obsolete
-W: maintainer-scripts source: package-uses-deprecated-debhelper-compat-version 1
W: maintainer-scripts source: qa-upload-has-incorrect-version-number 7+dfsg-0.1
W: maintainer-scripts: command-with-path-in-maintainer-script postinst:171 /usr/bin/baz
W: maintainer-scripts: command-with-path-in-maintainer-script preinst:12 /bin/egrep
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: