[lintian] 01/02: Remove test for (soon to be removed) dh_desktop
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit 3224ba485aac8a6e188c03f534f1fb4b2bab9b5b
Author: Niels Thykier <niels@thykier.net>
Date: Sat Apr 2 15:05:11 2016 +0000
Remove test for (soon to be removed) dh_desktop
Signed-off-by: Niels Thykier <niels@thykier.net>
---
checks/debhelper.desc | 8 --------
checks/debhelper.pm | 3 ---
debian/changelog | 4 ++--
t/tests/debhelper-deprecated/debian/debian/rules | 2 +-
t/tests/debhelper-deprecated/desc | 1 -
t/tests/debhelper-deprecated/tags | 1 -
6 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/checks/debhelper.desc b/checks/debhelper.desc
index beb5d69..c5bb0cb 100644
--- a/checks/debhelper.desc
+++ b/checks/debhelper.desc
@@ -80,14 +80,6 @@ Ref: dh_installmanpages(1)
Info: This package calls dh_installmanpages in its <tt>debian/rules</tt> file.
dh_installmanpages is deprecated in favour of dh_installman.
-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 no 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/checks/debhelper.pm b/checks/debhelper.pm
index c08f38f..65f0862 100644
--- a/checks/debhelper.pm
+++ b/checks/debhelper.pm
@@ -107,9 +107,6 @@ sub run {
# Don't warn about recently deprecated commands in code that may be
# optional. It may be there only for backports.
unless ($maybe_skipping) {
- if ($dhcommand eq 'dh_desktop') {
- tag 'dh_desktop-is-deprecated', "line $.";
- }
if ($dhcommand eq 'dh_clean' and m/\s+\-k(?:\s+.*)?$/s) {
$seendhcleank = 1;
}
diff --git a/debian/changelog b/debian/changelog
index 7844afc..4c006ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,8 @@ lintian (2.5.43) UNRELEASED; urgency=medium
+ [JW] Remove confusing checks for build-conflicts related to build
profiles.
* checks/debhelper.{desc,pm}:
- + [NT] Remove check for dh_undocumented as debhelper has
- dropped the helper.
+ + [NT] Remove check for dh_undocumented and dh_desktop as debhelper
+ has dropped the helper.
* checks/systemd.pm:
+ [JW] Apply patch from Felipe Sateler to properly remove .sh suffix
when checking systemd-initscript matching. (Closes: #819087)
diff --git a/t/tests/debhelper-deprecated/debian/debian/rules b/t/tests/debhelper-deprecated/debian/debian/rules
index d162416..39714c6 100755
--- a/t/tests/debhelper-deprecated/debian/debian/rules
+++ b/t/tests/debhelper-deprecated/debian/debian/rules
@@ -22,7 +22,7 @@ binary-indep:
dh_installchangelogs
dh_installdocs
dh_installmanpages
- dh_desktop
+
#dh_scrollkeeper
-dh_python-ply # neither should this
-dh_pysupport
diff --git a/t/tests/debhelper-deprecated/desc b/t/tests/debhelper-deprecated/desc
index 73e9e1b..3904ebe 100644
--- a/t/tests/debhelper-deprecated/desc
+++ b/t/tests/debhelper-deprecated/desc
@@ -3,7 +3,6 @@ Sequence: 6000
Version: 1.0
Description: Test for use of deprecated dh_* commands
Test-For:
- dh_desktop-is-deprecated
dh_installmanpages-is-obsolete
dh_pysupport-is-obsolete
diff --git a/t/tests/debhelper-deprecated/tags b/t/tests/debhelper-deprecated/tags
index 90a8887..3f268e5 100644
--- a/t/tests/debhelper-deprecated/tags
+++ b/t/tests/debhelper-deprecated/tags
@@ -1,4 +1,3 @@
E: debhelper-deprecated source: build-depends-on-obsolete-package build-depends: python-support => use dh_python2 instead
-W: debhelper-deprecated source: dh_desktop-is-deprecated line 25
W: debhelper-deprecated source: dh_installmanpages-is-obsolete line 24
W: debhelper-deprecated source: dh_pysupport-is-obsolete line 28
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: