[SCM] Debian package checker branch, master, updated. 2.5.6-13-gbcb26a0
The following commit has been merged in the master branch:
commit eb9aa3b4bcaaab8c7724d543be8c7a30f491e610
Author: Niels Thykier <niels@thykier.net>
Date: Thu Mar 15 09:05:24 2012 +0100
scripts: Remove some ancient dpkg --assert* checks
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/scripts b/checks/scripts
index f8ed5dc..b2e621a 100644
--- a/checks/scripts
+++ b/checks/scripts
@@ -781,15 +781,9 @@ while (<SCRIPTS>) {
}
# Ancient dpkg feature tests.
- if (m/${LEADIN}dpkg\s+--assert-support-predepends\b/) {
- tag 'ancient-dpkg-predepends-check', "$file:$.";
- }
if (m/${LEADIN}dpkg\s+--assert-working-epoch\b/) {
tag 'ancient-dpkg-epoch-check', "$file:$.";
}
- if (m/${LEADIN}dpkg\s+--assert-long-filenames\b/) {
- tag 'ancient-dpkg-long-filenames-check', "$file:$.";
- }
if (m/${LEADIN}dpkg\s+--assert-multi-conrep\b/) {
tag 'ancient-dpkg-multi-conrep-check', "$file:$.";
}
diff --git a/checks/scripts.desc b/checks/scripts.desc
index e79d957..1a8bf23 100644
--- a/checks/scripts.desc
+++ b/checks/scripts.desc
@@ -624,13 +624,6 @@ Info: The indicated program run in a maintainer script has a prepended
replacement version of a command for some local reason.
Ref: policy 6.1
-Tag: ancient-dpkg-predepends-check
-Severity: minor
-Certainty: certain
-Info: The package calls dpkg --assert-support-predepends in a maintainer
- script. This check is obsolete and has always returned true since dpkg
- 1.1.0, released 1996-02-11.
-
Tag: ancient-dpkg-epoch-check
Severity: minor
Certainty: certain
@@ -638,13 +631,6 @@ Info: The package calls dpkg --assert-working-epoch in a maintainer
script. This check is obsolete and has always returned true since dpkg
1.4.0.7, released 1997-01-25.
-Tag: ancient-dpkg-long-filenames-check
-Severity: minor
-Certainty: certain
-Info: The package calls dpkg --assert-long-filenames in a maintainer
- script. This check is obsolete and has always returned true since dpkg
- 1.4.1.17, released 1999-10-21.
-
Tag: ancient-dpkg-multi-conrep-check
Severity: minor
Certainty: certain
diff --git a/debian/changelog b/debian/changelog
index 20711fc..940a537 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ lintian (2.5.7) UNRELEASED; urgency=low
* Summary of tag changes:
+ Removed:
+ - ancient-dpkg-long-filenames-check
+ - ancient-dpkg-predepends-check
- manpage-for-non-x11-binary-in-wrong-directory
- manpage-for-x11-binary-in-wrong-directory
- obsolete-field
@@ -21,6 +23,8 @@ lintian (2.5.7) UNRELEASED; urgency=low
+ [NT] Remove old tags.
* checks/menus:
+ [NT] Remove "manual" lazy load of data file.
+ * checks/scripts{,.desc}:
+ + [NT] Remove old tags.
* frontend/lintian:
+ [JW] Fix typo in error message.
diff --git a/t/COVERAGE b/t/COVERAGE
index abc2d58..ab8e4ce 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
-Last generated 2012-03-14
-Coverage: 788/952 (82.77%), w. legacy tests: 893/952 (93.80%)
+Last generated 2012-03-15
+Coverage: 786/950 (82.74%), w. legacy tests: 891/950 (93.79%)
The following tags are not tested by the test suite:
diff --git a/t/tests/scripts-ancient-dpkg/debian/debian/postinst b/t/tests/scripts-ancient-dpkg/debian/debian/postinst
index de7c621..932f70d 100644
--- a/t/tests/scripts-ancient-dpkg/debian/debian/postinst
+++ b/t/tests/scripts-ancient-dpkg/debian/debian/postinst
@@ -1,18 +1,10 @@
#!/bin/sh
set -e
-if dpkg --assert-support-predepends ; then
- echo Yay
-fi
-
if dpkg --assert-working-epoch ; then
echo Yay
fi
-if dpkg --assert-long-filenames ; then
- echo Yay
-fi
-
if dpkg --assert-multi-conrep ; then
echo Yay
fi
diff --git a/t/tests/scripts-ancient-dpkg/desc b/t/tests/scripts-ancient-dpkg/desc
index a90e5cc..694a7e1 100644
--- a/t/tests/scripts-ancient-dpkg/desc
+++ b/t/tests/scripts-ancient-dpkg/desc
@@ -4,7 +4,5 @@ Version: 1.0
Description: Tests for ancient dpkg stuff
Test-For:
ancient-dpkg-epoch-check
- ancient-dpkg-long-filenames-check
ancient-dpkg-multi-conrep-check
- ancient-dpkg-predepends-check
diff --git a/t/tests/scripts-ancient-dpkg/tags b/t/tests/scripts-ancient-dpkg/tags
index 66ddc6f..ebd6871 100644
--- a/t/tests/scripts-ancient-dpkg/tags
+++ b/t/tests/scripts-ancient-dpkg/tags
@@ -1,4 +1,2 @@
-W: scripts-ancient-dpkg: ancient-dpkg-epoch-check postinst:8
-W: scripts-ancient-dpkg: ancient-dpkg-long-filenames-check postinst:12
-W: scripts-ancient-dpkg: ancient-dpkg-multi-conrep-check postinst:16
-W: scripts-ancient-dpkg: ancient-dpkg-predepends-check postinst:4
+W: scripts-ancient-dpkg: ancient-dpkg-epoch-check postinst:4
+W: scripts-ancient-dpkg: ancient-dpkg-multi-conrep-check postinst:8
diff --git a/testset/tags.maintainer-scripts b/testset/tags.maintainer-scripts
index 5a5e244..74bbf4c 100644
--- a/testset/tags.maintainer-scripts
+++ b/testset/tags.maintainer-scripts
@@ -51,9 +51,7 @@ W: maintainer-scripts source: no-debian-copyright
W: maintainer-scripts source: package-uses-deprecated-debhelper-compat-version 1
W: maintainer-scripts source: qa-upload-has-incorrect-version-number 7+dfsg-0.1
W: maintainer-scripts: ancient-dpkg-epoch-check preinst:8
-W: maintainer-scripts: ancient-dpkg-long-filenames-check preinst:9
W: maintainer-scripts: ancient-dpkg-multi-conrep-check preinst:10
-W: maintainer-scripts: ancient-dpkg-predepends-check preinst:7
W: maintainer-scripts: command-with-path-in-maintainer-script postinst:171 /usr/bin/baz
W: maintainer-scripts: command-with-path-in-maintainer-script preinst:12 /bin/egrep
W: maintainer-scripts: config-does-not-load-confmodule
--
Debian package checker
Reply to: