[lintian] 01/01: c/fields: Drop check for depending on tkx multiple times
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit 65cb3b27c29bcd33d289d48e714cadcda9b81508
Author: Niels Thykier <niels@thykier.net>
Date: Sun Jun 18 13:47:37 2017 +0000
c/fields: Drop check for depending on tkx multiple times
Signed-off-by: Niels Thykier <niels@thykier.net>
---
checks/fields.desc | 7 -------
checks/fields.pm | 12 ++++--------
debian/changelog | 2 ++
t/tests/fields-multiple-x-deps/debian/debian/control.in | 1 -
t/tests/fields-multiple-x-deps/desc | 1 -
t/tests/fields-multiple-x-deps/tags | 1 -
t/tests/legacy-relations/tags | 1 -
7 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/checks/fields.desc b/checks/fields.desc
index 32de62b..21ec4c7 100644
--- a/checks/fields.desc
+++ b/checks/fields.desc
@@ -772,13 +772,6 @@ Info: The package seems to declare several relations to a tk version.
This is not only sloppy but in the case of libraries, it may well break
the runtime execution of programs.
-Tag: package-depends-on-multiple-tkx-versions
-Severity: important
-Certainty: possible
-Info: The package seems to declare several relations to a tkx version.
- This is not only sloppy but in the case of libraries, it may well break
- the runtime execution of programs.
-
Tag: package-depends-on-multiple-libpng-versions
Severity: important
Certainty: possible
diff --git a/checks/fields.pm b/checks/fields.pm
index c16c9be..d0d6fec 100644
--- a/checks/fields.pm
+++ b/checks/fields.pm
@@ -80,8 +80,6 @@ our %known_tclxs
our %known_tks
= map { $_ => 1 } ('tk40', 'tk8.0', 'tk8.2', 'tk8.3', 'tk8.4', 'tk8.5',);
-our %known_tkxs = map { $_ => 1 } ('tkx8.2', 'tkx8.3',);
-
our %known_libpngs = map { $_ => 1 } ('libpng12-0', 'libpng2', 'libpng3',);
our @known_java_pkg = map { qr/$_/ } (
@@ -693,8 +691,10 @@ sub run {
my $javadep = 0;
unfold($field, \$data);
- my (@seen_libstdcs, @seen_tcls, @seen_tclxs, @seen_tks, @seen_tkxs,
- @seen_libpngs);
+ my (
+ @seen_libstdcs, @seen_tcls, @seen_tclxs,
+ @seen_tks, @seen_libpngs
+ );
my $is_dep_field = sub {
any { $_ eq $_[0] }qw(depends pre-depends recommends suggests);
@@ -717,8 +717,6 @@ sub run {
if defined $known_tclxs{$alternatives[0][0]};
push @seen_tks, $alternatives[0][0]
if defined $known_tks{$alternatives[0][0]};
- push @seen_tkxs, $alternatives[0][0]
- if defined $known_tkxs{$alternatives[0][0]};
push @seen_libpngs, $alternatives[0][0]
if defined $known_libpngs{$alternatives[0][0]};
}
@@ -923,8 +921,6 @@ sub run {
if (scalar @seen_tclxs > 1);
tag 'package-depends-on-multiple-tk-versions', @seen_tks
if (scalar @seen_tks > 1);
- tag 'package-depends-on-multiple-tkx-versions', @seen_tkxs
- if (scalar @seen_tkxs > 1);
tag 'package-depends-on-multiple-libpng-versions', @seen_libpngs
if (scalar @seen_libpngs > 1);
}
diff --git a/debian/changelog b/debian/changelog
index 95bb101..37d47dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ lintian (2.5.52) UNRELEASED; urgency=medium
+ [NT] Remove check for missing versioned build-depends for dpkg
and debhlper when using Build-Profiles. The necessary versions
are now in oldstable.
+ + [NT] Drop check for depending on multiple versions of tkx as
+ tkx does not seem to be in Debian any longer.
* 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-multiple-x-deps/debian/debian/control.in b/t/tests/fields-multiple-x-deps/debian/debian/control.in
index e639e04..8e5a406 100644
--- a/t/tests/fields-multiple-x-deps/debian/debian/control.in
+++ b/t/tests/fields-multiple-x-deps/debian/debian/control.in
@@ -11,7 +11,6 @@ Depends: $\{shlibs:Depends\}, $\{misc:Depends\},
libstdc++2.10, libstdc++2.10-glibc2.2, libstdc++3.0,
tk8.2, tk8.3,
tcl8.0, tcl8.2,
- tkx8.2, tkx8.3,
tclx76, tclx8.0.4, tclx8.2,
libpng2, libpng3
Description: {$description}
diff --git a/t/tests/fields-multiple-x-deps/desc b/t/tests/fields-multiple-x-deps/desc
index 7c2dc4c..a8cff6e 100644
--- a/t/tests/fields-multiple-x-deps/desc
+++ b/t/tests/fields-multiple-x-deps/desc
@@ -7,4 +7,3 @@ Test-For:
package-depends-on-multiple-tcl-versions
package-depends-on-multiple-tclx-versions
package-depends-on-multiple-tk-versions
- package-depends-on-multiple-tkx-versions
diff --git a/t/tests/fields-multiple-x-deps/tags b/t/tests/fields-multiple-x-deps/tags
index bb0fdd5..10a4788 100644
--- a/t/tests/fields-multiple-x-deps/tags
+++ b/t/tests/fields-multiple-x-deps/tags
@@ -3,4 +3,3 @@ E: fields-multiple-x-deps: package-depends-on-multiple-libstdc-versions libstdc+
E: fields-multiple-x-deps: package-depends-on-multiple-tcl-versions tcl8.0 tcl8.2
E: fields-multiple-x-deps: package-depends-on-multiple-tclx-versions tclx76 tclx8.0.4 tclx8.2
E: fields-multiple-x-deps: package-depends-on-multiple-tk-versions tk8.2 tk8.3
-E: fields-multiple-x-deps: package-depends-on-multiple-tkx-versions tkx8.2 tkx8.3
diff --git a/t/tests/legacy-relations/tags b/t/tests/legacy-relations/tags
index 2df3e5f..1d7da96 100644
--- a/t/tests/legacy-relations/tags
+++ b/t/tests/legacy-relations/tags
@@ -16,7 +16,6 @@ E: relations-multiple-libs: package-depends-on-multiple-libpng-versions libpng2
E: relations-multiple-libs: package-depends-on-multiple-libstdc-versions libstdc++2.10 libstdc++2.10-glibc2.2 libstdc++3.0
E: relations-multiple-libs: package-depends-on-multiple-tcl-versions tcl8.0 tcl8.2
E: relations-multiple-libs: package-depends-on-multiple-tk-versions tk8.2 tk8.3
-E: relations-multiple-libs: package-depends-on-multiple-tkx-versions tkx8.2 tkx8.3
E: relations-multiple-libs: usr-share-doc-symlink-without-dependency relations
E: relations: changelog-file-missing-in-native-package
E: relations: conflicts-with-dependency depends foo
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: