[lintian] 01/01: checks/{control-file, fields}: Remove checks for build-conflicts related to build profiles
This is an automated email from the git hooks/post-receive script.
jwilk pushed a commit to branch master
in repository lintian.
commit 291ab4ccd854df4b1cc35cec94d293604edff098
Author: Jakub Wilk <jwilk@debian.org>
Date: Fri Apr 1 19:15:57 2016 +0200
checks/{control-file,fields}: Remove checks for build-conflicts related to build profiles
Reference: https://lists.debian.org/20160330120012.GA1608@jwilk.net
---
checks/control-file.pm | 8 --------
checks/fields.desc | 16 ----------------
checks/fields.pm | 10 ----------
debian/changelog | 3 +++
.../debian/debian/control.in | 3 ---
t/tests/fields-build-profiles-general/desc | 2 --
t/tests/fields-build-profiles-general/tags | 4 ----
7 files changed, 3 insertions(+), 43 deletions(-)
diff --git a/checks/control-file.pm b/checks/control-file.pm
index 37757ff..32a3309 100644
--- a/checks/control-file.pm
+++ b/checks/control-file.pm
@@ -360,19 +360,11 @@ sub run {
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~)'));
- tag 'restriction-formula-with-versioned-dpkg-dev-conflict'
- if ($build_conflicts_all->implies_inverse('dpkg-dev (<< 1.17.14)'));
# if the package uses debhelper then it must require and not
# conflict with version >= 9.20141010
if ($build_all->implies('debhelper')) {
tag 'restriction-formula-with-debhelper-without-debhelper-version'
unless ($build_all->implies('debhelper (>= 9.20141010~)'));
- #<<< no tidy, tag name too long
- tag 'restriction-formula-with-debhelper-with-conflicting-version'
- #>>>
- if (
- $build_conflicts_all->implies_inverse(
- 'debhelper (<< 9.20141010)'));
}
}
diff --git a/checks/fields.desc b/checks/fields.desc
index 13e6cdd..76ea33c 100644
--- a/checks/fields.desc
+++ b/checks/fields.desc
@@ -667,14 +667,6 @@ Info: If a restriction formula appears in the source relation or if the
package has to build depend on dpkg-dev (>= 1.17.14) for minimal
restriction formula support.
-Tag: restriction-formula-with-versioned-dpkg-dev-conflict
-Severity: normal
-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 then the source
- package has to build depend on dpkg-dev (>= 1.17.14) for minimal
- restriction formula support. It must not conflict with version 1.17.14.
-
Tag: restriction-formula-with-debhelper-without-debhelper-version
Severity: normal
Certainty: certain
@@ -683,14 +675,6 @@ Info: If a restriction formula appears in the build dependencies or if the
debhelper, then the source package has to depend on at least debhelper
9.20141010.
-Tag: restriction-formula-with-debhelper-with-conflicting-version
-Severity: normal
-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. It must not conflict with version 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 f29f4b2..45c6a27 100644
--- a/checks/fields.pm
+++ b/checks/fields.pm
@@ -1128,22 +1128,12 @@ sub run {
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)'));
- tag 'restriction-formula-with-versioned-dpkg-dev-conflict'
- if (
- $build_conflicts_all->implies_inverse('dpkg-dev (<< 1.17.14)')
- );
# if the package uses debhelper then it must require and not
# conflict with version >= 9.20141010
if ($build_all->implies('debhelper')) {
tag
'restriction-formula-with-debhelper-without-debhelper-version'
unless ($build_all->implies('debhelper (>= 9.20141010)'));
- #<<< no tidy, tag name too long
- tag 'restriction-formula-with-debhelper-with-conflicting-version'
- #>>>
- if (
- $build_conflicts_all->implies_inverse(
- 'debhelper (<< 9.20141010)'));
}
}
diff --git a/debian/changelog b/debian/changelog
index 89852b5..7844afc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ lintian (2.5.43) UNRELEASED; urgency=medium
XXX: generate tag summary with private/generate-tag-summary
+ * checks/{control-file,fields}.{desc,pm}:
+ + [JW] Remove confusing checks for build-conflicts related to build
+ profiles.
* checks/debhelper.{desc,pm}:
+ [NT] Remove check for dh_undocumented as debhelper has
dropped the helper.
diff --git a/t/tests/fields-build-profiles-general/debian/debian/control.in b/t/tests/fields-build-profiles-general/debian/debian/control.in
index 21ae0db..9f7adf4 100644
--- a/t/tests/fields-build-profiles-general/debian/debian/control.in
+++ b/t/tests/fields-build-profiles-general/debian/debian/control.in
@@ -5,9 +5,6 @@ Maintainer: {$author}
Standards-Version: {$standards_version}
Build-Depends: debhelper (>= 9),
big <stage1>, bpfail1 <foobar>, bpcomplicated <stage1 nocheck> <cross>
-Build-Conflicts:
- dpkg-dev (>= 1.17.14),
- debhelper (>= 9.20141010)
Package: {$source}-wrong-syntax
Architecture: {$architecture}
diff --git a/t/tests/fields-build-profiles-general/desc b/t/tests/fields-build-profiles-general/desc
index 68c8ac0..f512e55 100644
--- a/t/tests/fields-build-profiles-general/desc
+++ b/t/tests/fields-build-profiles-general/desc
@@ -8,8 +8,6 @@ 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-with-conflicting-version
restriction-formula-with-debhelper-without-debhelper-version
- restriction-formula-with-versioned-dpkg-dev-conflict
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 43325e9..bcebd07 100644
--- a/t/tests/fields-build-profiles-general/tags
+++ b/t/tests/fields-build-profiles-general/tags
@@ -1,11 +1,7 @@
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
-W: fields-build-profiles-general source: restriction-formula-with-debhelper-with-conflicting-version
-W: fields-build-profiles-general source: restriction-formula-with-debhelper-with-conflicting-version
W: fields-build-profiles-general source: restriction-formula-with-debhelper-without-debhelper-version
W: fields-build-profiles-general source: restriction-formula-with-debhelper-without-debhelper-version
-W: fields-build-profiles-general source: restriction-formula-with-versioned-dpkg-dev-conflict
-W: fields-build-profiles-general source: restriction-formula-with-versioned-dpkg-dev-conflict
W: fields-build-profiles-general source: restriction-formula-without-versioned-dpkg-dev-dependency
W: 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: