[lintian] 02/02: Clean up old (Test-|Build-)Depends
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit dd696c799911b08255e8496e8549d839078f6c65
Author: Niels Thykier <niels@thykier.net>
Date: Thu Apr 20 12:24:01 2017 +0000
Clean up old (Test-|Build-)Depends
Generally assume that jessie is used as base and drop (most)
dependencies satisfied in jessie. Notable exception being dpkg, which
is (also) an indicator of Wheezy no longer being supported.
Signed-off-by: Niels Thykier <niels@thykier.net>
---
debian/changelog | 5 +++++
debian/control | 8 ++------
t/tests/binaries-multiarch/desc | 1 -
t/tests/debhelper-compat-experimental/desc | 1 -
t/tests/fields-build-profiles-general/desc | 2 --
t/tests/files-gzip/desc | 1 -
t/tests/files-tar-traps/desc | 6 ------
t/tests/java-class-format/desc | 1 -
t/tests/java-classpath/desc | 1 -
t/tests/java-jars/desc | 1 -
t/tests/legacy-filenames/desc | 2 --
t/tests/patch-systems-quilt-debian-changes/desc | 3 ---
t/tests/phppear-pearok/desc | 2 --
t/tests/testsuite-general/desc | 3 ---
14 files changed, 7 insertions(+), 30 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6f05e81..01594a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -79,6 +79,8 @@ lintian (2.5.51) UNRELEASED; urgency=medium
* debian/control:
+ [NT] Add explicit (Build-)Depends on dpkg (>= 1.17.14) to make it
explicit that we no longer support Wheezy or older.
+ + [NT] Drop versioned dependencies that are there to assist to
+ Wheezy.
* debian/copyright:
+ [EB] Add Edward Betts.
@@ -95,6 +97,9 @@ lintian (2.5.51) UNRELEASED; urgency=medium
* reporting/graphs/tags.gpi:
+ [NT] Tweak tags.gpi so it works with gnuplot 5.
+ * t/*:
+ + [NT] Drop "Test-Depends" from tests where the versions in Debian
+ jessie will satisfy the dependency.
* t/runtests:
+ [NT] Re-sort test output after running the "post_test" sed script
on the output. This prevent test failures caused by the order
diff --git a/debian/control b/debian/control
index 181f9ce..53be9ea 100644
--- a/debian/control
+++ b/debian/control
@@ -55,10 +55,7 @@ Build-Depends: aspell,
node-uglify,
patchutils,
perl,
-# pkg-php-tools is not available in Wheezy. However, it is only used for
-# a test, so we can live with its absence in Wheezy. The bash dependency
-# is just used as a "Wheezy indicator"-dependency.
- pkg-php-tools (>= 1.5~) | bash (<< 4.2+dfsg-1~),
+ pkg-php-tools,
python,
python-all-dev,
python-numpy,
@@ -105,8 +102,7 @@ Depends: binutils,
xz-utils,
${misc:Depends},
${perl:Depends},
-Recommends: perl (>= 5.20) | libautodie-perl (>= 2.18),
- libperlio-gzip-perl,
+Recommends: libperlio-gzip-perl,
Suggests: binutils-multiarch,
dpkg-dev,
libhtml-parser-perl,
diff --git a/t/tests/binaries-multiarch/desc b/t/tests/binaries-multiarch/desc
index b9fa384..04fce00 100644
--- a/t/tests/binaries-multiarch/desc
+++ b/t/tests/binaries-multiarch/desc
@@ -1,6 +1,5 @@
Testname: binaries-multiarch
Version: 1.0
-Test-Depends: debhelper (>= 9.20151004~)
Description: Test of a correct multiarch package
Architecture: i386 amd64
Options: --pedantic -I -E
diff --git a/t/tests/debhelper-compat-experimental/desc b/t/tests/debhelper-compat-experimental/desc
index 8a9e439..4512370 100644
--- a/t/tests/debhelper-compat-experimental/desc
+++ b/t/tests/debhelper-compat-experimental/desc
@@ -5,6 +5,5 @@ Description: Test for old debian/compat file
Profile: lintian-test
Skeleton: pedantic
Options: --pedantic -I -E
-Test-Depends: debhelper (>= 9.20141221),
Test-For:
package-uses-experimental-debhelper-compat-version
diff --git a/t/tests/fields-build-profiles-general/desc b/t/tests/fields-build-profiles-general/desc
index 0d6dbef..1352aa6 100644
--- a/t/tests/fields-build-profiles-general/desc
+++ b/t/tests/fields-build-profiles-general/desc
@@ -2,8 +2,6 @@ Testname: fields-build-profiles-general
Version: 1.0
Options: --pedantic
Description: General tests for build profiles
-# Build-profiles requires dpkg 1.17.14 and debhelper 9.20141010
-Test-Depends: dpkg (>= 1.17.14), debhelper (>= 9.20141010)
Test-For:
invalid-profile-name-in-source-relation
invalid-profile-name-in-build-profiles-field
diff --git a/t/tests/files-gzip/desc b/t/tests/files-gzip/desc
index 44317a5..aea7ee9 100644
--- a/t/tests/files-gzip/desc
+++ b/t/tests/files-gzip/desc
@@ -2,6 +2,5 @@ Testname: files-gzip
Version: 1.0-1
Type: non-native
Description: Test for issues handling gz but not gzip files
-Test-Depends: dpkg (>= 1.17)
Test-for:
gz-file-not-gzip
diff --git a/t/tests/files-tar-traps/desc b/t/tests/files-tar-traps/desc
index 6f6ad17..551d84c 100644
--- a/t/tests/files-tar-traps/desc
+++ b/t/tests/files-tar-traps/desc
@@ -1,11 +1,5 @@
Testname: files-tar-traps
Version: 1.0
Description: Test tags for tar common bugs
-# tar -t in 1.27 is buggy and creates tarballs incorrectly
-# for "quoted" file names.
-#
-# See #740199 and
-# http://lists.gnu.org/archive/html/bug-tar/2014-03/msg00001.html
-Test-Depends: tar (>= 1.27.1~), dpkg (>= 1.17.7)
Test-For:
non-standard-toplevel-dir
diff --git a/t/tests/java-class-format/desc b/t/tests/java-class-format/desc
index 999e3b3..c406c31 100644
--- a/t/tests/java-class-format/desc
+++ b/t/tests/java-class-format/desc
@@ -3,7 +3,6 @@ Type: non-native
Version: 1.0-1
Description: Various checks for Java Class format
Section: java
-Test-Depends: java-common (>= 0.52)
Test-For:
incompatible-java-bytecode-format
unknown-java-class-version
diff --git a/t/tests/java-classpath/desc b/t/tests/java-classpath/desc
index 2b23862..7b33fa0 100644
--- a/t/tests/java-classpath/desc
+++ b/t/tests/java-classpath/desc
@@ -4,7 +4,6 @@ Version: 1.0-1
Description: Various checks about JAR files
Author: Vincent Fourmond <fourmond@debian.org>
Section: java
-Test-Depends: java-common (>= 0.52)
Test-For:
missing-classpath
classpath-contains-relative-path
diff --git a/t/tests/java-jars/desc b/t/tests/java-jars/desc
index 720b36d..77b8cb7 100644
--- a/t/tests/java-jars/desc
+++ b/t/tests/java-jars/desc
@@ -4,7 +4,6 @@ Version: 1.0-1
Description: Various checks about JAR files
Author: Vincent Fourmond <fourmond@debian.org>
Section: java
-Test-Depends: java-common (>= 0.52)
Test-For:
codeless-jar
executable-jar-without-main-class
diff --git a/t/tests/legacy-filenames/desc b/t/tests/legacy-filenames/desc
index 7b084ca..6fbe186 100644
--- a/t/tests/legacy-filenames/desc
+++ b/t/tests/legacy-filenames/desc
@@ -2,6 +2,4 @@ Testname: legacy-filenames
Source: filenames
Sequence: 9999
Version: 1:12-0.1
-# tar -t is buggy and does not list \\\ filename
-Test-Depends: tar (>= 1.27)
Description: Legacy test "filenames"
diff --git a/t/tests/patch-systems-quilt-debian-changes/desc b/t/tests/patch-systems-quilt-debian-changes/desc
index 068066e..391dc18 100644
--- a/t/tests/patch-systems-quilt-debian-changes/desc
+++ b/t/tests/patch-systems-quilt-debian-changes/desc
@@ -2,8 +2,5 @@ Testname: patch-systems-quilt-debian-changes
Version: 1.0-1
Description: Test a 3.0 (quilt) package which has a debian-changes-XXX patch
Type: non-native
-# dpkg-dev in Ubuntu Precise re-writes the patch header and thereby
-# triggers another tag.
-Test-Depends: dpkg-dev (>= 1.16.5~)
Test-For:
format-3.0-but-debian-changes-patch
diff --git a/t/tests/phppear-pearok/desc b/t/tests/phppear-pearok/desc
index b9c080d..ca886c1 100644
--- a/t/tests/phppear-pearok/desc
+++ b/t/tests/phppear-pearok/desc
@@ -9,5 +9,3 @@ Test-Against:
pear-package-not-using-substvar
pecl-package-requires-build-dependency
Type: non-native
-# pkg-php-tools >= 1.5 is not available in Wheezy
-Test-Depends: pkg-php-tools (>= 1.5)
diff --git a/t/tests/testsuite-general/desc b/t/tests/testsuite-general/desc
index f86ed8d..800df1c 100644
--- a/t/tests/testsuite-general/desc
+++ b/t/tests/testsuite-general/desc
@@ -3,9 +3,6 @@ Version: 1.0
Description: General tests of the autopkgtest control file
Options: -I -E --pedantic
Skeleton: pedantic
-# according to changelog dpkg 1.17.11:
-# * Automatically add the Testsuite field in dpkg-source to the .dsc file
-Test-Depends: dpkg (>= 1.17.11)
Test-For:
debian-tests-control-uses-national-encoding
exclusive-runtime-tests-field
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: