[SCM] Debian package checker branch, master, updated. 2.4.2-47-g7cf10de
The following commit has been merged in the master branch:
commit a4ee58a565a387bd4a17a7422d732a4b32195daf
Author: Russ Allbery <rra@debian.org>
Date: Sun Jul 25 19:18:28 2010 -0700
Remove dh_testversion-is-deprecated
* checks/debhelper{,.desc}:
+ [RA] Remove dh_testversion-is-deprecated. The command is no longer
part of debhelper, so using it now just results in a build failure,
and there are no instances in the archive.
Also comment out dh_testversion in old dh-make test. It no longer exists,
so building the test was failing.
diff --git a/checks/debhelper b/checks/debhelper
index 32249b3..56bbc00 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -84,10 +84,6 @@ while (<RULES>) {
if (m/^\s+-?(dh_\w+)/) {
my $dhcommand = $1;
- if ($dhcommand =~ /dh_testversion(?:\s+([^\s]+))?/) {
- $level = $1 if ($1);
- tag "dh_testversion-is-deprecated", "line $.";
- }
if ($dhcommand eq 'dh_dhelp') {
tag "dh_dhelp-is-deprecated", "line $.";
}
diff --git a/checks/debhelper.desc b/checks/debhelper.desc
index ecb6f9d..312e78b 100644
--- a/checks/debhelper.desc
+++ b/checks/debhelper.desc
@@ -42,15 +42,6 @@ Info: This package contains debian/*.ex and/or debian/ex.* files
package's details and renamed for use by various debhelper commands.
If they are not being used, they should be removed.
-Tag: dh_testversion-is-deprecated
-Severity: normal
-Certainty: certain
-Ref: dh_testversion(1)
-Info: This package calls dh_testversion in its <tt>debian/rules</tt> file.
- dh_testversion is deprecated. Packages using debhelper should use
- versioned build dependencies to ensure that the correct version of
- debhelper is installed.
-
Tag: dh_dhelp-is-deprecated
Severity: normal
Certainty: certain
diff --git a/debian/changelog b/debian/changelog
index 7f39858..aa81f96 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ lintian (2.4.3) UNRELEASED; urgency=low
- embedded-library
+ Removed:
- debian-news-entry-without-blank-line
+ - dh_testversion-is-deprecated
* checks/binaries{,.desc}:
+ [RG] Detect embedded copies of expat, libbz2, libmagic, libxml2,
@@ -27,6 +28,9 @@ lintian (2.4.3) UNRELEASED; urgency=low
gregor herrmann. (Closes: #588156)
+ [RA] Allow a tilde after the compatibility level in the debhelper
dependency. Thanks, Axel Beckert. (Closes: #583777)
+ + [RA] Remove dh_testversion-is-deprecated. The command is no longer
+ part of debhelper, so using it now just results in a build failure,
+ and there are no instances in the archive.
* checks/description.desc:
+ [RA] Downgrade description-too-long to minor severity to match bug
reporting standards for formatting bugs. (Closes: #587837)
diff --git a/t/tests/debhelper-deprecated/debian/debian/rules b/t/tests/debhelper-deprecated/debian/debian/rules
index e592a38..7ec4692 100755
--- a/t/tests/debhelper-deprecated/debian/debian/rules
+++ b/t/tests/debhelper-deprecated/debian/debian/rules
@@ -14,7 +14,6 @@ binary-arch:
binary-indep:
dh_testdir
dh_testroot
- dh_testversion 7
dh_prep
dh_install
dh_installchangelogs
@@ -27,7 +26,6 @@ binary-indep:
ifneq "$(LENNY_BACKPORT)" "y"
-dh_help
dh_scrollkeeper
- dh_testversion 7
endif
dh_link
dh_compress
diff --git a/t/tests/debhelper-deprecated/desc b/t/tests/debhelper-deprecated/desc
index c0cf2f1..a71c53b 100644
--- a/t/tests/debhelper-deprecated/desc
+++ b/t/tests/debhelper-deprecated/desc
@@ -7,5 +7,4 @@ Test-For:
dh_dhelp-is-deprecated
dh_scrollkeeper-is-deprecated
dh_suidregister-is-obsolete
- dh_testversion-is-deprecated
dh_undocumented-is-obsolete
diff --git a/t/tests/debhelper-deprecated/tags b/t/tests/debhelper-deprecated/tags
index 6da5f4f..032a197 100644
--- a/t/tests/debhelper-deprecated/tags
+++ b/t/tests/debhelper-deprecated/tags
@@ -1,7 +1,5 @@
-W: debhelper-deprecated source: dh_desktop-is-deprecated line 22
-W: debhelper-deprecated source: dh_dhelp-is-deprecated line 23
-W: debhelper-deprecated source: dh_scrollkeeper-is-deprecated line 24
-W: debhelper-deprecated source: dh_suidregister-is-obsolete line 35
-W: debhelper-deprecated source: dh_testversion-is-deprecated line 17
-W: debhelper-deprecated source: dh_testversion-is-deprecated line 30
-W: debhelper-deprecated source: dh_undocumented-is-obsolete line 36
+W: debhelper-deprecated source: dh_desktop-is-deprecated line 21
+W: debhelper-deprecated source: dh_dhelp-is-deprecated line 22
+W: debhelper-deprecated source: dh_scrollkeeper-is-deprecated line 23
+W: debhelper-deprecated source: dh_suidregister-is-obsolete line 33
+W: debhelper-deprecated source: dh_undocumented-is-obsolete line 34
diff --git a/t/tests/generic-dh-make-2005/debian/debian/rules b/t/tests/generic-dh-make-2005/debian/debian/rules
index a9fc713..67fe085 100755
--- a/t/tests/generic-dh-make-2005/debian/debian/rules
+++ b/t/tests/generic-dh-make-2005/debian/debian/rules
@@ -64,7 +64,7 @@ binary-indep: build install
# Build architecture-dependent files here.
binary-arch: build install
- dh_testversion
+# dh_testversion
dh_testdir
dh_testroot
dh_installchangelogs
diff --git a/t/tests/generic-dh-make-2005/desc b/t/tests/generic-dh-make-2005/desc
index adec7de..6709fa7 100644
--- a/t/tests/generic-dh-make-2005/desc
+++ b/t/tests/generic-dh-make-2005/desc
@@ -12,7 +12,6 @@ Test-For:
debian-watch-file-is-missing
description-is-dh_make-template
dh_suidregister-is-obsolete
- dh_testversion-is-deprecated
extended-description-is-probably-too-short
helper-templates-in-copyright
new-package-should-close-itp-bug
diff --git a/t/tests/generic-dh-make-2005/tags b/t/tests/generic-dh-make-2005/tags
index 1c1c200..6e8096e 100644
--- a/t/tests/generic-dh-make-2005/tags
+++ b/t/tests/generic-dh-make-2005/tags
@@ -9,7 +9,6 @@ W: generic-dh-make-2005 source: ancient-standards-version 3.6.2 (current is CURR
W: generic-dh-make-2005 source: debian-rules-ignores-make-clean-error line 47
W: generic-dh-make-2005 source: debian-rules-sets-DH_COMPAT line 12
W: generic-dh-make-2005 source: dh_suidregister-is-obsolete line 85
-W: generic-dh-make-2005 source: dh_testversion-is-deprecated line 67
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
--
Debian package checker
Reply to: