[lintian] 01/05: Remove code related to python-support
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit 5ebe4e3ae0a2351085682deb776b3f6e249821c7
Author: Niels Thykier <niels@thykier.net>
Date: Sat Apr 23 08:52:50 2016 +0000
Remove code related to python-support
Signed-off-by: Niels Thykier <niels@thykier.net>
---
checks/debhelper.desc | 10 -------
checks/debhelper.pm | 4 ---
checks/files.desc | 9 -------
checks/files.pm | 31 +---------------------
checks/rules.pm | 1 -
data/debhelper/dh_addons-manual | 1 -
debian/changelog | 6 ++++-
.../debian/debian/rules | 1 -
.../debhelper-deprecated/debian/debian/control.in | 2 +-
t/tests/debhelper-deprecated/debian/debian/rules | 2 +-
t/tests/debhelper-deprecated/desc | 1 -
t/tests/debhelper-deprecated/tags | 2 --
t/tests/debhelper-no-depends/tags | 1 -
.../files-python-helpers/debian/debian/control.in | 15 -----------
t/tests/files-python-helpers/debian/debian/install | 2 --
t/tests/files-python-helpers/debian/python-foo | 1 -
.../files-python-helpers/debian/python-foo.private | 1 -
t/tests/files-python-helpers/desc | 5 ----
t/tests/files-python-helpers/tags | 1 -
t/tests/files-python-modules/debian/debian/rules | 2 --
t/tests/legacy-filenames/tags | 1 +
.../shared-libs-la-files/debian/debian/control.in | 15 -----------
t/tests/shared-libs-la-files/tags | 1 -
23 files changed, 9 insertions(+), 106 deletions(-)
diff --git a/checks/debhelper.desc b/checks/debhelper.desc
index 4cf3fa0..ef2a28c 100644
--- a/checks/debhelper.desc
+++ b/checks/debhelper.desc
@@ -63,16 +63,6 @@ Info: This package contains debian/*.ex and/or debian/ex.* files
package's details and renamed for use by various debhelper commands.
If they are not being used, they should be removed.
-Tag: dh_pysupport-is-obsolete
-Severity: normal
-Certainty: certain
-Info: This package calls dh_pysupport in its <tt>debian/rules</tt> file.
- dh_pysupport is deprecated and has been replaced by dh_python2.
- .
- dh_python2 is available in Squeeze; if backporting the package to a
- Lenny or older system, please ignore this warning.
-Ref: https://wiki.debian.org/Python/TransitionToDHPython2
-
Tag: dh_installmanpages-is-obsolete
Severity: normal
Certainty: certain
diff --git a/checks/debhelper.pm b/checks/debhelper.pm
index 0ef7d90..217a5ca 100644
--- a/checks/debhelper.pm
+++ b/checks/debhelper.pm
@@ -91,10 +91,6 @@ sub run {
$build_systems{'debhelper'} = 1
if not exists($build_systems{'dh'});
- if ($dhcommand eq 'dh_pysupport') {
- tag 'dh_pysupport-is-obsolete', "line $.";
- $seen_python_helper = 1;
- }
if ($dhcommand eq 'dh_installmanpages') {
tag 'dh_installmanpages-is-obsolete', "line $.";
}
diff --git a/checks/files.desc b/checks/files.desc
index a7e3988..d2ccccf 100644
--- a/checks/files.desc
+++ b/checks/files.desc
@@ -831,15 +831,6 @@ Info: The package appears to be installing debug modules in
should be installed in /usr/lib/debug/usr/lib/pymodules/pythonX.Y/
instead.
-Tag: missing-dependency-on-python-support
-Severity: important
-Certainty: possible
-Info: The package installs a file in usr/share/python-support/ but does
- not declare the necessary dependency on python-support.
- .
- This can happen if ${python:Depends} was omitted from the Depends field
- in debian/control.
-
Tag: package-installs-python-bytecode
Severity: serious
Certainty: certain
diff --git a/checks/files.pm b/checks/files.pm
index 814abc6..1d398b4 100644
--- a/checks/files.pm
+++ b/checks/files.pm
@@ -262,7 +262,6 @@ sub run {
my ($is_python, $is_perl, $has_binary_perl_file);
my @nonbinary_perl_files_in_lib;
my %linked_against_libvga;
- my $py_support_nver;
my @devhelp;
my @devhelp_links;
@@ -1269,14 +1268,6 @@ sub run {
tag 'file-should-not-be-compressed', $file;
}
- # ---------------- pyshared-data
- if ($fname=~ m,^usr/share/python-support/$ppkg\.(?:public|private)$,){
- $py_support_nver = '(>= 0.90)';
- } elsif ($fname =~ m,^usr/share/python-support/\S+,o
- && !$py_support_nver){
- $py_support_nver = '';
- }
-
# ---------------- python file locations
# - The python people kindly provided the following table.
# good:
@@ -1862,22 +1853,6 @@ sub run {
unless $type eq 'udeb';
}
- # python-support check
- if (defined($py_support_nver) && $pkg ne 'python-support'){
- # Okay - package installs something to /usr/share/python-support/
- # $py_support_nver is either the empty string or a version
- # describing what we need.
- #
- # We also skip debug packages since they are okay as long as
- # foo-dbg depends on foo (= $version) and foo has its dependency
- # correct.
- my $dep = $info->relation('depends');
- tag 'missing-dependency-on-python-support',
- "python-support $py_support_nver"
- unless ($pkg =~ m/-dbg$/
- || $dep->implies("python-support $py_support_nver"));
- }
-
# Check for section games but nothing in /usr/games. Check for
# any binary to save ourselves from game-data false positives:
my $games = dir_counts($info, 'usr/games/');
@@ -1900,9 +1875,6 @@ sub run {
# Empty Perl directories are an ExtUtils::MakeMaker artifact that
# will be fixed in Perl 5.10, and people can cause more problems
# by trying to fix it, so just ignore them.
- #
- # python-support needs a directory for each package even it might
- # be empty
if ($pkg ne 'base-files') {
foreach my $dir ($info->sorted_index) {
next if not $dir->is_dir;
@@ -1910,8 +1882,7 @@ sub run {
next if ($dirname =~ m{^var/} or $dirname =~ m{^etc/});
if (scalar($dir->children) == 0) {
if ( $dirname !~ m;^usr/lib/(?:[^/]+/)?perl5/$;
- and $dirname ne 'usr/share/perl5/'
- and $dirname !~ m;^usr/share/python-support/;) {
+ and $dirname ne 'usr/share/perl5/') {
tag 'package-contains-empty-directory', $dirname;
}
}
diff --git a/checks/rules.pm b/checks/rules.pm
index 7252788..3f1f976 100644
--- a/checks/rules.pm
+++ b/checks/rules.pm
@@ -79,7 +79,6 @@ our @GLOBAL_CLEAN_DEPENDS = (
my @GLOBAL_DEPENDS =(
['dh-ocaml, ocaml-nox | ocaml' => qr'^\t\s*dh_ocaml(?:init|doc)\s'],
['python-central' => qr'^DEB_PYTHON_SYSTEM\s*:?=\s*pycentral'],
- ['python-support' => qr'^DEB_PYTHON_SYSTEM\s*:?=\s*pysupport'],
);
# Similarly, this list of packages, regexes, and optional tags say that if the
diff --git a/data/debhelper/dh_addons-manual b/data/debhelper/dh_addons-manual
index 3a6d2fa..f9d51a6 100644
--- a/data/debhelper/dh_addons-manual
+++ b/data/debhelper/dh_addons-manual
@@ -7,5 +7,4 @@ apache2||dh-apache2 | apache2-dev
lv2config||lv2core
python2||python:any | python-all:any | python-dev:any | python-all-dev:any
python3||python3:any | python3-all:any | python3-dev:any | python3-all-dev:any
-python_support||python-support
sphinxdoc||python-sphinx | python3-sphinx
diff --git a/debian/changelog b/debian/changelog
index 1a6db8d..f5f1b33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ lintian (2.5.44) UNRELEASED; urgency=medium
+ [NT] Add classification tags for (absence of) maintscripts.
* checks/debhelper.{desc,pm}:
+ [NT] Add tag for classifying the build system.
+ + [NT] Remove test for dh_pysupport usage.
* checks/debian-source-dir.{desc,pm}:
+ [NT] Add tag for classifying the source format.
(Closes: #612610)
@@ -39,6 +40,7 @@ lintian (2.5.44) UNRELEASED; urgency=medium
* checks/files.pm:
+ [JW] Apply patch from Mathieu Parent to fix directories for PHP INI
files.
+ + [NT] Remove code related to python-support.
* checks/nmu.{desc,pm}:
+ [NT] Create a separate tag for extra whitespace around uploader name
in the changelog. Thanks to Ben Wiederhake for the suggestion.
@@ -50,6 +52,7 @@ lintian (2.5.44) UNRELEASED; urgency=medium
+ [NT] Add ":any" to all python dependencies. Thanks to Barry Warsaw
for reporting the bug.
+ [NT] Bump known python 3 version to include 3.4 and 3.5.
+ + [NT] Remove check for python-support.
* checks/scripts.desc:
+ [NT] Suggest dh_python2 / dh_python3 instead of dh_pysupport and
dh_pycentral. Thanks to Neil Williams for the report.
@@ -79,9 +82,10 @@ lintian (2.5.44) UNRELEASED; urgency=medium
* data/debhelper/*:
+ [JW] Refresh against unstable. Thanks to Mathieu Parent for the bug
report.
- * data/debhelper/dh_commands-manual:
+ * data/debhelper/dh_addons-manual:
+ [NT] Add ":any" to the dependencies for the python add-ons. Thanks
to Barry Warsaw for reporting the bug. (Closes: #803164)
+ + [NT] Remove entry for pysupport.
* data/menu-format/known-desktop-keys:
+ [NT] Accept "DesktopNames" as a known key in desktop files. Thanks
to Yves-Alexis Perez for the suggestion. (Closes: #766099)
diff --git a/t/tests/binaries-missing-depends-on-numpy-abi/debian/debian/rules b/t/tests/binaries-missing-depends-on-numpy-abi/debian/debian/rules
index 742b575..eae5ce6 100644
--- a/t/tests/binaries-missing-depends-on-numpy-abi/debian/debian/rules
+++ b/t/tests/binaries-missing-depends-on-numpy-abi/debian/debian/rules
@@ -5,4 +5,3 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
%:
dh $@
-override_dh_pysupport:
diff --git a/t/tests/debhelper-deprecated/debian/debian/control.in b/t/tests/debhelper-deprecated/debian/debian/control.in
index 25fc6f5..3e723d4 100644
--- a/t/tests/debhelper-deprecated/debian/debian/control.in
+++ b/t/tests/debhelper-deprecated/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 9), python-support, python-ply (>= 3.4-1~)
+Build-Depends: debhelper (>= 9), python-ply (>= 3.4-1~)
Package: {$source}
Architecture: {$architecture}
diff --git a/t/tests/debhelper-deprecated/debian/debian/rules b/t/tests/debhelper-deprecated/debian/debian/rules
index 39714c6..4404bec 100755
--- a/t/tests/debhelper-deprecated/debian/debian/rules
+++ b/t/tests/debhelper-deprecated/debian/debian/rules
@@ -25,7 +25,7 @@ binary-indep:
#dh_scrollkeeper
-dh_python-ply # neither should this
- -dh_pysupport
+
# Check not warning about deprecated commands in optional portions, but
# commands that have been toast for a long time are still warned about.
ifneq "$(LENNY_BACKPORT)" "y"
diff --git a/t/tests/debhelper-deprecated/desc b/t/tests/debhelper-deprecated/desc
index 3904ebe..1754f76 100644
--- a/t/tests/debhelper-deprecated/desc
+++ b/t/tests/debhelper-deprecated/desc
@@ -4,5 +4,4 @@ Version: 1.0
Description: Test for use of deprecated dh_* commands
Test-For:
dh_installmanpages-is-obsolete
- dh_pysupport-is-obsolete
diff --git a/t/tests/debhelper-deprecated/tags b/t/tests/debhelper-deprecated/tags
index 3f268e5..2298dd6 100644
--- a/t/tests/debhelper-deprecated/tags
+++ b/t/tests/debhelper-deprecated/tags
@@ -1,3 +1 @@
-E: debhelper-deprecated source: build-depends-on-obsolete-package build-depends: python-support => use dh_python2 instead
W: debhelper-deprecated source: dh_installmanpages-is-obsolete line 24
-W: debhelper-deprecated source: dh_pysupport-is-obsolete line 28
diff --git a/t/tests/debhelper-no-depends/tags b/t/tests/debhelper-no-depends/tags
index 8b09984..4601a1b 100644
--- a/t/tests/debhelper-no-depends/tags
+++ b/t/tests/debhelper-no-depends/tags
@@ -7,6 +7,5 @@ E: debhelper-no-depends source: missing-build-dependency-for-dh_-command dh_gtkm
E: debhelper-no-depends source: missing-build-dependency-for-dh_-command dh_lisp => dh-lisp
E: debhelper-no-depends source: package-uses-debhelper-but-lacks-build-depends
W: debhelper-no-depends source: debhelper-but-no-misc-depends debhelper-no-depends
-W: debhelper-no-depends source: dh_pysupport-is-obsolete line 20
W: debhelper-no-depends source: package-needs-versioned-debhelper-build-depends 9
W: debhelper-no-depends source: weak-dependency-on-misc-depends debhelper-suggests
diff --git a/t/tests/files-python-helpers/debian/debian/control.in b/t/tests/files-python-helpers/debian/debian/control.in
deleted file mode 100644
index 2109691..0000000
--- a/t/tests/files-python-helpers/debian/debian/control.in
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: {$source}
-Priority: extra
-Section: python
-Maintainer: {$author}
-Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 9)
-
-Package: python-foo
-Architecture: all
-Depends: $\{misc:Depends\},
-Description: {$description}
- This is a test package designed to exercise some feature or tag of
- Lintian. It is part of the Lintian test suite and may do very odd
- things. It should not be installed like a regular package. It may
- be an empty package.
diff --git a/t/tests/files-python-helpers/debian/debian/install b/t/tests/files-python-helpers/debian/debian/install
deleted file mode 100644
index c64501c..0000000
--- a/t/tests/files-python-helpers/debian/debian/install
+++ /dev/null
@@ -1,2 +0,0 @@
-python-foo usr/share/python-support/
-python-foo.private usr/share/python-support/
diff --git a/t/tests/files-python-helpers/debian/python-foo b/t/tests/files-python-helpers/debian/python-foo
deleted file mode 100644
index 336f590..0000000
--- a/t/tests/files-python-helpers/debian/python-foo
+++ /dev/null
@@ -1 +0,0 @@
-Hallo World
diff --git a/t/tests/files-python-helpers/debian/python-foo.private b/t/tests/files-python-helpers/debian/python-foo.private
deleted file mode 100644
index 336f590..0000000
--- a/t/tests/files-python-helpers/debian/python-foo.private
+++ /dev/null
@@ -1 +0,0 @@
-Hallo World
diff --git a/t/tests/files-python-helpers/desc b/t/tests/files-python-helpers/desc
deleted file mode 100644
index 679e703..0000000
--- a/t/tests/files-python-helpers/desc
+++ /dev/null
@@ -1,5 +0,0 @@
-Testname: files-python-helpers
-Sequence: 6000
-Version: 1.0
-Description: Test tags for missing depends on Python helpers
-Test-For: missing-dependency-on-python-support
diff --git a/t/tests/files-python-helpers/tags b/t/tests/files-python-helpers/tags
deleted file mode 100644
index 2cc55ed..0000000
--- a/t/tests/files-python-helpers/tags
+++ /dev/null
@@ -1 +0,0 @@
-E: python-foo: missing-dependency-on-python-support python-support (>= 0.90)
diff --git a/t/tests/files-python-modules/debian/debian/rules b/t/tests/files-python-modules/debian/debian/rules
index d769a32..abde6ef 100644
--- a/t/tests/files-python-modules/debian/debian/rules
+++ b/t/tests/files-python-modules/debian/debian/rules
@@ -3,5 +3,3 @@
%:
dh $@
-override_dh_pysupport:
-
diff --git a/t/tests/legacy-filenames/tags b/t/tests/legacy-filenames/tags
index 0a5e20c..dbb6c93 100644
--- a/t/tests/legacy-filenames/tags
+++ b/t/tests/legacy-filenames/tags
@@ -46,6 +46,7 @@ I: filenames: package-contains-empty-directory usr/lib/ma-dir/perl/version/.ditr
I: filenames: package-contains-empty-directory usr/lib/ma-dir/perl/version/.svn/
I: filenames: package-contains-empty-directory usr/lib/ma-dir/perl/version/CVS/
I: filenames: package-contains-empty-directory usr/lib/ma-dir/perl/version/{arch}/
+I: filenames: package-contains-empty-directory usr/share/python-support/filenames/
I: filenames: using-first-person-in-description line 1: I
I: more-filename-games: no-md5sums-control-file
W: filename-games: binary-without-manpage usr/bin/test-game
diff --git a/t/tests/shared-libs-la-files/debian/debian/control.in b/t/tests/shared-libs-la-files/debian/debian/control.in
deleted file mode 100644
index 1c93396..0000000
--- a/t/tests/shared-libs-la-files/debian/debian/control.in
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: {$source}
-Priority: extra
-Section: devel
-Maintainer: {$author}
-Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 9)
-
-Package: {$source}
-Architecture: all
-Depends: $\{misc:Depends\}, python-support (>= 0.90)
-Description: {$description}
- This is a test package designed to exercise some feature or tag of
- Lintian. It is part of the Lintian test suite and may do very odd
- things. It should not be installed like a regular package. It may
- be an empty package.
diff --git a/t/tests/shared-libs-la-files/tags b/t/tests/shared-libs-la-files/tags
index 27f0c79..65c14f8 100644
--- a/t/tests/shared-libs-la-files/tags
+++ b/t/tests/shared-libs-la-files/tags
@@ -1,3 +1,2 @@
-E: shared-libs-la-files: depends-on-obsolete-package depends: python-support (>= 0.90) => use dh_python2 instead
E: shared-libs-la-files: incorrect-libdir-in-la-file usr/lib/kde3/kio_locate.la /build/buildd/kio-locate-0.4.5+ds/debian/kio-locate/usr/lib/kde3 != /usr/lib/kde3
E: shared-libs-la-files: non-empty-dependency_libs-in-la-file usr/lib/dependency_libs.la
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: