[lintian] 01/01: Drop versioned B-D check for using Build-Profiles
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit 570992161928d2c9b83ed103f6d88ad3b2b71deb
Author: Niels Thykier <niels@thykier.net>
Date: Sun Jun 18 12:28:34 2017 +0000
Drop versioned B-D check for using Build-Profiles
The dpkg and debhelper packages required are now satisfied in
oldstable.
Signed-off-by: Niels Thykier <niels@thykier.net>
---
checks/control-file.pm | 23 -----------------------
checks/fields.desc | 16 ----------------
checks/fields.pm | 20 --------------------
debian/changelog | 8 ++++++++
t/tests/fields-build-profiles-general/desc | 2 --
t/tests/fields-build-profiles-general/tags | 4 ----
6 files changed, 8 insertions(+), 65 deletions(-)
diff --git a/checks/control-file.pm b/checks/control-file.pm
index ed89387..873658a 100644
--- a/checks/control-file.pm
+++ b/checks/control-file.pm
@@ -316,19 +316,10 @@ sub run {
}
}
- # check the Build-Profiles field
- # this has to checked here because the Build-Profiles field does not appear
- # in DEBIAN/control and even if it should in the future, some binary
- # packages might never be built in the first place because of build
- # profiles
-
- my $profiles_used = 0;
-
# check the syntax of the Build-Profiles field
for my $bin (@package_names) {
my $raw = $info->binary_field($bin, 'build-profiles');
next unless $raw;
- $profiles_used = 1;
if (
$raw!~ m{^\s* # skip leading whitespace
< # first list start
@@ -368,20 +359,6 @@ sub run {
}
}
- # if a Build-Profiles field was used, then the package must depend on the
- # correct dpkg (and optionally debhelper) versions
- if ($profiles_used) {
- my $build_all = $info->relation('build-depends-all');
- tag 'restriction-formula-without-versioned-dpkg-dev-dependency'
- unless ($build_all->implies('dpkg-dev (>= 1.17.14~)'));
- # if the package uses debhelper then it must require
- # version >= 9.20141010
- if ($build_all->implies('debhelper')) {
- tag 'restriction-formula-with-debhelper-without-debhelper-version'
- unless ($build_all->implies('debhelper (>= 9.20141010~)'));
- }
- }
-
# find binary packages that Pre-Depend on multiarch-support without going
# via ${misc:Pre-Depends}
if ($info->source_field('build-depends')) {
diff --git a/checks/fields.desc b/checks/fields.desc
index a4cdf01..32de62b 100644
--- a/checks/fields.desc
+++ b/checks/fields.desc
@@ -674,22 +674,6 @@ Info: The restriction formula in the source relation includes an unknown build
and "pkg.<i>srcpkg</i>.<i>anything</i>".
Ref: https://wiki.debian.org/BuildProfileSpec#Registered_profile_names
-Tag: restriction-formula-without-versioned-dpkg-dev-dependency
-Severity: pedantic
-Certainty: certain
-Info: If a restriction formula appears in the source relation or if the
- Build-Profiles field is used in a binary package stanza then the source
- package has to build depend on dpkg-dev (>= 1.17.14) for minimal
- restriction formula support.
-
-Tag: restriction-formula-with-debhelper-without-debhelper-version
-Severity: pedantic
-Certainty: certain
-Info: If a restriction formula appears in the build dependencies or if the
- Build-Profiles field is used in a binary package stanza and the package uses
- debhelper, then the source package has to depend on at least debhelper
- 9.20141010.
-
Tag: depends-on-build-essential-package-without-using-version
Severity: important
Certainty: certain
diff --git a/checks/fields.pm b/checks/fields.pm
index 292eae1..c16c9be 100644
--- a/checks/fields.pm
+++ b/checks/fields.pm
@@ -989,7 +989,6 @@ sub run {
qw(build-depends build-depends-indep build-depends-arch);
};
- my $restrictions_used = 0;
my %depend;
for my $field (
qw(build-depends build-depends-indep build-depends-arch build-conflicts build-conflicts-indep build-conflicts-arch)
@@ -1022,10 +1021,6 @@ sub run {
}
}
- if (scalar @{$d_restr} >= 1) {
- $restrictions_used = 1;
- }
-
for my $restrlist (@{$d_restr}) {
for my $prof (@{$restrlist}) {
$prof =~ s/^!//;
@@ -1165,21 +1160,6 @@ sub run {
}
}
- # if restrictions are found in the build-depends/conflicts, then
- # package must build-depend on dpkg (>= 1.17.14)
- if ($restrictions_used) {
- my $build_conflicts_all = $info->relation('build-conflicts-all');
- tag 'restriction-formula-without-versioned-dpkg-dev-dependency'
- unless ($build_all->implies('dpkg-dev (>= 1.17.14~)'));
- # if the package uses debhelper then it must require
- # version >= 9.20141010
- if ($build_all->implies('debhelper')) {
- tag
-'restriction-formula-with-debhelper-without-debhelper-version'
- unless ($build_all->implies('debhelper (>= 9.20141010~)'));
- }
- }
-
my (@arch_dep_pkgs, @dbg_pkgs);
foreach my $gproc ($group->get_binary_processables) {
my $binpkg = $gproc->pkg_name;
diff --git a/debian/changelog b/debian/changelog
index f88a96d..95bb101 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,14 @@ lintian (2.5.52) UNRELEASED; urgency=medium
XXX: generate tag summary
+ * checks/control-file.pm:
+ + [NT] Remove check for missing versioned build-depends for dpkg
+ and debhlper when using Build-Profiles. The necessary versions
+ are now in oldstable.
+ * checks/fields.{desc,pm}:
+ + [NT] Remove check for missing versioned build-depends for dpkg
+ and debhlper when using Build-Profiles. The necessary versions
+ are now in oldstable.
* checks/scripts.desc:
+ [CL] Upgrade new-package-should-not-package-python2-module from
I: to W:. See #829744 for more info.
diff --git a/t/tests/fields-build-profiles-general/desc b/t/tests/fields-build-profiles-general/desc
index 1352aa6..be0d6a2 100644
--- a/t/tests/fields-build-profiles-general/desc
+++ b/t/tests/fields-build-profiles-general/desc
@@ -6,6 +6,4 @@ Test-For:
invalid-profile-name-in-source-relation
invalid-profile-name-in-build-profiles-field
invalid-restriction-formula-in-build-profiles-field
- restriction-formula-with-debhelper-without-debhelper-version
- restriction-formula-without-versioned-dpkg-dev-dependency
References: Debian Bug#540594, Debian Bug#551793
diff --git a/t/tests/fields-build-profiles-general/tags b/t/tests/fields-build-profiles-general/tags
index 7624f0d..0ce0405 100644
--- a/t/tests/fields-build-profiles-general/tags
+++ b/t/tests/fields-build-profiles-general/tags
@@ -1,7 +1,3 @@
E: fields-build-profiles-general source: invalid-profile-name-in-build-profiles-field unknown fields-build-profiles-general-unknown-profile
E: fields-build-profiles-general source: invalid-profile-name-in-source-relation foobar [build-depends: bpfail1 <foobar>]
E: fields-build-profiles-general source: invalid-restriction-formula-in-build-profiles-field <in<valid> fields-build-profiles-general-wrong-syntax
-P: fields-build-profiles-general source: restriction-formula-with-debhelper-without-debhelper-version
-P: fields-build-profiles-general source: restriction-formula-with-debhelper-without-debhelper-version
-P: fields-build-profiles-general source: restriction-formula-without-versioned-dpkg-dev-dependency
-P: fields-build-profiles-general source: restriction-formula-without-versioned-dpkg-dev-dependency
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: