[lintian] 01/01: c/rules: Drop package-would-benefit-from-build-arch-targets
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit d1952464edeeab288bb5f8c881905b11498b7d25
Author: Niels Thykier <niels@thykier.net>
Date: Thu Apr 20 15:27:42 2017 +0000
c/rules: Drop package-would-benefit-from-build-arch-targets
Any package triggering it would also get at least two other tags about
missing targets in d/rules. Furthermore, dpkg-buildpackage refuses to
build packages that trigger this tag, so it is quite obsolete by now.
Signed-off-by: Niels Thykier <niels@thykier.net>
---
checks/rules.desc | 11 -----------
checks/rules.pm | 14 --------------
debian/changelog | 5 +++++
t/tests/legacy-binary/tags | 1 -
t/tests/rules-missing-targets/desc | 1 -
t/tests/rules-missing-targets/tags | 1 -
6 files changed, 5 insertions(+), 28 deletions(-)
diff --git a/checks/rules.desc b/checks/rules.desc
index a463f2c..f04d40d 100644
--- a/checks/rules.desc
+++ b/checks/rules.desc
@@ -237,14 +237,3 @@ Info: The rules file use the make variable $(_).
If the rules file uses $(dir $(_)) to discover the directory containing
the source package (presumably in order to implement the get-orig-source
target), please replace it by $(dir $(firstword $(MAKEFILE_LIST))).
-
-Tag: package-would-benefit-from-build-arch-targets
-Severity: normal
-Certainty: certain
-Ref: #629385, https://wiki.debian.org/ReleaseGoals/BuildArchTarget
-Info: The source package does not have both a build-arch and a build-indep
- target. Furthermore it is part of the selected set of packages to
- be fixed for Wheezy.
- .
- Please consider adding both the build-arch and build-indep targets.
-
diff --git a/checks/rules.pm b/checks/rules.pm
index bd3a141..e3facc1 100644
--- a/checks/rules.pm
+++ b/checks/rules.pm
@@ -364,7 +364,6 @@ sub run {
close($rules_fd);
unless ($includes) {
- my $rec_allindep = 0;
# Make sure all the required rules were seen.
for my $target ($POLICYRULES->all) {
unless ($seen{$target}) {
@@ -373,7 +372,6 @@ sub run {
tag 'debian-rules-missing-required-target', $target;
} elsif ($typerule eq 'recommended_allindep') {
tag 'debian-rules-missing-recommended-target', $target;
- $rec_allindep++;
} elsif ($typerule eq 'goodpractice_dfsg') {
if ($version =~ /(dfsg|debian|ds)/) {
tag 'debian-rules-missing-good-practice-target-dfsg',
@@ -388,18 +386,6 @@ sub run {
}
}
}
-
- if ($rec_allindep) {
- my $all = 0;
- my $notall = 0;
- foreach my $p ($group->get_processables) {
- next if $p->pkg_type eq 'source' or $p->pkg_type eq 'changes';
- $all++ if $p->pkg_arch eq 'all';
- $notall++ if $p->pkg_arch ne 'all';
- }
- tag 'package-would-benefit-from-build-arch-targets'
- if $all && $notall;
- }
}
# Make sure we have no content for binary-arch if we are arch-indep:
diff --git a/debian/changelog b/debian/changelog
index a62d3bf..4fd192f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,6 +49,11 @@ lintian (2.5.51) UNRELEASED; urgency=medium
to version 1.1.
+ [NT] Apply patch from Laurent Bigonville to check desktop files
for missing "Icon" field. (Closes: #854132)
+ * checks/rules.{desc,pm}:
+ + [NT] Drop "package-would-benefit-from-build-arch-targets". The
+ dpkg-buildpackage refuses to build packages that trigger this tag.
+ Also, the tag implies two other "W" tags so contributors are still
+ notified of a potential problem.
* checks/scripts.pm:
+ [NT] Apply patch from Christopher Hoskin to except -doc packages
from the "new-package-should-not-package-python2-module" tag.
diff --git a/t/tests/legacy-binary/tags b/t/tests/legacy-binary/tags
index 895a3e7..e0fb44a 100644
--- a/t/tests/legacy-binary/tags
+++ b/t/tests/legacy-binary/tags
@@ -69,7 +69,6 @@ W: binary source: dm-upload-allowed-is-obsolete
W: binary source: intra-source-package-circular-dependency binary binary-data
W: binary source: maintainer-upload-has-incorrect-version-number 4-1.1
W: binary source: native-package-with-dash-version
-W: binary source: package-would-benefit-from-build-arch-targets
W: binary-data: control-file-is-empty md5sums
W: binary-data: empty-binary-package
W: binary: binary-without-manpage usr/bin/hello
diff --git a/t/tests/rules-missing-targets/desc b/t/tests/rules-missing-targets/desc
index a867441..9843391 100644
--- a/t/tests/rules-missing-targets/desc
+++ b/t/tests/rules-missing-targets/desc
@@ -5,4 +5,3 @@ Description: Test for missing targets in debian/rules
Test-For:
debian-rules-missing-good-practice-target-dfsg
debian-rules-missing-recommended-target
- package-would-benefit-from-build-arch-targets
diff --git a/t/tests/rules-missing-targets/tags b/t/tests/rules-missing-targets/tags
index 3ff25ec..eeb2cb1 100644
--- a/t/tests/rules-missing-targets/tags
+++ b/t/tests/rules-missing-targets/tags
@@ -1,4 +1,3 @@
I: rules-missing-targets source: debian-rules-missing-good-practice-target-dfsg get-orig-source
W: rules-missing-targets source: debian-rules-missing-recommended-target build-arch
W: rules-missing-targets source: debian-rules-missing-recommended-target build-indep
-W: rules-missing-targets source: package-would-benefit-from-build-arch-targets
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: