[lintian] 01/01: c/debhelper: Remove checks for removed debhelper cmds
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit ba1cc1a11b027e2539496e559cf1252b63ae6834
Author: Niels Thykier <niels@thykier.net>
Date: Sat Mar 5 17:16:54 2016 +0000
c/debhelper: Remove checks for removed debhelper cmds
Signed-off-by: Niels Thykier <niels@thykier.net>
---
checks/debhelper.desc | 16 ----------------
checks/debhelper.pm | 6 ------
debian/changelog | 3 +++
t/tests/debhelper-deprecated/debian/debian/rules | 6 +++---
t/tests/debhelper-deprecated/desc | 2 --
t/tests/debhelper-deprecated/tags | 2 --
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 -
9 files changed, 7 insertions(+), 32 deletions(-)
diff --git a/checks/debhelper.desc b/checks/debhelper.desc
index 89f6ab6..92d1d66 100644
--- a/checks/debhelper.desc
+++ b/checks/debhelper.desc
@@ -63,13 +63,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_suidregister-is-obsolete
-Severity: normal
-Certainty: certain
-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_undocumented-is-obsolete
Severity: normal
Certainty: certain
@@ -104,15 +97,6 @@ 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_scrollkeeper-is-deprecated
-Severity: normal
-Certainty: certain
-Ref: dh_scrollkeeper(1)
-Info: This package calls dh_scrollkeeper in its <tt>debian/rules</tt> file.
- dh_scrollkeeper is deprecated and no longer does anything. scrollkeeper
- has been replaced by rarian, which does not require the functionality
- dh_scrollkeeper used to provide.
-
Tag: dh-clean-k-is-deprecated
Severity: normal
Certainty: certain
diff --git a/checks/debhelper.pm b/checks/debhelper.pm
index 360a75a..d3fb3c5 100644
--- a/checks/debhelper.pm
+++ b/checks/debhelper.pm
@@ -90,9 +90,6 @@ sub run {
if (m/^\s+-?(dh_\S+)/) {
my $dhcommand = $1;
- if ($dhcommand eq 'dh_suidregister') {
- tag 'dh_suidregister-is-obsolete', "line $.";
- }
if ($dhcommand eq 'dh_undocumented') {
tag 'dh_undocumented-is-obsolete', "line $.";
}
@@ -116,9 +113,6 @@ sub run {
if ($dhcommand eq 'dh_desktop') {
tag 'dh_desktop-is-deprecated', "line $.";
}
- if ($dhcommand eq 'dh_scrollkeeper') {
- tag 'dh_scrollkeeper-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 33db80b..7a69c3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ lintian (2.5.42) UNRELEASED; urgency=medium
+ [NT] Apply patch from Rafael Kitover to avoid some
false-positives with the DEP-5 copyright format.
(Closes: #795641)
+ * checks/debhelper.{desc,pm}:
+ + [NT] Remove tags for dh_scrollkeeper and dh_suidregister,
+ which are removed in the next version of debhelper.
* checks/files.desc:
+ [JW] Update freedesktop.org specification URL.
* checks/menu-format.desc:
diff --git a/t/tests/debhelper-deprecated/debian/debian/rules b/t/tests/debhelper-deprecated/debian/debian/rules
index 7414e66..03d7607 100755
--- a/t/tests/debhelper-deprecated/debian/debian/rules
+++ b/t/tests/debhelper-deprecated/debian/debian/rules
@@ -23,19 +23,19 @@ binary-indep:
dh_installdocs
dh_installmanpages
dh_desktop
- dh_scrollkeeper
+ #dh_scrollkeeper
-dh_python-ply # neither should this
-dh_pysupport
# Check not warning about deprecated commands in optional portions, but
# commands that have been toast for a long time are still warned about.
ifneq "$(LENNY_BACKPORT)" "y"
-dh_help
- dh_scrollkeeper
+ #dh_scrollkeeper
endif
dh_link
dh_compress
dh_fixperms
- dh_suidregister
+ #dh_suidregister
dh_undocumented
dh_installdeb
dh_gencontrol
diff --git a/t/tests/debhelper-deprecated/desc b/t/tests/debhelper-deprecated/desc
index 585c4fc..03a5ec0 100644
--- a/t/tests/debhelper-deprecated/desc
+++ b/t/tests/debhelper-deprecated/desc
@@ -6,6 +6,4 @@ Test-For:
dh_desktop-is-deprecated
dh_installmanpages-is-obsolete
dh_pysupport-is-obsolete
- dh_scrollkeeper-is-deprecated
- dh_suidregister-is-obsolete
dh_undocumented-is-obsolete
diff --git a/t/tests/debhelper-deprecated/tags b/t/tests/debhelper-deprecated/tags
index 7ce5c29..e15fc05 100644
--- a/t/tests/debhelper-deprecated/tags
+++ b/t/tests/debhelper-deprecated/tags
@@ -2,6 +2,4 @@ E: debhelper-deprecated source: build-depends-on-obsolete-package build-depends:
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
-W: debhelper-deprecated source: dh_scrollkeeper-is-deprecated line 26
-W: debhelper-deprecated source: dh_suidregister-is-obsolete line 38
W: debhelper-deprecated source: dh_undocumented-is-obsolete line 39
diff --git a/t/tests/generic-dh-make-2005/debian/debian/rules b/t/tests/generic-dh-make-2005/debian/debian/rules
index 293025d..6ba1e88 100755
--- a/t/tests/generic-dh-make-2005/debian/debian/rules
+++ b/t/tests/generic-dh-make-2005/debian/debian/rules
@@ -82,7 +82,7 @@ binary-arch: build install
# dh_installinfo
dh_installman
# dh_dhelp
- dh_suidregister
+ #dh_suidregister # originally there, but no longer supported
dh_link
dh_strip
dh_compress
diff --git a/t/tests/generic-dh-make-2005/desc b/t/tests/generic-dh-make-2005/desc
index 1ef3b37..9dd8b5d 100644
--- a/t/tests/generic-dh-make-2005/desc
+++ b/t/tests/generic-dh-make-2005/desc
@@ -12,7 +12,6 @@ Test-For:
debian-rules-sets-DH_COMPAT
debian-watch-file-is-missing
description-is-dh_make-template
- dh_suidregister-is-obsolete
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 6b3ebc4..df8017d 100644
--- a/t/tests/generic-dh-make-2005/tags
+++ b/t/tests/generic-dh-make-2005/tags
@@ -11,7 +11,6 @@ W: generic-dh-make-2005 source: debian-rules-missing-recommended-target build-ar
W: generic-dh-make-2005 source: debian-rules-missing-recommended-target build-indep
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: 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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: