Bug#657390: lintian: Please make build-arch and build-indep required targets
Package: lintian
Version: 2.5.4
Severity: normal
Tags: patch
Hi,
Once build-arch and build-indep are supported by dpkg-buildpackage,
hopefully in the next week, and/or are required by Policy, please
could you apply the attached patch to move build-arch and build-indep
from recommended to required?
I kept the debian-rules-missing-recommended-target check and
description in case it's of potential use in the future, but
otherwise these could also be removed.
Thanks,
Roger
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (550, 'unstable'), (500, 'testing'), (400, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages lintian depends on:
ii binutils 2.22-5
ii bzip2 1.0.6-1
ii diffstat 1.55-2
ii file 5.09-2
ii gettext 0.18.1.1-5
ii intltool-debian 0.35.0+20060710.1
ii libapt-pkg-perl 0.1.25+b1
ii libclass-accessor-perl 0.34-1
ii libclone-perl 0.31-1+b2
ii libdigest-sha-perl 5.70-1
ii libdpkg-perl 1.16.2
ii libemail-valid-perl 0.186-1
ii libipc-run-perl 0.90-1
ii libparse-debianchangelog-perl 1.2.0-1
ii libtimedate-perl 1.2000-1
ii liburi-perl 1.59-1
ii locales 2.13-24
ii locales-all [locales] 2.13-24
ii man-db 2.6.0.2-3
ii patchutils 0.3.2-1.1
ii perl [libdigest-sha-perl] 5.14.2-6
ii unzip 6.0-5
lintian recommends no packages.
Versions of packages lintian suggests:
ii binutils-multiarch <none>
ii dpkg-dev 1.16.2
ii libhtml-parser-perl 3.69-1+b1
ii libtext-template-perl 1.45-2
ii man-db 2.6.0.2-3
ii xz-utils 5.1.1alpha+20110809-3
-- no debconf information
>From 8ef4bfa900671cf36c8dd109fd31c9483d1e9106 Mon Sep 17 00:00:00 2001
From: Roger Leigh <rleigh@debian.org>
Date: Wed, 25 Jan 2012 21:59:21 +0000
Subject: [PATCH 1/2] build-arch and build-indep are required targets in
debian/rules
Move build-arch and build-indep from %recommended to %required.
Update debian-rules-missing-required-target description with some
of the text from debian-rules-missing-recommended-target. Leave
empty %required and debian-rules-missing-recommended-target for
potential future use.
Signed-off-by: Roger Leigh <rleigh@debian.org>
---
checks/rules | 4 ++--
checks/rules.desc | 30 ++++++++++++++----------------
2 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/checks/rules b/checks/rules
index bdba0b6..a176d2b 100644
--- a/checks/rules
+++ b/checks/rules
@@ -87,11 +87,11 @@ my @RULE_CLEAN_DEPENDS =
# The following targets are required per Policy.
my %required = map { $_ => 1 }
- qw(build binary binary-arch binary-indep clean);
+ qw(build build-arch build-indep binary binary-arch binary-indep clean);
# The following targets are recommended per Policy.
my %recommended = map { $_ => 1 }
- qw(build-arch build-indep);
+ qw();
# Rules about required debhelper command ordering. Each command is put into a
# class and the tag is issued if they're called in the wrong order for the
diff --git a/checks/rules.desc b/checks/rules.desc
index 5a9dfe7..94aa85e 100644
--- a/checks/rules.desc
+++ b/checks/rules.desc
@@ -30,21 +30,15 @@ Tag: debian-rules-missing-required-target
Severity: serious
Certainty: certain
Ref: policy 4.9
-Info: The <tt>debian/rules</tt> file for this package does not provide one
- of the required targets. All of build, binary, binary-arch,
- binary-indep, and clean must be provided, even if they don't do anything
- for this package.
-Tag: debian-rules-missing-recommended-target
-Severity: normal
-Certainty: certain
-Ref: policy 4.9
Info: The <tt>debian/rules</tt> file for this package does not provide
- one of the recommended targets. All of build-arch and build-indep
- should be provided, even if they don't do anything for this package.
- If this package does not currently split building of architecture
- dependent and independent packages, the following rules may be added
- to fall back to the build target:
+ one of the required targets. All of build, build-arch, build-indep,
+ binary, binary-arch, binary-indep, and clean must be provided, even
+ if they don't do anything for this package. If this package does not
+ currently split building of architecture dependent and independent
+ packages, and does not currently provide build-arch or build-indep
+ targets, the following rules may be added to fall back to the build
+ target:
.
build-arch: build
build-indep: build
@@ -56,9 +50,13 @@ Info: The <tt>debian/rules</tt> file for this package does not provide
build-indep: build-stamp
build-stamp:
build here
- .
- These targets will be required by policy in the future, so should be
- added to prevent future breakage.
+
+Tag: debian-rules-missing-recommended-target
+Severity: normal
+Certainty: certain
+Ref: policy 4.9
+Info: The <tt>debian/rules</tt> file for this package does not provide
+ one of the recommended targets.
Tag: debian-rules-uses-deprecated-makefile
Severity: normal
--
1.7.8.3
>From 74423d8f4502ffaf7504d1e2a8ad7fc164e4be32 Mon Sep 17 00:00:00 2001
From: Roger Leigh <rleigh@debian.org>
Date: Wed, 25 Jan 2012 22:12:19 +0000
Subject: [PATCH 2/2] Update checks for
debian-rules-missing-recommended-target
Replace all use of debian-rules-missing-recommended-target
with debian-rules-missing-required-target.
---
t/tests/generic-dh-make-2005/tags | 4 ++--
t/tests/generic-dh-make-2008/tags | 4 ++--
t/tests/generic-empty/tags | 4 ++--
t/tests/rules-dh-unused-target-nonempty/tags | 4 ++--
.../rules-missing-targets-with-known-includes/desc | 1 -
.../rules-missing-targets-with-known-includes/tags | 4 ++--
t/tests/rules-missing-targets/desc | 2 +-
t/tests/rules-missing-targets/tags | 4 ++--
t/tests/rules-variable-targets/desc | 2 +-
testset/tags.binary | 2 +-
10 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/t/tests/generic-dh-make-2005/tags b/t/tests/generic-dh-make-2005/tags
index eb71be2..1d46b76 100644
--- a/t/tests/generic-dh-make-2005/tags
+++ b/t/tests/generic-dh-make-2005/tags
@@ -5,8 +5,8 @@ I: generic-dh-make-2005 source: debian-watch-file-is-missing
I: generic-dh-make-2005: extended-description-is-probably-too-short
W: generic-dh-make-2005 source: ancient-standards-version 3.6.2 (current is CURRENT)
W: generic-dh-make-2005 source: debian-rules-ignores-make-clean-error line 47
-W: generic-dh-make-2005 source: debian-rules-missing-recommended-target build-arch
-W: generic-dh-make-2005 source: debian-rules-missing-recommended-target build-indep
+W: generic-dh-make-2005 source: debian-rules-missing-required-target build-arch
+W: generic-dh-make-2005 source: debian-rules-missing-required-target build-indep
W: generic-dh-make-2005 source: debian-rules-sets-DH_COMPAT line 12
W: generic-dh-make-2005 source: dh_suidregister-is-obsolete line 85
W: generic-dh-make-2005 source: package-uses-deprecated-debhelper-compat-version 2
diff --git a/t/tests/generic-dh-make-2008/tags b/t/tests/generic-dh-make-2008/tags
index 8912546..035d011 100644
--- a/t/tests/generic-dh-make-2008/tags
+++ b/t/tests/generic-dh-make-2008/tags
@@ -9,8 +9,8 @@ I: generic-dh-make-2008: package-contains-empty-directory usr/bin/
I: generic-dh-make-2008: package-contains-empty-directory usr/sbin/
W: generic-dh-make-2008 source: ancient-standards-version 3.7.3 (current is CURRENT)
W: generic-dh-make-2008 source: bad-homepage <insert the upstream URL, if relevant>
-W: generic-dh-make-2008 source: debian-rules-missing-recommended-target build-arch
-W: generic-dh-make-2008 source: debian-rules-missing-recommended-target build-indep
+W: generic-dh-make-2008 source: debian-rules-missing-required-target build-arch
+W: generic-dh-make-2008 source: debian-rules-missing-required-target build-indep
W: generic-dh-make-2008 source: dh-clean-k-is-deprecated
W: generic-dh-make-2008 source: dh-make-template-in-source debian/cron.d.ex
W: generic-dh-make-2008 source: dh-make-template-in-source debian/emacsen-install.ex
diff --git a/t/tests/generic-empty/tags b/t/tests/generic-empty/tags
index b04062d..6d424a8 100644
--- a/t/tests/generic-empty/tags
+++ b/t/tests/generic-empty/tags
@@ -9,8 +9,8 @@ E: generic-empty: maintainer-address-missing a
E: generic-empty: no-copyright-file
E: generic-empty: package-has-no-description
W: generic-empty source: changelog-should-mention-nmu
-W: generic-empty source: debian-rules-missing-recommended-target build-arch
-W: generic-empty source: debian-rules-missing-recommended-target build-indep
+W: generic-empty source: debian-rules-missing-required-target build-arch
+W: generic-empty source: debian-rules-missing-required-target build-indep
W: generic-empty source: maintainer-not-full-name a
W: generic-empty source: no-debian-copyright
W: generic-empty source: no-section-field-for-source
diff --git a/t/tests/rules-dh-unused-target-nonempty/tags b/t/tests/rules-dh-unused-target-nonempty/tags
index 475f57f..125ddc2 100644
--- a/t/tests/rules-dh-unused-target-nonempty/tags
+++ b/t/tests/rules-dh-unused-target-nonempty/tags
@@ -1,3 +1,3 @@
W: rules-dh-unused-target-nonempty source: binary-arch-rules-but-pkg-is-arch-indep
-W: rules-dh-unused-target-nonempty source: debian-rules-missing-recommended-target build-arch
-W: rules-dh-unused-target-nonempty source: debian-rules-missing-recommended-target build-indep
+W: rules-dh-unused-target-nonempty source: debian-rules-missing-required-target build-arch
+W: rules-dh-unused-target-nonempty source: debian-rules-missing-required-target build-indep
diff --git a/t/tests/rules-missing-targets-with-known-includes/desc b/t/tests/rules-missing-targets-with-known-includes/desc
index 113279e..d5c0791 100644
--- a/t/tests/rules-missing-targets-with-known-includes/desc
+++ b/t/tests/rules-missing-targets-with-known-includes/desc
@@ -4,4 +4,3 @@ Version: 1.0
Description: Test for debian/rules with known included file
Test-For:
debian-rules-missing-required-target
- debian-rules-missing-recommended-target
diff --git a/t/tests/rules-missing-targets-with-known-includes/tags b/t/tests/rules-missing-targets-with-known-includes/tags
index 6b5eba7..9528152 100644
--- a/t/tests/rules-missing-targets-with-known-includes/tags
+++ b/t/tests/rules-missing-targets-with-known-includes/tags
@@ -1,4 +1,4 @@
E: rules-missing-targets-with-known-includes source: debian-rules-missing-required-target binary-arch
E: rules-missing-targets-with-known-includes source: debian-rules-missing-required-target binary-indep
-W: rules-missing-targets-with-known-includes source: debian-rules-missing-recommended-target build-arch
-W: rules-missing-targets-with-known-includes source: debian-rules-missing-recommended-target build-indep
+W: rules-missing-targets-with-known-includes source: debian-rules-missing-required-target build-arch
+W: rules-missing-targets-with-known-includes source: debian-rules-missing-required-target build-indep
diff --git a/t/tests/rules-missing-targets/desc b/t/tests/rules-missing-targets/desc
index f92d7bb..c6cd105 100644
--- a/t/tests/rules-missing-targets/desc
+++ b/t/tests/rules-missing-targets/desc
@@ -3,5 +3,5 @@ Sequence: 6000
Version: 1.0
Description: Test for missing targets in debian/rules
Test-For:
- debian-rules-missing-recommended-target
+ debian-rules-missing-required-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 ef2f56a..22a40b6 100644
--- a/t/tests/rules-missing-targets/tags
+++ b/t/tests/rules-missing-targets/tags
@@ -1,3 +1,3 @@
-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: debian-rules-missing-required-target build-arch
+W: rules-missing-targets source: debian-rules-missing-required-target build-indep
W: rules-missing-targets source: package-would-benefit-from-build-arch-targets
diff --git a/t/tests/rules-variable-targets/desc b/t/tests/rules-variable-targets/desc
index a7bc41d..5785b70 100644
--- a/t/tests/rules-variable-targets/desc
+++ b/t/tests/rules-variable-targets/desc
@@ -2,4 +2,4 @@ Testname: rules-variable-targets
Sequence: 6000
Version: 1.0
Description: Test against missing targets in debian/rules
-Test-Against: debian-rules-missing-recommended-target
+Test-Against: debian-rules-missing-required-target
diff --git a/testset/tags.binary b/testset/tags.binary
index 1028eb9..832d137 100644
--- a/testset/tags.binary
+++ b/testset/tags.binary
@@ -60,7 +60,7 @@ I: binary: desktop-entry-contains-encoding-key usr/share/applications/hello.desk
I: binary: no-md5sums-control-file
W: binary source: ancient-standards-version 3.2.1 (current is 3.9.2)
W: binary source: debian-rules-ignores-make-clean-error line 14
-W: binary source: debian-rules-missing-recommended-target build-indep
+W: binary source: debian-rules-missing-required-target build-indep
W: binary source: debian-rules-uses-pwd line 9
W: binary source: intra-source-package-circular-dependency binary binary-data
W: binary source: maintainer-upload-has-incorrect-version-number 4-1.1
--
1.7.8.3
Reply to: