[SCM] Debian package checker branch, master, updated. 2.0.0-rc1-14-g2d55c59
The following commit has been merged in the master branch:
commit 8b84263100ca98d893c5158e2064dfd2e7554a44
Author: Frank Lichtenheld <djpig@debian.org>
Date: Sun Sep 21 16:14:37 2008 +0200
Do not issue desktop-file-but-no-dh_desktop-call if the package uses dh
Closes: #497247
diff --git a/checks/rules b/checks/rules
index f655c1e..cedc6a4 100644
--- a/checks/rules
+++ b/checks/rules
@@ -170,7 +170,7 @@ unless ($includes) {
if (Dep::implies($build_deps, Dep::parse("debhelper"))) {
#.desktop files usually imply dh_desktop:
if (scalar @{[glob("debfiles/*.desktop")]} &&
- ! grep { /^\s*dh_desktop/ } map { @$_ } values %rules_per_target) {
+ ! grep { /^\s*(dh_desktop|dh\s+.*(\$\@|binary))/ } map { @$_ } values %rules_per_target) {
tag "desktop-file-but-no-dh_desktop-call";
}
}
diff --git a/debian/changelog b/debian/changelog
index eb38a69..9bbb13c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ lintian (2.0.0~rc2) experimental; urgency=low
* checks/fields{,.desc}:
+ [FL] Warn about Perl module packages superseded by Perl
core. Patch by Niko Tyni. (Closes: #498897)
+ * checks/rules:
+ + [FL] Do not issue desktop-file-but-no-dh_desktop-call if the
+ package uses dh. (Closes: #497247)
* checks/scripts:
+ [FL] Accept the ocaml virtual packages as providing ocamlrun.
Based on a patch by Stephane Glondu. (Closes: #495431)
diff --git a/testset/dh7-test/debian/foo.desktop b/testset/dh7-test/debian/foo.desktop
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/testset/dh7-test/debian/foo.desktop
@@ -0,0 +1 @@
+
--
Debian package checker
Reply to: