[SCM] Debian package checker branch, master, updated. 2.5.12-64-g4c61312
The following commit has been merged in the master branch:
commit ced4c3d3d88d4e401ba2632a9ecbbfa388c79cfc
Author: Niels Thykier <niels@thykier.net>
Date: Fri May 3 16:40:43 2013 +0200
c/debhelper: Retire some tags for debhelper (<< 9~)
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/debhelper b/checks/debhelper
index 9672635..82c13a2 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -26,7 +26,7 @@ use autodie;
use Lintian::Data;
use Lintian::Relation;
use Lintian::Tags qw(tag);
-use Lintian::Util qw(is_ancestor_of slurp_entire_file strip strip);
+use Lintian::Util qw(is_ancestor_of slurp_entire_file strip);
# If compat is less than or equal to this, then a missing version
# for this level is only a pedantic issue.
@@ -45,14 +45,6 @@ my $dh_ver_deps = Lintian::Data->new ('debhelper/dh_commands-manual', qr/\|\|/o)
my $dh_addons = Lintian::Data->new ('debhelper/dh_addons', '=');
my $dh_addons_manual = Lintian::Data->new ('debhelper/dh_addons-manual', qr/\|\|/o);
-# The version at which debhelper commands were introduced. Packages that use
-# one of these commands must have a dependency on that version of debhelper or
-# newer.
-my %versions = (
- dh_installgsettings => '8.1.3~',
- dh_ucf => '8.1.5~',
-);
-
my $MISC_DEPENDS = Lintian::Relation->new ('${misc:Depends}');
sub run {
@@ -75,10 +67,8 @@ my %missingbdeps_addons;
my $maybe_skipping;
my $dhcompatvalue;
-my @versioncheck;
my $inclcdbs = 0;
-my $seenmaintscript = 0;
my $bdepends_noarch;
my $bdepends;
my $seen_dh = 0;
@@ -159,9 +149,6 @@ while (<$rules_fd>) {
my $dep = $dh_commands_depends->value($dhcommand);
$missingbdeps{$dep} = $dhcommand;
}
- if ($versions{$dhcommand}) {
- push (@versioncheck, $dhcommand);
- }
}
$seencommand = 1;
$needbuilddepends = 1;
@@ -334,8 +321,6 @@ for my $file (sort(readdir($dirfd))) {
if ($file ne 'debhelper') {
push(@indebfiles, $file);
}
- } elsif ($file =~ m/^(?:(.*)\.)?maintscript$/) {
- $seenmaintscript = 1;
} else {
my $base = $file;
$base =~ s/^.+\.//;
@@ -414,29 +399,6 @@ unless ($bdepends->implies("debhelper (>= $level~)")){
tag $tagname, $level;
}
-if (@versioncheck) {
- my %seen;
- @versioncheck = grep { !$seen{$_}++ } @versioncheck;
- for my $program (@versioncheck) {
- my $required = $versions{$program};
- my $needed = "debhelper (>= $required)";
- unless ($bdepends->implies($needed)) {
- tag 'debhelper-script-needs-versioned-build-depends',
- $program, "(>= $required)";
- }
- }
-}
-
-if ($seenmaintscript) {
- my $required = '8.1.0~';
- my $needed = "debhelper (>= $required)";
- unless ($bdepends->implies($needed)) {
- tag 'debhelper-maintscript-needs-versioned-build-depends',
- "(>= $required)";
- }
-}
-
-
if(scalar(@indebfiles)){
my $f = pop(@indebfiles);
my $others = scalar(@indebfiles);
diff --git a/checks/debhelper.desc b/checks/debhelper.desc
index 7e9205e..5a43acf 100644
--- a/checks/debhelper.desc
+++ b/checks/debhelper.desc
@@ -186,33 +186,6 @@ Info: The source package appears to be using a dh addon but doesn't build
depend on the package that actually provides it. If it uses it, it must
build depend on it.
-Tag: debhelper-script-needs-versioned-build-depends
-Severity: normal
-Certainty: certain
-Info: The given debhelper script was introduced in a later version of
- debhelper than the package Build-Depends on. The package Build-Depends
- should be updated to require that version of debhelper. Giving the
- version followed by <tt>~</tt> is recommended so that backports will
- satisfy the dependency.
- .
- etch was released with debhelper version 5.0.42, so every package that
- assumes a newer version should explicitly declare so for the sake of
- etch backports.
-
-Tag: debhelper-maintscript-needs-versioned-build-depends
-Severity: normal
-Certainty: certain
-Ref: dh(1)
-Info: The maintscript files used by this package was introduced in a later
- version of debhelper than the package Build-Depends on. The package's
- Build-Depends should be updated to require at least debhelper 8.1.0.
- Giving the version followed by <tt>~</tt> is recommended so that
- backports will satisfy the dependency.
- .
- squeeze was released with debhelper version 8.0.0, so every package that
- assumes a newer version should explicitly declare so for the sake of
- squeeze backports.
-
Tag: brace-expansion-in-debhelper-config-file
Severity: normal
Certainty: possible
diff --git a/debian/changelog b/debian/changelog
index e903cc7..ca0c32f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ lintian (2.5.13) UNRELEASED; urgency=low
+ Added:
- conffile-is-not-in-package
- debconf-translation-using-general-list
+ + Removed:
+ - debhelper-maintscript-needs-versioned-build-depends
+ - debhelper-script-needs-versioned-build-depends
* checks/*:
+ [NT] Use Lintian::Path objects as arguments to unpacked
@@ -31,6 +34,9 @@ lintian (2.5.13) UNRELEASED; urgency=low
(Closes: #706166)
+ [NT] Flag all absolute symlinks in source packages as
"unsafe". (Closes: #697164)
+ * checks/debhelper{,.desc}:
+ + [NT] Retire some tags that is no longer relevant in the
+ Jessie development cycle.
* checks/description:
+ [NT] Skip extended-description-is-probably-too-short
for -dbg packages. Thanks to Paul Wise for the suggestion.
diff --git a/t/tests/debhelper-dh-depends/debian/debian/compat b/t/tests/debhelper-dh-depends/debian/debian/compat
deleted file mode 100644
index 7ed6ff8..0000000
--- a/t/tests/debhelper-dh-depends/debian/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/t/tests/debhelper-dh-depends/debian/debian/control.in b/t/tests/debhelper-dh-depends/debian/debian/control.in
deleted file mode 100644
index 8b115a5..0000000
--- a/t/tests/debhelper-dh-depends/debian/debian/control.in
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: {$srcpkg}
-Priority: extra
-Section: {$section}
-Maintainer: {$author}
-Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 5)
-
-Package: {$srcpkg}
-Architecture: {$architecture}
-Depends: $\{shlibs: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/debhelper-dh-depends/debian/debian/rules b/t/tests/debhelper-dh-depends/debian/debian/rules
deleted file mode 100755
index 22dcfaa..0000000
--- a/t/tests/debhelper-dh-depends/debian/debian/rules
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/make -f
-
-build: build-arch build-indep
-build-arch:
-build-indep: build-stamp
-
-build-stamp:
- dh_testdir
- dh_auto_configure
- dh_auto_build
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- dh_auto_clean
- dh_clean
-
-install: install-stamp
-install-stamp: build-stamp
- dh_testdir
- dh_testroot
- dh_prep
- dh_auto_install
- touch $@
-
-binary: binary-arch binary-indep
-binary-arch:
-binary-indep: install-stamp
- dh binary-indep --until dh_prep
- dh_icons
- dh_installifupdown
- dh_lintian
- -dh_ucf
- dh binary-indep --remaining
-
-.PHONY: binary binary-arch binary-indep build clean install
diff --git a/t/tests/debhelper-dh-depends/desc b/t/tests/debhelper-dh-depends/desc
deleted file mode 100644
index 684ea00..0000000
--- a/t/tests/debhelper-dh-depends/desc
+++ /dev/null
@@ -1,5 +0,0 @@
-Testname: debhelper-dh-depends
-Sequence: 6000
-Version: 1.0
-Description: Test required dependencies for dh* scripts
-Test-For: debhelper-script-needs-versioned-build-depends
diff --git a/t/tests/debhelper-dh-depends/tags b/t/tests/debhelper-dh-depends/tags
deleted file mode 100644
index e581b98..0000000
--- a/t/tests/debhelper-dh-depends/tags
+++ /dev/null
@@ -1 +0,0 @@
-W: debhelper-dh-depends source: debhelper-script-needs-versioned-build-depends dh_ucf (>= 8.1.5~)
diff --git a/t/tests/debhelper-maintscripts-depends/debian/debian/compat b/t/tests/debhelper-maintscripts-depends/debian/debian/compat
deleted file mode 100644
index 7f8f011..0000000
--- a/t/tests/debhelper-maintscripts-depends/debian/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/t/tests/debhelper-maintscripts-depends/debian/debian/control.in b/t/tests/debhelper-maintscripts-depends/debian/debian/control.in
deleted file mode 100644
index 1100475..0000000
--- a/t/tests/debhelper-maintscripts-depends/debian/debian/control.in
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: {$srcpkg}
-Priority: extra
-Section: {$section}
-Maintainer: {$author}
-Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
-
-Package: debhelper-maint
-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/debhelper-maintscripts-depends/debian/debian/maintscript b/t/tests/debhelper-maintscripts-depends/debian/debian/maintscript
deleted file mode 100644
index f7c669d..0000000
--- a/t/tests/debhelper-maintscripts-depends/debian/debian/maintscript
+++ /dev/null
@@ -1 +0,0 @@
-rm_conffile 0.1 debhelper-maint
diff --git a/t/tests/debhelper-maintscripts-depends/desc b/t/tests/debhelper-maintscripts-depends/desc
deleted file mode 100644
index a2fe53f..0000000
--- a/t/tests/debhelper-maintscripts-depends/desc
+++ /dev/null
@@ -1,5 +0,0 @@
-Testname: debhelper-maintscripts-depends
-Sequence: 6000
-Version: 1.0
-Description: Test dependency requirements for debhelper maintscripts
-Test-For: debhelper-maintscript-needs-versioned-build-depends
diff --git a/t/tests/debhelper-maintscripts-depends/tags b/t/tests/debhelper-maintscripts-depends/tags
deleted file mode 100644
index e7efb36..0000000
--- a/t/tests/debhelper-maintscripts-depends/tags
+++ /dev/null
@@ -1 +0,0 @@
-W: debhelper-maintscripts-depends source: debhelper-maintscript-needs-versioned-build-depends (>= 8.1.0~)
--
Debian package checker
Reply to: