[SCM] Debian package checker branch, master, updated. 2.2.11-16-gcd6e722
The following commit has been merged in the master branch:
commit cd6e7221012c853b79aee69047742949cf543aa9
Author: Russ Allbery <rra@debian.org>
Date: Wed Jun 17 22:52:45 2009 -0700
dh_desktop is deprecated, add line numbers to dh_* tags
* checks/debhelper{,.desc}:
+ [RA] Warn about dh_desktop calls since the command is now
deprecated. Thanks, Nelson A. de Oliveira. (Closes: #531164)
+ [RA] Include the line number in deprecated and obsolete dh_* command
tags.
diff --git a/checks/debhelper b/checks/debhelper
index 2c6af6d..773b46c 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -79,13 +79,16 @@ while (<RULES>) {
my $dhcommand = $1;
if ($dhcommand =~ /dh_testversion(?:\s+([^\s]+))?/) {
$level = $1 if ($1);
- tag "dh_testversion-is-deprecated", "";
+ tag "dh_testversion-is-deprecated", "line $.";
}
if ($dhcommand eq 'dh_dhelp') {
- tag "dh_dhelp-is-deprecated", "";
+ tag "dh_dhelp-is-deprecated", "line $.";
}
if ($dhcommand eq 'dh_suidregister') {
- tag "dh_suidregister-is-obsolete", "";
+ tag "dh_suidregister-is-obsolete", "line $.";
+ }
+ if ($dhcommand eq 'dh_desktop') {
+ tag 'dh_desktop-is-deprecated', "line $.";
}
if ($dhcommand eq 'dh_clean' and m/\s+\-k(\s+.*)?$/) {
$seendhcleank = 1;
diff --git a/checks/debhelper.desc b/checks/debhelper.desc
index b8805e8..951936f 100644
--- a/checks/debhelper.desc
+++ b/checks/debhelper.desc
@@ -68,6 +68,14 @@ Ref: dh_suidregister(1)
Info: suidregister is obsoleted by dpkg-statoverride, so registration of
files in with dh_suidregister is unnecessary, and even harmful.
+Tag: dh_desktop-is-deprecated
+Severity: normal
+Certainty: certain
+Ref: dh_desktop(1)
+Info: This package calls dh_desktop in its <tt>debian/rules</tt> file.
+ dh_desktop is deprecated and o longer does anything. The setup it used
+ to handle is now done with triggers.
+
Tag: dh-clean-k-is-deprecated
Severity: normal
Certainty: certain
diff --git a/debian/changelog b/debian/changelog
index 1f75098..7d8391c 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ lintian (2.2.12) UNRELEASED; urgency=low
* Summary of tag changes:
+ Added:
- debug-symbols-directly-in-usr-lib-debug
+ - dh_desktop-is-deprecated
- file-in-discouraged-x11-font-directory
- file-in-unknown-x11-font-directory
- missing-separator-between-items
@@ -22,10 +23,14 @@ lintian (2.2.12) UNRELEASED; urgency=low
+ [RA] Allow a newline immediately after the field name, since this
does work with fields that can be wrapped (such as Build-Depends).
Thanks, Stephane Glondu. (Closes: #528377)
- * checks/debhelper:
+ * checks/debhelper{,.desc}:
+ [RA] Issue package-lacks-versioned-build-depends-on-debhelper always
if the debhelper dependency isn't properly versioned, not just for
compat levels newer than 5. (Closes: #522384)
+ + [RA] Warn about dh_desktop calls since the command is now
+ deprecated. Thanks, Nelson A. de Oliveira. (Closes: #531164)
+ + [RA] Include the line number in deprecated and obsolete dh_* command
+ tags.
* checks/fields{,.desc}:
+ [RA] Update source-field-malformed to serious and don't allow
capital letters in source package names. Check source package names
diff --git a/t/COVERAGE b/t/COVERAGE
index c16ff3a..99749e0 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,4 +1,4 @@
-Last generated 2009-06-17
+Last generated 2009-06-18
The following tags are not tested by the test suite:
@@ -46,7 +46,6 @@ debconf unknown-field-in-templates
debconf unknown-template-type
debhelper debhelper-compat-file-is-empty
-debhelper dh_dhelp-is-deprecated
debian-readme spelling-error-in-readme-debian
diff --git a/t/tests/debhelper-script-token-unneeded/debian/debian/rules b/t/tests/debhelper-deprecated/debian/debian/rules
similarity index 58%
copy from t/tests/debhelper-script-token-unneeded/debian/debian/rules
copy to t/tests/debhelper-deprecated/debian/debian/rules
index bbd9fb3..226a398 100755
--- a/t/tests/debhelper-script-token-unneeded/debian/debian/rules
+++ b/t/tests/debhelper-deprecated/debian/debian/rules
@@ -1,8 +1,4 @@
#!/usr/bin/make -f
-#
-# Use an alternate rules file that doesn't call dh to test not warning
-# about debhelper script tokens if we call no programs that care about
-# them.
pkg = $(shell dh_listpackages)
@@ -18,14 +14,17 @@ binary-arch:
binary-indep:
dh_testdir
dh_testroot
+ dh_testversion 7
dh_prep
dh_install
dh_installchangelogs
- # dh_installdocs may modify maintainer scripts
- install -m 644 debian/copyright debian/$(pkg)/usr/share/doc/$(pkg)
+ dh_installdocs
+ dh_desktop
+ -dh_dhelp
dh_link
dh_compress
dh_fixperms
+ dh_suidregister
dh_installdeb
dh_gencontrol
dh_md5sums
diff --git a/t/tests/debhelper-deprecated/desc b/t/tests/debhelper-deprecated/desc
new file mode 100644
index 0000000..df803c6
--- /dev/null
+++ b/t/tests/debhelper-deprecated/desc
@@ -0,0 +1,9 @@
+Testname: debhelper-deprecated
+Sequence: 6000
+Version: 1.0
+Description: Test for use of deprecated dh_* commands
+Test-For:
+ dh_desktop-is-deprecated
+ dh_dhelp-is-deprecated
+ dh_suidregister-is-obsolete
+ dh_testversion-is-deprecated
diff --git a/t/tests/debhelper-deprecated/tags b/t/tests/debhelper-deprecated/tags
new file mode 100644
index 0000000..e813126
--- /dev/null
+++ b/t/tests/debhelper-deprecated/tags
@@ -0,0 +1,4 @@
+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_suidregister-is-obsolete line 27
+W: debhelper-deprecated source: dh_testversion-is-deprecated line 17
--
Debian package checker
Reply to: