diff -Nru lintian-2.5.5/checks/binaries lintian-2.5.6/checks/binaries
--- lintian-2.5.5/checks/binaries 2012-02-21 09:30:09.000000000 +0000
+++ lintian-2.5.6/checks/binaries 2012-03-12 14:40:11.000000000 +0000
@@ -370,7 +370,7 @@
}
# PHP extension?
- if ($file =~ m,^usr/lib/php\d/.*\.so$,) {
+ if ($file =~ m,^usr/lib/php\d/.*\.so(?:\.\d+)*$,) {
$has_php_ext = 1;
}
diff -Nru lintian-2.5.5/checks/changelog-file lintian-2.5.6/checks/changelog-file
--- lintian-2.5.5/checks/changelog-file 2012-02-21 09:30:09.000000000 +0000
+++ lintian-2.5.6/checks/changelog-file 2012-03-12 14:40:11.000000000 +0000
@@ -217,7 +217,7 @@
}
}
if (not $found) {
- tag 'no-upstream-changelog';
+ tag 'no-upstream-changelog' unless $info->is_transitional;
}
}
diff -Nru lintian-2.5.5/checks/cruft lintian-2.5.6/checks/cruft
--- lintian-2.5.5/checks/cruft 2012-02-21 09:30:09.000000000 +0000
+++ lintian-2.5.6/checks/cruft 2012-03-12 14:40:11.000000000 +0000
@@ -175,7 +175,7 @@
}
close $fd;
}
- tag 'source-contains-waf-binary', $file;
+ tag 'source-contains-waf-binary', $file unless $ok;
}
}
diff -Nru lintian-2.5.5/checks/debhelper lintian-2.5.6/checks/debhelper
--- lintian-2.5.5/checks/debhelper 2012-02-21 09:30:09.000000000 +0000
+++ lintian-2.5.6/checks/debhelper 2012-03-12 14:40:11.000000000 +0000
@@ -296,7 +296,7 @@
opendir(DEBIAN, $droot)
or fail("Can't open debfiles directory.");
foreach my $file (sort readdir(DEBIAN)) {
- next if $file eq 'rules';
+ next if $file eq 'rules' or not -f "$droot/$file";
if ($file =~ m/^(?:(.*)\.)?(?:post|pre)(?:inst|rm)$/) {
next unless $needtomodifyscripts;
@@ -344,7 +344,7 @@
# debhelper only use executable files in compat 9
_tag_if_executable ($file, "$droot/$file");
} else {
- if (-x "$droot/$file") {
+ if ( -x "$droot/$file") {
my $cmd = _shebang_cmd ("debian/$file", "$droot/$file");
unless ( $cmd ) {
tag 'executable-debhelper-file-without-being-executable', "debian/$file";
diff -Nru lintian-2.5.5/checks/files lintian-2.5.6/checks/files
--- lintian-2.5.5/checks/files 2012-02-21 09:30:09.000000000 +0000
+++ lintian-2.5.6/checks/files 2012-03-12 17:15:34.000000000 +0000
@@ -403,7 +403,7 @@
# executable in /usr/share/doc ?
if ($index_info->{type} =~ m/^[-h]/ and
$file !~ m,^usr/share/doc/(?:[^/]+/)?examples/, and
- ($operm & 01 or $operm & 010 or $operm & 0100)) {
+ ($operm & 0111)) {
if ($script{$file}) {
tag 'script-in-usr-share-doc', $file;
} else {
@@ -537,8 +537,7 @@
if ($index_info->{type} =~ m/^d/) {
tag 'stray-directory-in-manpage-directory', $file
if ($file !~ m,^usr/(?:X11R6|share)/man/(?:[^/]+/)?(?:man\d/)?$,);
- } elsif ($index_info->{type} =~ m,^[-h], and
- ($operm & 01 or $operm & 010 or $operm & 0100)) {
+ } elsif ($index_info->{type} =~ m,^[-h], and ($operm & 0111)) {
tag 'executable-manpage', $file;
}
}
@@ -1091,7 +1090,7 @@
}
# ---------------- general: setuid/setgid files!
- if ($operm & 04000 or $operm & 02000) {
+ if ($operm & 06000) {
my ($setuid, $setgid) = ('','');
# get more info:
$setuid = $index_info->{owner} if ($operm & 04000);
@@ -1137,7 +1136,7 @@
}
}
# ---------------- general: executable files
- elsif ($operm & 01 or $operm & 010 or $operm & 0100) {
+ elsif ($operm & 0111) {
# executable
if ($owner eq 'root/games') {
if ($operm != 2755) {
diff -Nru lintian-2.5.5/checks/files.desc lintian-2.5.6/checks/files.desc
--- lintian-2.5.5/checks/files.desc 2011-12-07 14:24:43.000000000 +0000
+++ lintian-2.5.6/checks/files.desc 2012-03-13 21:44:36.000000000 +0000
@@ -1270,7 +1270,7 @@
Severity: serious
Certainty: certain
Info: The package ships a library in one of the multiarch lib directories,
- /lib/<triplet>: and /usr/lib/<triplet>, but does not declare a
+ /lib/<triplet> and /usr/lib/<triplet>, but does not declare a
pre-dependency on multiarch-support. Packages installing to these
paths must Pre-Depend: multiarch-support to ensure the library can be
found by the dynamic linker at every point during an upgrade.
diff -Nru lintian-2.5.5/checks/menu-format lintian-2.5.6/checks/menu-format
--- lintian-2.5.5/checks/menu-format 2012-02-07 21:37:19.000000000 +0000
+++ lintian-2.5.6/checks/menu-format 2012-03-12 14:40:11.000000000 +0000
@@ -406,7 +406,7 @@
if ($index_info->{type} =~ m/[-h]/ &&
$file =~ m,^usr/share/applications/.*\.desktop$,) {
- if ($operm & 0100 or $operm & 010 or $operm & 01) {
+ if ($operm & 0111) {
tag 'executable-desktop-file', sprintf('%s %04o',$file,$operm);
}
unless ($file =~ m,template,o) {
diff -Nru lintian-2.5.5/checks/menus lintian-2.5.6/checks/menus
--- lintian-2.5.5/checks/menus 2012-02-21 09:30:10.000000000 +0000
+++ lintian-2.5.6/checks/menus 2012-03-12 14:40:11.000000000 +0000
@@ -96,7 +96,7 @@
if ($index_info->{type} =~ m,^[-h],) { # file checks
# menu file?
if ($file =~ m,^usr/(lib|share)/menu/\S,o) { # correct permissions?
- if ($operm & 01 or $operm & 010 or $operm & 0100) {
+ if ($operm & 0111) {
tag 'executable-menu-file', sprintf("%s %04o",$file,$operm);
}
@@ -114,7 +114,7 @@
}
# doc-base file?
elsif ($file =~ m,^usr/share/doc-base/\S,o) { # correct permissions?
- if ($operm & 01 or $operm & 010 or $operm & 0100) {
+ if ($operm & 0111) {
tag 'executable-in-usr-share-docbase', $file, sprintf("%04o",$operm);
}
$docbase_file = $file;
diff -Nru lintian-2.5.5/checks/scripts lintian-2.5.6/checks/scripts
--- lintian-2.5.5/checks/scripts 2012-02-21 09:30:10.000000000 +0000
+++ lintian-2.5.6/checks/scripts 2012-03-12 14:40:11.000000000 +0000
@@ -29,92 +29,30 @@
use Util;
use Lintian::Check qw($known_shells_regex);
+use Lintian::Data;
use Lintian::Relation;
use Lintian::Tags qw(tag);
-# This is a map of all known interpreters. The key is the interpreter name
-# (the binary invoked on the #! line). The value is an anonymous array of one
-# or two elements. The first, mandatory argument is the path on a Debian
-# system where that interpreter would be installed. The second, optional
-# argument is the dependency that provides that interpreter. If the second
-# argument isn't given, the package name is assumed to be the same as the
-# interpreter name. (Saves some typing.)
+sub _parse_interpreters {
+ my ($interpreter, $value) = @_;
+ my ($path, $dep) = split m/\s*,\s*/, $value, 2;
+ $dep = $interpreter if not $dep;
+ $dep = '' if $dep eq '@NODEPS@';
+ return [$path, $dep];
+}
+
+# This is a map of all known interpreters. The key is the interpreter
+# name (the binary invoked on the #! line). The value is an anonymous
+# array of two elements. The first argument is the path on a Debian
+# system where that interpreter would be installed. The second
+# argument is the dependency that provides that interpreter.
#
-# Some interpreters list empty dependencies (as opposed to undefined ones).
-# Those interpreters should not have any dependency for one reason or another
-# (usually because they're essential packages or aren't used in a normal way).
+# $INTERPRETERS maps names of (unversioned) interpreters to the path
+# they are installed and what package to depend on to use them.
#
-# Do not list versioned patterns here (such as pythonX.Y, rubyX.Y, etc.). For
-# those, see %versioned_interpreters below.
-my %interpreters =
- (ash => [ '/bin' ],
- awk => [ '/usr/bin', '' ],
- bash => [ '/bin', '' ],
- bltwish => [ '/usr/bin', 'blt' ],
- clisp => [ '/usr/bin' ],
- csh => [ '/bin', 'tcsh | csh | c-shell' ],
- dash => [ '/bin', '' ],
- escript => [ '/usr/bin', 'erlang-base | erlang-base-hipe' ],
- expect => [ '/usr/bin' ],
- expectk => [ '/usr/bin' ],
- fish => [ '/usr/bin' ],
- fontforge => [ '/usr/bin' ],
- gawk => [ '/usr/bin' ],
- gbr2 => [ '/usr/bin', 'gambas2-runtime' ],
- gbx => [ '/usr/bin', 'gambas-runtime' ],
- gbx2 => [ '/usr/bin', 'gambas2-runtime' ],
- gforth => [ '/usr/bin' ],
- gnuplot => [ '/usr/bin' ],
- gosh => [ '/usr/bin', 'gauche' ],
- icmake => [ '/usr/bin', 'icmake' ],
- 'install-menu' => [ '/usr/bin', '' ],
- ir => [ '/usr/bin', 'ironruby' ],
- jed => [ '/usr/bin' ],
- 'jed-script' => [ '/usr/bin', 'jed | xjed' ],
- kaptain => [ '/usr/bin' ],
- ksh => [ '/bin', 'ksh | mksh | pdksh | zsh' ],
- lefty => [ '/usr/bin', 'graphviz' ],
- liquidsoap => [ '/usr/bin' ],
- magicfilter => [ '/usr/sbin' ],
- make => [ '/usr/bin', 'make | build-essential | dpkg-dev' ],
- mawk => [ '/usr/bin' ],
- mksh => [ '/bin' ],
- mscgen => [ '/usr/bin' ],
- nickle => [ '/usr/bin' ],
- ocamlrun => [ '/usr/bin',
- 'ocaml-base-nox | ocaml-base | ocaml-nox | ocaml' ],
- pagsh => [ '/usr/bin', 'openafs-client | heimdal-clients' ],
- parrot => [ '/usr/bin' ],
- perl => [ '/usr/bin', '' ],
- perl6 => [ '/usr/bin', 'rakudo' ],
- procmail => [ '/usr/bin' ],
- python => [ '/usr/bin', 'python | python-minimal' ],
- pforth => [ '/usr/bin' ],
- racket => [ '/usr/bin' ],
- r => [ '/usr/bin', 'littler' ],
- rc => [ '/usr/bin' ],
- regina => [ '/usr/bin', 'regina-rexx' ],
- rep => [ '/usr/bin' ],
- rexx => [ '/usr/bin', 'regina-rexx' ],
- rrdcgi => [ '/usr/bin', 'rrdtool' ],
- ruby => [ '/usr/bin', 'ruby | ruby-interpreter' ],
- runhaskell => [ '/usr/bin', 'ghc | ghc6' ],
- runhugs => [ '/usr/bin', 'hugs | hugs98' ],
- sed => [ '/bin', '' ],
- seed => [ '/usr/bin' ],
- sh => [ '/bin', '' ],
- slsh => [ '/usr/bin' ],
- speedy => [ '/usr/bin', 'speedy-cgi-perl' ],
- swipl => [ '/usr/bin', 'swi-prolog | swi-prolog-nox' ],
- tcsh => [ '/usr/bin' ],
- texlua => [ '/usr/bin', 'luatex' ],
- tixwish => [ '/usr/bin', 'tix' ],
- trs => [ '/usr/bin', 'konwert' ],
- xjed => [ '/usr/bin', 'xjed' ],
- yforth => [ '/usr/bin', 'yforth' ],
- yorick => [ '/usr/bin' ],
- zsh => [ '/bin', 'zsh | zsh-beta' ],
- );
+my $INTERPRETERS = Lintian::Data->new ('scripts/interpreters', qr/\s*=\>\s*/o,
+ \&_parse_interpreters);
+
# The more complex case of interpreters that may have a version number.
#
@@ -318,8 +256,7 @@
next if $_ eq '';
my $index_info = $info->index->{$_};
my $operm = $index_info->{operm};
- next unless ($index_info->{type} =~ m,^[-h], and ($operm & 01 or
- $operm & 010 or $operm & 0100));
+ next unless $index_info->{type} =~ m,^[-h], and ($operm & 0111);
my $is_suid = $operm & 04000;
$executable{$_} = 1;
}
@@ -422,10 +359,10 @@
}
# Try to find the expected path of the script to check. First check
- # %interpreters and %versioned_interpreters. If not found there, see if
+ # $INTERPRETERS and %versioned_interpreters. If not found there, see if
# it ends in a version number and the base is found in
# %versioned_interpreters.
- my $data = $interpreters{$base};
+ my $data = $INTERPRETERS->value ($base);
my $versioned = 0;
if (not defined $data) {
$data = $versioned_interpreters{$base};
@@ -565,7 +502,7 @@
if ($interpreter =~ m|/usr/local/|) {
tag 'control-interpreter-in-usr-local', "control/$file", "#!$interpreter";
} elsif ($base eq 'sh' or $base eq 'bash' or $base eq 'perl') {
- my $expected = $interpreters{$base}->[0] . '/' . $base;
+ my $expected = ($INTERPRETERS->value ($base))->[0] . '/' . $base;
tag 'wrong-path-for-interpreter', "#!$interpreter != $expected",
"(control/$file)"
unless ($interpreter eq $expected);
@@ -573,8 +510,8 @@
tag 'forbidden-config-interpreter', "#!$interpreter";
} elsif ($file eq 'postrm') {
tag 'forbidden-postrm-interpreter', "#!$interpreter";
- } elsif (exists $interpreters{$base}) {
- my $data = $interpreters{$base};
+ } elsif ($INTERPRETERS->known ($base)) {
+ my $data = $INTERPRETERS->value ($base);
my $expected = $data->[0] . '/' . $base;
unless ($interpreter eq $expected) {
tag 'wrong-path-for-interpreter', "#!$interpreter != $expected",
diff -Nru lintian-2.5.5/checks/shared-libs lintian-2.5.6/checks/shared-libs
--- lintian-2.5.5/checks/shared-libs 2012-02-21 09:30:10.000000000 +0000
+++ lintian-2.5.6/checks/shared-libs 2012-03-12 14:40:11.000000000 +0000
@@ -119,7 +119,7 @@
if ($cur_file eq $real_file) {
# executable?
my $perms = sprintf('%04o', $real_perm);
- if ($real_perm & 0100 or $real_perm & 010 or $real_perm & 01) {
+ if ($real_perm & 0111) {
# Yes. But if the library has an INTERP section, it's
# designed to do something useful when executed, so don't
# report an error. Also give ld.so a pass, since it's
diff -Nru lintian-2.5.5/checks/source-copyright.desc lintian-2.5.6/checks/source-copyright.desc
--- lintian-2.5.5/checks/source-copyright.desc 2012-02-21 09:41:02.000000000 +0000
+++ lintian-2.5.6/checks/source-copyright.desc 2012-03-12 14:40:11.000000000 +0000
@@ -42,27 +42,27 @@
Tag: wiki-copyright-format-uri
Severity: pedantic
Certainty: possible
-Ref: http://dep.debian.net/deps/dep5/
+Ref: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Info: Format URI of the machine-readable copyright file refers to Debian Wiki.
.
Debian Wiki is not used for the format development anymore. Please use
- http://www.debian.org/doc/packaging-manuals/copyright-format/version
+ http://www.debian.org/doc/packaging-manuals/copyright-format/version/
as the format URI instead.
Tag: unversioned-copyright-format-uri
Severity: pedantic
Certainty: possible
-Ref: http://dep.debian.net/deps/dep5/
+Ref: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Info: Format URI of the machine-readable copyright file is not versioned.
.
Please use
- http://www.debian.org/doc/packaging-manuals/copyright-format/version
+ http://www.debian.org/doc/packaging-manuals/copyright-format/version/
as the format URI instead.
Tag: out-of-date-copyright-format-uri
Severity: pedantic
Certainty: possible
-Ref: http://dep.debian.net/deps/dep5/
+Ref: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Info: A newer version of the machine-readable copyright file specification,
than the one referenced by the copyright file, is available.
.
@@ -71,14 +71,14 @@
Tag: syntax-error-in-dep5-copyright
Severity: normal
Certainty: possible
-Ref: http://dep.debian.net/deps/dep5/
+Ref: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Info: The machine-readable copyright file didn't pass Debian control file
syntax check.
Tag: obsolete-field-in-dep5-copyright
Severity: normal
Certainty: possible
-Ref: http://dep.debian.net/deps/dep5/
+Ref: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Info: The machine-readable copyright file uses a field, that used to be defined
by the specification, but has been renamed since then.
.
@@ -91,7 +91,7 @@
Tag: comma-separated-files-in-dep5-copyright
Severity: normal
Certainty: possible
-Ref: http://dep.debian.net/deps/dep5/
+Ref: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Info: A list of files in the machine-readable copyright format appears to be
separated by commas. The file list should be whitespace separated instead.
.
@@ -100,28 +100,28 @@
Tag: missing-field-in-dep5-copyright
Severity: normal
Certainty: possible
-Ref: http://dep.debian.net/deps/dep5/
+Ref: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Info: The paragraph in the machine readable copyright file is missing a field
that is required by the specification.
Tag: missing-license-paragraph-in-dep5-copyright
Severity: normal
Certainty: possible
-Ref: http://dep.debian.net/deps/dep5/
+Ref: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Info: The files paragraph in the machine readable copyright file references a
license, for which no standalone license paragraph exists.
Tag: missing-license-text-in-dep5-copyright
Severity: normal
Certainty: possible
-Ref: http://dep.debian.net/deps/dep5/
+Ref: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Info: The standalone license header contains only short license name, but not
the license text.
Tag: unused-license-paragraph-in-dep5-copyright
Severity: minor
Certainty: possible
-Ref: http://dep.debian.net/deps/dep5/
+Ref: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Info: The license paragraph in the machine-readable copyright file is not
referenced by any files paragraph. It could be a typo in the license name or
the license paragraph is simply not needed and can be removed.
@@ -129,6 +129,6 @@
Tag: unknown-paragraph-in-dep5-copyright
Severity: normal
Certainty: possible
-Ref: http://dep.debian.net/deps/dep5/
+Ref: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Info: The machine-readable copyright file contains a paragraph that is neither
a standalone license paragraph nor a files paragraph.
diff -Nru lintian-2.5.5/collection/ar-info lintian-2.5.6/collection/ar-info
--- lintian-2.5.5/collection/ar-info 2012-02-21 09:30:10.000000000 +0000
+++ lintian-2.5.6/collection/ar-info 2012-03-12 14:40:11.000000000 +0000
@@ -27,19 +27,20 @@
use Lintian::Command qw(spawn);
use Util qw(fail);
-($#ARGV == 1) or fail('syntax: ar-info ');
-my $pkg = shift;
-my $type = shift;
+($#ARGV == 2) or fail 'syntax: ar-info ';
+my ($pkg, $type, $dir) = @ARGV;
-unlink('ar-info');
+if ( -e "$dir/ar-info" ) {
+ unlink "$dir/ar-info" or fail "unlink ar-info: $!";
+}
# Open before chdir, as unpacked may be a symlink
-open(INDEX, '<', 'index')
+open INDEX, '<', "$dir/index"
or fail("cannot open index file: $!");
-open(OUT, '>', 'ar-info')
+open OUT, '>', "$dir/ar-info"
or fail("cannot open ar-info file: $!");
-chdir('unpacked')
+chdir ("$dir/unpacked")
or fail("cannot chdir to unpacked directory: $!");
while () {
diff -Nru lintian-2.5.5/collection/bin-pkg-control lintian-2.5.6/collection/bin-pkg-control
--- lintian-2.5.5/collection/bin-pkg-control 2011-12-07 14:24:44.000000000 +0000
+++ lintian-2.5.6/collection/bin-pkg-control 2012-03-12 14:40:11.000000000 +0000
@@ -26,49 +26,48 @@
use Util;
use Lintian::Command qw(spawn reap);
-($#ARGV == 1) or fail('syntax: bin-pkg-control ');
-my $pkg = shift;
-my $type = shift;
+($#ARGV == 2) or fail 'syntax: bin-pkg-control ';
+my ($pkg, $type, $dir) = @ARGV;
my (@jobs, $job);
-if (-e 'control'){
- delete_dir('control') or fail('Cannot remove old control dir');
+if ( -e "$dir/control"){
+ delete_dir ("$dir/control") or fail 'Cannot remove old control dir';
}
-mkdir('control', 0777) or fail("mkdir control: $!");
+mkdir ("$dir/control", 0777) or fail "mkdir control: $!";
# The following calls use knowledge of the .deb format for speed
# (replaces dpkg-deb -e)
# extract control files' tarball
-spawn({ fail => 'error', out => 'control.tar' },
- ['ar', 'p', 'deb', 'control.tar.gz'],
+spawn ({ fail => 'error', out => "$dir/control.tar" },
+ ['ar', 'p', "$dir/deb", 'control.tar.gz'],
'|', ['gzip', '-dc']);
-$job = { fail => 'error', err => 'control-errors' };
+$job = { fail => 'error', err => "$dir/control-errors" };
push @jobs, $job;
# extract the tarball's contents
spawn($job,
- ['tar', 'xf', 'control.tar', '-C', 'control', '&']);
+ ['tar', 'xf', "$dir/control.tar", '-C', "$dir/control", '&']);
$job = { fail => 'error',
- out => 'control-index',
- err => 'control-index-errors' };
+ out => "$dir/control-index",
+ err => "$dir/control-index-errors" };
push @jobs, $job;
# create index of control.tar.gz
spawn($job,
- ['tar', 'tvf', 'control.tar'],
+ ['tar', 'tvf', "$dir/control.tar"],
'|', ['sort', '-k', '6'], '&');
reap(@jobs);
undef @jobs;
# clean up control.tar
-unlink('control.tar') or fail();
+unlink "$dir/control.tar" or fail "unlink control.tar: $!";
# fix permissions
spawn({ fail => 'error' },
- ['chmod', '-R', 'u+rX,o-w', 'control']);
+ ['chmod', '-R', 'u+rX,o-w', "$dir/control"]);
exit 0;
diff -Nru lintian-2.5.5/collection/changelog-file lintian-2.5.6/collection/changelog-file
--- lintian-2.5.5/collection/changelog-file 2011-12-07 14:24:44.000000000 +0000
+++ lintian-2.5.6/collection/changelog-file 2012-03-12 14:40:11.000000000 +0000
@@ -25,26 +25,25 @@
use lib "$ENV{'LINTIAN_ROOT'}/lib";
use Util;
-($#ARGV == 1) or fail('syntax: changelog-file ');
-my $pkg = shift;
-my $type = shift;
+($#ARGV == 2) or fail('syntax: changelog-file ');
+my ($pkg, $type, $dir) = @ARGV;
-unlink('changelog') or fail("cannot remove changelog file: $!")
- if ( -e 'changelog' or -l 'changelog');
+unlink "$dir/changelog" or fail "cannot remove changelog file: $!"
+ if -e "$dir/changelog" or -l "$dir/changelog";
# Pick the first of these files that exists.
-my @changelogs = ("unpacked/usr/share/doc/$pkg/changelog.Debian.gz",
- "unpacked/usr/share/doc/$pkg/changelog.Debian",
- "unpacked/usr/share/doc/$pkg/changelog.debian.gz",
- "unpacked/usr/share/doc/$pkg/changelog.debian",
- "unpacked/usr/share/doc/$pkg/changelog.gz",
- "unpacked/usr/share/doc/$pkg/changelog",
- "unpacked/usr/doc/$pkg/changelog.Debian.gz",
- "unpacked/usr/doc/$pkg/changelog.Debian",
- "unpacked/usr/doc/$pkg/changelog.debian.gz",
- "unpacked/usr/doc/$pkg/changelog.debian",
- "unpacked/usr/doc/$pkg/changelog.gz",
- "unpacked/usr/doc/$pkg/changelog");
+my @changelogs = ("$dir/unpacked/usr/share/doc/$pkg/changelog.Debian.gz",
+ "$dir/unpacked/usr/share/doc/$pkg/changelog.Debian",
+ "$dir/unpacked/usr/share/doc/$pkg/changelog.debian.gz",
+ "$dir/unpacked/usr/share/doc/$pkg/changelog.debian",
+ "$dir/unpacked/usr/share/doc/$pkg/changelog.gz",
+ "$dir/unpacked/usr/share/doc/$pkg/changelog",
+ "$dir/unpacked/usr/doc/$pkg/changelog.Debian.gz",
+ "$dir/unpacked/usr/doc/$pkg/changelog.Debian",
+ "$dir/unpacked/usr/doc/$pkg/changelog.debian.gz",
+ "$dir/unpacked/usr/doc/$pkg/changelog.debian",
+ "$dir/unpacked/usr/doc/$pkg/changelog.gz",
+ "$dir/unpacked/usr/doc/$pkg/changelog");
my $chl;
@@ -63,7 +62,7 @@
if (defined ($chl) && -l $chl) {
my $link = readlink $chl or fail("cannot readlink $chl: $!");
if ($link =~ /\.\./ || ($link =~ m%/% && $link !~ m%^[^/]+(?:/+[^/]+)*\z%)) {
- symlink('file-is-in-another-package', 'changelog')
+ symlink ("$dir/file-is-in-another-package", "$dir/changelog")
or fail("cannot create changelog symlink: $!");
undef $chl;
} elsif (! -f $chl) {
@@ -78,16 +77,16 @@
if (not defined $chl) {
# no changelog found
} elsif ($chl =~ /\.gz$/) {
- gunzip_file($chl, 'changelog');
+ gunzip_file ($chl, "$dir/changelog");
} elsif (-f $chl && -l $chl) {
local $_;
open (CHL, '<', $chl) or fail("cannot open $chl: $!");
- open (COPY, '>', 'changelog') or fail("cannot create changelog: $!");
+ open (COPY, '>', "$dir/changelog") or fail "cannot create changelog: $!";
print COPY while ;
close CHL;
close (COPY) or fail("cannot write changelog: $!");
} else {
- link($chl, 'changelog')
+ link ($chl, "$dir/changelog")
or fail("cannot link $chl to changelog: $!");
}
@@ -95,7 +94,7 @@
# Either this is a native package OR a non-native package where the
# debian changelog is missing. checks/changelog is not too happy
# with the latter case, so check looks like a Debian changelog.
- open my $fd, '<', 'changelog' or fail "Opening changelog: $!";
+ open my $fd, '<', "$dir/changelog" or fail "Opening changelog: $!";
my $ok = 0;
while ( my $line = <$fd> ) {
next if $line =~ m/^\s*+$/o;
@@ -108,14 +107,14 @@
}
close $fd;
# Remove it if it not the Debian changelog.
- unlink 'changelog' unless $ok;
+ unlink "$dir/changelog" unless $ok;
}
# Extract NEWS.Debian files as well, with similar precautious. Ignore any
# symlinks to other packages here; in that case, we just won't check the file.
-unlink('NEWS.Debian') or fail("cannot unlink NEWS.Debian: $!")
- if (-e 'NEWS.Debian' or -l 'NEWS.Debian');
-my $news = "unpacked/usr/share/doc/$pkg/NEWS.Debian.gz";
+unlink "$dir/NEWS.Debian" or fail "cannot unlink NEWS.Debian: $!"
+ if -e "$dir/NEWS.Debian" or -l "$dir/NEWS.Debian";
+my $news = "$dir/unpacked/usr/share/doc/$pkg/NEWS.Debian.gz";
if (-f $news) {
if (-l $news) {
my $link = readlink $news or fail("cannot readlink $chl: $!");
@@ -126,7 +125,7 @@
}
}
if ($news) {
- gunzip_file($news, 'NEWS.Debian');
+ gunzip_file ($news, "$dir/NEWS.Debian");
}
}
diff -Nru lintian-2.5.5/collection/copyright-file lintian-2.5.6/collection/copyright-file
--- lintian-2.5.5/collection/copyright-file 2011-12-07 14:24:44.000000000 +0000
+++ lintian-2.5.6/collection/copyright-file 2012-03-12 14:40:11.000000000 +0000
@@ -27,14 +27,15 @@
use File::Copy qw(copy);
-($#ARGV == 1) or fail('syntax: copyright-file ');
-my $pkg = shift;
-my $type = shift;
+($#ARGV == 2) or fail 'syntax: copyright-file ';
+my ($pkg, $type, $dir) = @ARGV;
-unlink('copyright');
+if ( -e "$dir/copyright" ) {
+ unlink "$dir/copyright" or fail "unlink copyright: $!";
+}
-my $file1 = "unpacked/usr/share/doc/$pkg/copyright";
-my $file2 = "unpacked/usr/doc/$pkg/copyright";
+my $file1 = "$dir/unpacked/usr/share/doc/$pkg/copyright";
+my $file2 = "$dir/unpacked/usr/doc/$pkg/copyright";
my $file;
if (-f $file1 ) { $file = $file1; }
@@ -46,18 +47,18 @@
if (-l $file) {
my $link = readlink($file) or fail("cannot readlink $file: $!");
if ($link =~ /\.\./ || ($link =~ m%/% && $link !~ m%^[^/]+(?:/+[^/]+)*\z%)) {
- touch_file('copyright');
+ touch_file "$dir/copyright";
} else {
- copy($file, 'copyright') or fail("cannot copy $file: $!");
+ copy ($file, "$dir/copyright") or fail "cannot copy $file: $!";
}
} elsif (-f $file) {
- link($file, 'copyright')
+ link ($file, "$dir/copyright")
or fail("cannot link $file to copyright: $!");
} elsif (-f "$file.gz") {
- gunzip_file($file, 'copyright');
+ gunzip_file ($file, "$dir/copyright");
} else {
# no copyright file found
- touch_file('copyright');
+ touch_file ("$dir/copyright");
}
# Local Variables:
diff -Nru lintian-2.5.5/collection/debfiles lintian-2.5.6/collection/debfiles
--- lintian-2.5.5/collection/debfiles 2011-12-07 14:24:44.000000000 +0000
+++ lintian-2.5.6/collection/debfiles 2012-03-12 14:40:11.000000000 +0000
@@ -26,21 +26,20 @@
use lib "$ENV{'LINTIAN_ROOT'}/lib";
use Util;
-($#ARGV == 1) or fail('syntax: debfiles ');
-my $pkg = shift;
-my $type = shift;
+($#ARGV == 2) or fail 'syntax: debfiles ';
+my ($pkg, $type, $dir) = @ARGV;
--e 'unpacked' or fail('debfiles invoked in wrong directory');
+-e "$dir/unpacked" or fail 'debfiles invoked with wrong dir argument';
-if (-e 'debfiles') {
- delete_dir('debfiles')
+if ( -e "$dir/debfiles") {
+ delete_dir ("$dir/debfiles")
or fail('cannot rm old debfiles directory');
}
-if ( -l 'unpacked/debian' ) {
+if ( -l "$dir/unpacked/debian" ) {
require Cwd;
- my $target = Cwd::abs_path ('unpacked/debian');
- my $ud = Cwd::abs_path ('unpacked');
+ my $target = Cwd::abs_path ("$dir/unpacked/debian");
+ my $ud = "$dir/unpacked";
fail ("cannot resolve debian directory symlink in $pkg: $!") unless $target;
fail ("cannot resolve unpacked dir for $pkg: $!") unless $ud;
# We need the the trailing slash on $ud to ensure $target is a subdir of $ud. However
@@ -50,7 +49,7 @@
}
# Copy the whole debian directory
-copy_dir('unpacked/debian/', 'debfiles')
+copy_dir ("$dir/unpacked/debian/", "$dir/debfiles")
or fail("cannot copy unpacked/debian to debfiles: $!");
# Local Variables:
diff -Nru lintian-2.5.5/collection/debian-readme lintian-2.5.6/collection/debian-readme
--- lintian-2.5.5/collection/debian-readme 2011-12-07 14:24:44.000000000 +0000
+++ lintian-2.5.6/collection/debian-readme 2012-03-12 14:40:11.000000000 +0000
@@ -25,23 +25,22 @@
use lib "$ENV{'LINTIAN_ROOT'}/lib";
use Util;
-($#ARGV == 1) or fail('syntax: debian-readme ');
-my $pkg = shift;
-my $type = shift;
+($#ARGV == 2) or fail 'syntax: debian-readme ';
+my ($pkg, $type, $dir) = @ARGV;
-if (-f 'README.Debian') {
- unlink('README.Debian') or fail("Could not remove old README.Debian: $!");
+if ( -f "$dir/README.Debian") {
+ unlink "$dir/README.Debian" or fail "Could not remove old README.Debian: $!";
}
# Pick the first of these files that exists.
-my @readmes = ("unpacked/usr/share/doc/$pkg/README.Debian.gz",
- "unpacked/usr/share/doc/$pkg/README.Debian",
- "unpacked/usr/share/doc/$pkg/README.debian.gz",
- "unpacked/usr/share/doc/$pkg/README.debian",
- "unpacked/usr/doc/$pkg/README.Debian.gz",
- "unpacked/usr/doc/$pkg/README.Debian",
- "unpacked/usr/doc/$pkg/README.debian.gz",
- "unpacked/usr/doc/$pkg/README.debian");
+my @readmes = ("$dir/unpacked/usr/share/doc/$pkg/README.Debian.gz",
+ "$dir/unpacked/usr/share/doc/$pkg/README.Debian",
+ "$dir/unpacked/usr/share/doc/$pkg/README.debian.gz",
+ "$dir/unpacked/usr/share/doc/$pkg/README.debian",
+ "$dir/unpacked/usr/doc/$pkg/README.Debian.gz",
+ "$dir/unpacked/usr/doc/$pkg/README.Debian",
+ "$dir/unpacked/usr/doc/$pkg/README.debian.gz",
+ "$dir/unpacked/usr/doc/$pkg/README.debian");
my $file;
for (@readmes) {
@@ -53,11 +52,11 @@
if (not defined $file) {
# no README found
- touch_file('README.Debian');
+ touch_file ("$dir/README.Debian");
} elsif ($file =~ m/\.gz$/) {
- gunzip_file($file, 'README.Debian');
+ gunzip_file ($file, "$dir/README.Debian");
} else {
- link($file, 'README.Debian')
+ link ($file, "$dir/README.Debian")
or fail("cannot link $file to README.Debian: $!");
}
diff -Nru lintian-2.5.5/collection/diffstat lintian-2.5.6/collection/diffstat
--- lintian-2.5.5/collection/diffstat 2011-12-07 14:24:44.000000000 +0000
+++ lintian-2.5.6/collection/diffstat 2012-03-12 14:40:11.000000000 +0000
@@ -31,31 +31,31 @@
use lib "$ENV{'LINTIAN_ROOT'}/lib";
use Util;
-($#ARGV == 1) or fail('syntax: diffstat ');
-my $pkg = shift;
+($#ARGV == 2) or fail 'syntax: diffstat ';
+my ($pkg, undef, $dir) = @ARGV;
my $data;
my $ver;
--f 'dsc' or fail('diffstat invoked in wrong directory');
+-f "$dir/dsc" or fail 'diffstat invoked with wrong dir argument';
-$data = get_dsc_info('dsc');
+$data = get_dsc_info ("$dir/dsc");
$ver = $data->{'version'};
-unlink('debian-patch') or fail("cannot unlink debian-patch: $!")
- if( -e 'debian-patch' or -l 'debian-patch');
+unlink "$dir/debian-patch" or fail "cannot unlink debian-patch: $!"
+ if -e "$dir/debian-patch" or -l "$dir/debian-patch";
$ver =~ s/^\d://; #Remove epoch for this
-my $diff_file = "${pkg}_${ver}.diff.gz";
+my $diff_file = "$dir/${pkg}_${ver}.diff.gz";
exit 0 unless (-f $diff_file);
-gunzip_file($diff_file, 'debian-patch');
+gunzip_file($diff_file, "$dir/debian-patch");
-open (STAT, '>', 'diffstat') or fail("cannot open scripts output file: $!");
+open STAT, '>', "$dir/diffstat" or fail "cannot open scripts output file: $!";
# diffstat is noisy on stderr if its stdout is not a tty.
# Shut it up by redirecting stderr to /dev/null.
open STDERR, '>', '/dev/null';
-open (DIFF, '-|', qw/diffstat -p1 debian-patch/)
+open DIFF, '-|', 'diffstat', '-p1', "$dir/debian-patch"
or fail("cannot open pipe to diffstat on debian-patch: $!");
# Copy all except last line to the STAT file
my $previous;
diff -Nru lintian-2.5.5/collection/doc-base-files lintian-2.5.6/collection/doc-base-files
--- lintian-2.5.5/collection/doc-base-files 2011-12-07 14:24:44.000000000 +0000
+++ lintian-2.5.6/collection/doc-base-files 2012-03-12 14:40:11.000000000 +0000
@@ -26,22 +26,20 @@
use lib "$ENV{'LINTIAN_ROOT'}/lib";
use Util;
-($#ARGV == 1) or fail('syntax: doc-base-files ');
-my $pkg = shift;
-my $type = shift;
+($#ARGV == 2) or fail 'syntax: doc-base-files ';
+my ($pkg, $type, $dir) = @ARGV;
-
-if (-e 'doc-base') {
- delete_dir('doc-base')
+if ( -e "$dir/doc-base") {
+ delete_dir ("$dir/doc-base")
or fail('cannot rm old doc-base directory');
}
-if (-d 'unpacked/usr/share/doc-base') {
- copy_dir('unpacked/usr/share/doc-base', 'doc-base')
+if ( -d "$dir/unpacked/usr/share/doc-base") {
+ copy_dir ("$dir/unpacked/usr/share/doc-base", "$dir/doc-base")
or fail('cannot copy directory unpacked/usr/share/doc-base');
} else {
# no doc-base directory
- mkdir('doc-base', 0777) or fail("cannot mkdir doc-base: $!");
+ mkdir ("$dir/doc-base", 0777) or fail "cannot mkdir doc-base: $!";
}
# Local Variables:
diff -Nru lintian-2.5.5/collection/file-info lintian-2.5.6/collection/file-info
--- lintian-2.5.5/collection/file-info 2012-02-21 09:30:10.000000000 +0000
+++ lintian-2.5.6/collection/file-info 2012-03-12 14:40:11.000000000 +0000
@@ -28,24 +28,21 @@
use Util;
use Lintian::Command qw(spawn reap);
-($#ARGV == 1) or fail('syntax: file-info ');
-my $pkg = shift;
-my $type = shift;
+($#ARGV == 2) or fail 'syntax: file-info ';
+my ($pkg, $type, $dir) = @ARGV;
my $last = '';
my $helper = realpath("$0-helper");
-my $outfile = realpath('./file-info');
+my $outfile = "$dir/file-info";
-unlink($outfile);
-
-# Open files before we chdir, since unpacked could be a symlink (at
-# the time of writing, it never is, but it could be a reasonable way
-# of fixing #262783)
+if ( -e $outfile ) {
+ unlink($outfile) or fail "unlink file-info: $!";
+}
-open(INDEX, '<', 'index')
+open INDEX, '<', "$dir/index"
or fail("cannot open index file: $!");
-chdir('unpacked')
+chdir ("$dir/unpacked")
or fail("cannot chdir to unpacked directory: $!");
# We ignore failures from file because sometimes file returns a non-zero exit
diff -Nru lintian-2.5.5/collection/index lintian-2.5.6/collection/index
--- lintian-2.5.5/collection/index 2012-02-21 09:30:10.000000000 +0000
+++ lintian-2.5.6/collection/index 2012-03-12 14:40:11.000000000 +0000
@@ -34,12 +34,11 @@
use Lintian::Command qw(spawn reap);
use Lintian::Processable::Package;
-($#ARGV == 1) or fail 'syntax: index ';
-my $pkg = shift;
-my $type = shift;
+($#ARGV == 2) or fail 'syntax: index ';
+my ($pkg, $type, $dir) = @ARGV;
-unlink 'index' or fail "Could not unlink index: $!" if -e 'index' && -s 'index';
-unlink 'index-errors' or fail "Could not unlink index-errors: $!" if -e 'index-errors' && -s 'index-errors';
+unlink "$dir/index" or fail "Could not unlink index: $!" if -e "$dir/index";
+unlink "$dir/index-errors" or fail "Could not unlink index-errors: $!" if -e "$dir/index-errors";
if ($type ne 'source') {
index_deb();
@@ -51,16 +50,14 @@
# returns all (orig) tarballs.
sub gather_tarballs {
- my $file = Cwd::realpath('dsc');
- my $dir;
+ my $file = Cwd::realpath ("$dir/dsc");
my $data;
my $version;
my @tarballs;
my $base;
my $baserev;
my $proc;
- fail "Cannot resolve \"dsc\" link for $pkg or it does not point to a file.\n" unless $file and -e $file;
- (undef, $dir, undef) = File::Spec->splitpath($file);
+ fail "Cannot resolve \"dsc\" link for $pkg or it does not point to a file." unless $file and -e $file;
# Use Lintian::Processable::Package to determine source and version as handles missing fields
# for us to some extend.
$proc = Lintian::Processable::Package->new ('source', $file);
@@ -125,8 +122,8 @@
}
}
}; # End $collect = sub;
- spawn({ fail => 'never', out => $collect, err_append => 'index-errors' },
- ['tar', @tar_options, $tarball]);
+ spawn({ fail => 'never', out => $collect, err_append => "$dir/index-errors" },
+ ['tar', @tar_options, "$dir/$tarball"]);
if ($last) {
fail("tar output (for $tarball from $pkg) does not end in a newline");
}
@@ -176,7 +173,7 @@
} @index;
my $filename = 'source-prefix';
$filename .= "-$compname" if $compname;
- open(PREFIX, '>', $filename)
+ open PREFIX, '>', "$dir/$filename"
or fail "opening $filename for $pkg: $!";
print PREFIX "$prefix\n";
close PREFIX or fail "closing $filename for $pkg: $!";
@@ -190,7 +187,7 @@
}
# Now that we have the file names we want, write them out sorted to the index
# file.
- spawn({ fail => 'error', out_append => 'index' },
+ spawn({ fail => 'error', out_append => "$dir/index" },
sub { print @result }, '|', ['sort', '-k', '6']);
return 1;
}
@@ -200,29 +197,29 @@
my (@jobs, $job);
foreach my $file (qw(index index-errors index-owner-id)) {
- unlink $file or fail "$file: $!" if -f $file;
+ unlink "$dir/$file" or fail "$file: $!" if -f "$dir/$file";
}
$job = { fail => 'error',
- out => 'index',
- err => 'index-errors' };
+ out => "$dir/index",
+ err => "$dir/index-errors" };
push @jobs, $job;
# (replaces dpkg-deb -c)
# create index file for package
spawn($job,
- ['dpkg-deb', '--fsys-tarfile', 'deb' ],
+ ['dpkg-deb', '--fsys-tarfile', "$dir/deb" ],
'|', ['tar', 'tfv', '-'],
'|', ['sed', '-e', 's/^h/-/'],
'|', ['sort', '-k', '6'], '&');
$job = { fail => 'error',
- out => 'index-owner-id',
+ out => "$dir/index-owner-id",
err => '/dev/null' };
push @jobs, $job;
# (replaces dpkg-deb -c)
# create index file for package with owner IDs instead of names
spawn($job,
- ['dpkg-deb', '--fsys-tarfile', 'deb' ],
+ ['dpkg-deb', '--fsys-tarfile', "$dir/deb" ],
'|', ['tar', '--numeric-owner', '-tvf', '-'],
'|', ['sed', '-e', 's/^h/-/'],
'|', ['sort', '-k', '6'], '&');
diff -Nru lintian-2.5.5/collection/init.d lintian-2.5.6/collection/init.d
--- lintian-2.5.5/collection/init.d 2011-12-07 14:24:44.000000000 +0000
+++ lintian-2.5.6/collection/init.d 2012-03-12 14:40:11.000000000 +0000
@@ -25,21 +25,20 @@
use lib "$ENV{'LINTIAN_ROOT'}/lib";
use Util;
-($#ARGV == 1) or fail('syntax: init.d ');
-my $pkg = shift;
-my $type = shift;
+($#ARGV == 2) or fail('syntax: init.d ');
+my ($pkg, $type, $dir) = @ARGV;
-if (-e 'init.d') {
- delete_dir('init.d')
+if (-e "$dir/init.d") {
+ delete_dir ("$dir/init.d")
or fail('cannot rm old init.d directory');
}
-if (-d 'unpacked/etc/init.d') {
- copy_dir('unpacked/etc/init.d', 'init.d')
+if (-d "$dir/unpacked/etc/init.d") {
+ copy_dir("$dir/unpacked/etc/init.d", "$dir/init.d")
or fail('cannot copy init.d directory');
} else {
# no etc/init.d
- mkdir('init.d', 0777) or fail("cannot mkdir init.d: $!");
+ mkdir ("$dir/init.d", 0777) or fail "cannot mkdir init.d: $!";
}
# Local Variables:
diff -Nru lintian-2.5.5/collection/java-info lintian-2.5.6/collection/java-info
--- lintian-2.5.5/collection/java-info 2011-12-07 14:24:44.000000000 +0000
+++ lintian-2.5.6/collection/java-info 2012-03-12 14:40:11.000000000 +0000
@@ -22,20 +22,24 @@
use strict;
use warnings;
+use lib "$ENV{'LINTIAN_ROOT'}/lib/";
+use Util qw(fail);
+
+my ($pkg, undef, $dir) = @ARGV;
+
# Sanity check
-unless (-d 'unpacked/') {
- print STDERR 'error: collection script called in wrong directory!\n';
- exit 2;
+unless ( -d "$dir/unpacked/") {
+ fail "java-info called with the wrong dir argument!";
}
-open (INDEX, '<', 'index')
- or fail("cannot open index: $!\n");
+open INDEX, '<', "$dir/index"
+ or fail "cannot open index: $!";
-open (OUT, '>', 'java-info')
- or fail("cannot open java-info: $!\n");
+open OUT, '>', "$dir/java-info"
+ or fail "cannot open java-info: $!";
-chdir ('unpacked')
- or fail ("unable to chdir to unpacked: $!\n");
+chdir ("$dir/unpacked")
+ or fail "unable to chdir to unpacked: $!";
while () {
chomp;
diff -Nru lintian-2.5.5/collection/md5sums lintian-2.5.6/collection/md5sums
--- lintian-2.5.5/collection/md5sums 2012-02-21 09:30:10.000000000 +0000
+++ lintian-2.5.6/collection/md5sums 2012-03-12 14:40:11.000000000 +0000
@@ -22,19 +22,20 @@
use strict;
use warnings;
-use Cwd();
use FileHandle;
use lib "$ENV{'LINTIAN_ROOT'}/lib";
use Lintian::Command qw(spawn reap);
use Util;
-($#ARGV == 1) or fail('syntax: md5sums ');
-my $pkg = shift;
-my $type = shift;
-my $dir = Cwd::cwd();
+($#ARGV == 2) or fail 'syntax: md5sums ';
-unlink('md5sums');
-chdir('unpacked')
+my ($pkg, $type, $dir) = @ARGV;
+
+if ( -e "$dir/md5sums" ) {
+ unlink "$dir/md5sums" or fail "unlink md5sums: $!";
+}
+
+chdir ("$dir/unpacked")
or fail("cannot chdir to unpacked directory: $!");
my %opts = ( pipe_in => FileHandle->new,
diff -Nru lintian-2.5.5/collection/menu-files lintian-2.5.6/collection/menu-files
--- lintian-2.5.5/collection/menu-files 2011-12-07 14:24:44.000000000 +0000
+++ lintian-2.5.6/collection/menu-files 2012-03-12 14:40:11.000000000 +0000
@@ -25,16 +25,15 @@
use lib "$ENV{'LINTIAN_ROOT'}/lib";
use Util;
-($#ARGV == 1) or fail('syntax: menu-files ');
-my $pkg = shift;
-my $type = shift;
+($#ARGV == 2) or fail('syntax: menu-files ');
+my ($pkg, $type, $dir) = @ARGV;
-if (-e 'menu') {
- delete_dir('menu')
+if ( -e "$dir/menu") {
+ delete_dir ("$dir/menu")
or fail('cannot rm old menu directory');
}
-mkdir('menu', 0777) or fail("cannot mkdir menu: $!");
+mkdir ("$dir/menu", 0777) or fail ("cannot mkdir menu: $!");
my %dirs;
$dirs{'share'} = 'usr/share/menu';
@@ -42,12 +41,12 @@
$dirs{'methods'} = 'etc/menu-methods';
while (my ($shortn, $path) = each %dirs) {
- if (-d "unpacked/$path") {
- copy_dir("unpacked/$path", "menu/$shortn")
+ if (-d "$dir/unpacked/$path") {
+ copy_dir ("$dir/unpacked/$path", "$dir/menu/$shortn")
or fail("cannot copy unpacked/$path/ directory");
} else {
# no menu directory
- mkdir("menu/$shortn", 0777) or fail("cannot mkdir menu/$shortn: $!");
+ mkdir ("$dir/menu/$shortn", 0777) or fail ("cannot mkdir menu/$shortn: $!");
}
}
diff -Nru lintian-2.5.5/collection/objdump-info lintian-2.5.6/collection/objdump-info
--- lintian-2.5.5/collection/objdump-info 2012-02-21 09:30:10.000000000 +0000
+++ lintian-2.5.6/collection/objdump-info 2012-03-12 14:40:11.000000000 +0000
@@ -26,15 +26,17 @@
use strict;
use warnings;
+my (undef, undef, $dir) = @ARGV;
+
my $failed = 0;
-open (FILES, '<', 'file-info')
+open FILES, '<', "$dir/file-info"
or fail("cannot open file-info: $!");
-open (OUT, '>', 'objdump-info')
+open OUT, '>', "$dir/objdump-info"
or fail("cannot open objdump-info: $!");
-chdir ('unpacked')
+chdir ("$dir/unpacked")
or fail ("unable to chdir to unpacked: $!\n");
while () {
diff -Nru lintian-2.5.5/collection/override-file lintian-2.5.6/collection/override-file
--- lintian-2.5.5/collection/override-file 2011-12-07 14:24:44.000000000 +0000
+++ lintian-2.5.6/collection/override-file 2012-03-12 14:40:11.000000000 +0000
@@ -26,24 +26,23 @@
use lib "$ENV{'LINTIAN_ROOT'}/lib";
use Util;
-($#ARGV == 1) or fail('syntax: override-file ');
-my $pkg = shift;
-my $type = shift;
+($#ARGV == 2) or fail('syntax: override-file ');
+my ($pkg, $type, $dir) = @ARGV;
--d 'unpacked' or fail('override-file invoked in wrong directory');
+-d "$dir/unpacked" or fail 'override-file invoked with wrong dir argument';
-if (-e 'override'){
- unlink('override') or fail("could not remove old override file: $!");
+if ( -e "$dir/override"){
+ unlink "$dir/override" or fail "could not remove old override file: $!";
}
# Pick the first of these files that exists. Prefer source/lintian-overrides
# to source.lintian-overrides for source packages.
my (@overrides, $file);
if ($type eq 'source') {
- @overrides = qw(unpacked/debian/source/lintian-overrides
- unpacked/debian/source.lintian-overrides);
+ @overrides = ("$dir/unpacked/debian/source/lintian-overrides",
+ "$dir/unpacked/debian/source.lintian-overrides");
} else {
- @overrides = ("unpacked/usr/share/lintian/overrides/$pkg");
+ @overrides = ("$dir/unpacked/usr/share/lintian/overrides/$pkg");
}
for my $override (@overrides) {
if (-f $override) {
@@ -56,9 +55,9 @@
if (not defined $file) {
# no override found
} elsif ($file =~ /\.gz$/) {
- gunzip_file($file, 'override');
+ gunzip_file ($file, "$dir/override");
} else {
- link($file, 'override')
+ link ($file, "$dir/override")
or fail("cannot link $file to override: $!");
}
diff -Nru lintian-2.5.5/collection/scripts lintian-2.5.6/collection/scripts
--- lintian-2.5.5/collection/scripts 2011-12-07 14:24:44.000000000 +0000
+++ lintian-2.5.6/collection/scripts 2012-03-12 14:40:11.000000000 +0000
@@ -22,8 +22,13 @@
use strict;
use warnings;
-open(SCRIPTS, '>', 'scripts') or fail("cannot open scripts output file: $!");
-open(INDEX, '<', 'index') or fail("cannot open index file: $!");
+use lib "$ENV{'LINTIAN_ROOT'}/lib/";
+use Util qw(fail);
+
+my (undef, undef, $dir) = @ARGV;
+
+open SCRIPTS, '>', "$dir/scripts" or fail "cannot open scripts output file: $!";
+open INDEX, '<', "$dir/index" or fail "cannot open index file: $!";
my $file;
my $magic;
@@ -40,7 +45,7 @@
$file =~ s/ link to .*//; # cut off info about hard links
# This used to call fail() instead of next. However, the check to
# see if all files in the index can be opened should be done elsewhere.
- open(FILE, '<', "unpacked/$file") or next;
+ open(FILE, '<', "$dir/unpacked/$file") or next;
if (read(FILE, $magic, 2) and $magic eq '#!' and not eof(FILE)) {
$scriptpath = ;
chomp($scriptpath);
@@ -67,15 +72,15 @@
close(INDEX);
close(SCRIPTS) or fail("cannot write scripts file: $!");
-open(SCRIPTS, '>', 'control-scripts')
+open SCRIPTS, '>', "$dir/control-scripts"
or fail("cannot open control-scripts output file: $!");
-opendir(CONTROL, 'control')
+opendir CONTROL, "$dir/control"
or fail("cannot read control directory: $!");
for $file (readdir CONTROL) {
- next unless -f "control/$file";
- open(FILE, '<', "control/$file") or fail("cannot open control/$file: $!");
+ next if -l "$dir/control/$file" or ! -f _;
+ open FILE, '<', "$dir/control/$file" or fail "cannot open control/$file: $!";
if (read(FILE, $magic, 2) and $magic eq '#!') {
$scriptpath = ;
$scriptpath =~ s/^\s*(\S*).*/$1/s;
@@ -88,19 +93,6 @@
exit 0;
-# -----------------------------------
-
-sub fail {
- if ($_[0]) {
- print STDERR "internal error: $_[0]\n";
- } elsif ($!) {
- print STDERR "internal error: $!\n";
- } else {
- print STDERR "internal error.\n";
- }
- exit 1;
-}
-
# Local Variables:
# indent-tabs-mode: nil
# cperl-indent-level: 4
diff -Nru lintian-2.5.5/collection/strings lintian-2.5.6/collection/strings
--- lintian-2.5.5/collection/strings 2011-12-07 14:24:44.000000000 +0000
+++ lintian-2.5.6/collection/strings 2012-03-12 14:40:11.000000000 +0000
@@ -24,42 +24,46 @@
use lib "$ENV{'LINTIAN_ROOT'}/lib";
use Util;
+use Lintian::Collect;
use Lintian::Command qw(spawn);
use Lintian::Command::Simple;
-($#ARGV == 1) or fail('syntax: strings ');
+($#ARGV == 2) or fail('syntax: strings ');
--f 'file-info'
- or fail('file-info invoked in wrong directory');
+my ($pkg, $type, $dir) = @ARGV;
+my $info = Lintian::Collect->new ($pkg, $type, $dir);
-unlink('elf-index');
-delete_dir('strings');
+my $file_info = $info->file_info;
-open(ELF_INDEX, '>', 'elf-index')
- or fail("Could not open 'elf-index' for writing: $!\n");
+if ( -e "$dir/elf-index" ) {
+ unlink "$dir/elf-index" or fail "unlink elf-index: $!";
+}
+
+if ( -d "$dir/strings" ) {
+ delete_dir ("$dir/strings") or fail "rmdir strings: $!";
+}
-open(FILE_INFO, '<', 'file-info')
- or fail("Could not open 'file-info' for reading: $!\n");
+open ELF_INDEX, '>', "$dir/elf-index"
+ or fail "Could not open 'elf-index' for writing: $!";
-while () {
- next unless(m/^(.+?)\x00\s+[^,]*\bELF\b/);
- my $bin = $1;
+foreach my $bin (keys %$file_info) {
+ my $finfo = $file_info->{$bin};
+ next unless $finfo =~ m/\bELF\b/o;
print ELF_INDEX "$bin\n";
next if ($bin =~ m,^/usr/lib/debug/,);
- my $dir = $bin;
- $dir =~ s,/[^/]+?$,,;
+ my $elfdir = $bin;
+ $elfdir =~ s,/[^/]+?$,,;
- Lintian::Command::Simple::run('mkdir', '-p', "strings/$dir") == 0
- or fail("Failed to create directory 'strings/$dir'\n");
+ Lintian::Command::Simple::run ('mkdir', '-p', "$dir/strings/$elfdir") == 0
+ or fail "Failed to create directory 'strings/$elfdir'";
- spawn({out => "strings/$bin", fail => 'error'}, ['strings', "unpacked/$bin"]);
+ spawn ({out => "$dir/strings/$bin", fail => 'error'}, ['strings', "$dir/unpacked/$bin"]);
}
close(ELF_INDEX) or fail("cannot write elf-index file: $!");
-close(FILE_INFO);
# Local Variables:
# indent-tabs-mode: nil
diff -Nru lintian-2.5.5/collection/unpacked lintian-2.5.6/collection/unpacked
--- lintian-2.5.5/collection/unpacked 2012-02-21 09:30:10.000000000 +0000
+++ lintian-2.5.6/collection/unpacked 2012-03-12 14:40:11.000000000 +0000
@@ -27,17 +27,15 @@
use Lintian::Command qw(spawn);
use Util;
-($#ARGV == 1) or fail('syntax: unpacked ');
+($#ARGV == 2) or fail('syntax: unpacked ');
+my ($pkg, $type, $dir) = @ARGV;
-my $pkg = shift;
-my $type = shift;
-
-if (-d 'unpacked/') {
- delete_dir('unpacked/') or
+if (-d "$dir/unpacked/") {
+ delete_dir ("$dir/unpacked/") or
fail("failed to remove unpacked directory of $pkg");
}
-if (-f 'unpacked-errors') {
- unlink('unpacked-errors') or
+if (-f "$dir/unpacked-errors") {
+ unlink ("$dir/unpacked-errors") or
fail("failed to remove unpacked-errors file of $pkg");
}
# If we are asked to only remove the files stop right here
@@ -49,12 +47,12 @@
if (can_use_dpkg_source()) {
# Ignore STDOUT of the child process because older versions of
# dpkg-source print things out even with -q.
- my $opts = { out => '/dev/null', err => 'unpacked-errors' };
+ my $opts = { out => '/dev/null', err => "$dir/unpacked-errors" };
my @args = ('-q');
push @args, '--no-check' if $ENV{'LINTIAN_COLL_UNPACKED_SKIP_SIG'};
print "N: Using dpkg-source to unpack $pkg\n" if $ENV{'LINTIAN_DEBUG'};
- unless (spawn($opts, ['dpkg-source', @args, '-x', 'dsc', 'unpacked'])) {
- open(ERRORS, '<', 'unpacked-errors')
+ unless (spawn ($opts, ['dpkg-source', @args, '-x', "$dir/dsc", "$dir/unpacked"])) {
+ open ERRORS, '<', "$dir/unpacked-errors"
or fail("cannot open unpacked-errors: $!");
print STDERR while ;
close ERRORS;
@@ -62,26 +60,26 @@
}
} else {
print "N: Using libdpkg-perl to unpack $pkg\n" if $ENV{'LINTIAN_DEBUG'};
- libdpkg_unpack_dsc('dsc', 'unpacked');
+ libdpkg_unpack_dsc("$dir/dsc", "$dir/unpacked");
}
# fix permissions
spawn({ fail => 'error' },
- ['chmod', '-R', 'u+rwX,o+rX,o-w', 'unpacked']);
+ ['chmod', '-R', 'u+rwX,o+rX,o-w', "$dir/unpacked"]);
} else {
- mkdir('unpacked', 0777) or fail("mkdir unpacked: $!");
+ mkdir ("$dir/unpacked", 0777) or fail "mkdir unpacked: $!";
# avoid using dpkg-deb -x; this pipeline is far faster. I got a factor 2
# improvement on large debs, and factor 1.5 on small debs.
# I heard it's because dpkg-deb syncs while writing. -- Richard
- my $opts = { err => 'unpacked-errors' };
+ my $opts = { err => "$dir/unpacked-errors" };
spawn($opts,
- ['dpkg-deb', '--fsys-tarfile', 'deb'],
- '|', ['tar', 'xf', '-', '-C', 'unpacked']);
+ ['dpkg-deb', '--fsys-tarfile', "$dir/deb"],
+ '|', ['tar', 'xf', '-', '-C', "$dir/unpacked"]);
unless ($opts->{success}) {
- open(ERRORS, '<', 'unpacked-errors')
+ open ERRORS, '<', "$dir/unpacked-errors"
or fail("cannot open unpacked-errors: $!");
print STDERR while ;
close ERRORS;
@@ -90,7 +88,7 @@
# fix permissions
spawn({ fail => 'error' },
- ['chmod', '-R', 'u+rwX,go-w', 'unpacked']);
+ ['chmod', '-R', 'u+rwX,go-w', "$dir/unpacked"]);
}
sub libdpkg_unpack_dsc {
diff -Nru lintian-2.5.5/data/scripts/interpreters lintian-2.5.6/data/scripts/interpreters
--- lintian-2.5.5/data/scripts/interpreters 1970-01-01 00:00:00.000000000 +0000
+++ lintian-2.5.6/data/scripts/interpreters 2012-03-12 14:40:11.000000000 +0000
@@ -0,0 +1,85 @@
+# Map interpreter to installation placement (and optionally
+# the dependency relation required to obtain the interpreter)
+#
+# syntax:
+# => [, ]
+#
+# NB: can have the magic value @NODEPS@
+# meaning that the interpreter will be provided by an essential
+# package or otherwise no need a dependency.
+#
+# If is left out, its value is assumed to
+# be the same as the interpreter itself (saves some typing).
+#
+# Do NOT list versioned interpreters here (such as pythonX.Y,
+# rubyX.Y, etc.). They are handled separately.
+#
+# Manually maintained list - please keep it sorted (by key)!
+#
+
+ash => /bin
+awk => /usr/bin, @NODEPS@
+bash => /bin, @NODEPS@
+bltwish => /usr/bin, blt
+clisp => /usr/bin
+csh => /bin, tcsh | csh | c-shell
+dash => /bin, @NODEPS@
+escript => /usr/bin, erlang-base | erlang-base-hipe
+expect => /usr/bin
+expectk => /usr/bin
+fish => /usr/bin
+fontforge => /usr/bin, fontforge-nox | fontforge
+gawk => /usr/bin
+gbr2 => /usr/bin, gambas2-runtime
+gbx => /usr/bin, gambas-runtime
+gbx2 => /usr/bin, gambas2-runtime
+gforth => /usr/bin
+gnuplot => /usr/bin
+gosh => /usr/bin, gauche
+icmake => /usr/bin, icmake
+install-menu => /usr/bin, @NODEPS@
+ir => /usr/bin, ironruby
+jed => /usr/bin
+jed-script => /usr/bin, jed | xjed
+kaptain => /usr/bin
+ksh => /bin, ksh | mksh | pdksh | zsh
+lefty => /usr/bin, graphviz
+liquidsoap => /usr/bin
+magicfilter => /usr/sbin
+make => /usr/bin, make | build-essential | dpkg-dev
+mawk => /usr/bin
+mksh => /bin
+mscgen => /usr/bin
+nickle => /usr/bin
+ocamlrun => /usr/bin, ocaml-base-nox | ocaml-base | ocaml-nox | ocaml
+pagsh => /usr/bin, openafs-client | heimdal-clients
+parrot => /usr/bin
+perl => /usr/bin, @NODEPS@
+perl6 => /usr/bin, rakudo
+procmail => /usr/bin
+python => /usr/bin, python | python-minimal
+pforth => /usr/bin
+racket => /usr/bin
+r => /usr/bin, littler
+rc => /usr/bin
+regina => /usr/bin, regina-rexx
+rep => /usr/bin
+rexx => /usr/bin, regina-rexx
+rrdcgi => /usr/bin, rrdtool
+ruby => /usr/bin, ruby | ruby-interpreter
+runhaskell => /usr/bin, ghc | ghc6
+runhugs => /usr/bin, hugs | hugs98
+sed => /bin, @NODEPS@
+seed => /usr/bin
+sh => /bin, @NODEPS@
+slsh => /usr/bin
+speedy => /usr/bin, speedy-cgi-perl
+swipl => /usr/bin, swi-prolog | swi-prolog-nox
+tcsh => /usr/bin
+texlua => /usr/bin, luatex
+tixwish => /usr/bin, tix
+trs => /usr/bin, konwert
+xjed => /usr/bin, xjed
+yforth => /usr/bin, yforth
+yorick => /usr/bin
+zsh => /bin, zsh | zsh-beta
diff -Nru lintian-2.5.5/debian/changelog lintian-2.5.6/debian/changelog
--- lintian-2.5.5/debian/changelog 2012-02-23 13:54:45.000000000 +0000
+++ lintian-2.5.6/debian/changelog 2012-03-14 14:00:29.000000000 +0000
@@ -1,3 +1,78 @@
+lintian (2.5.6) unstable; urgency=low
+
+ * checks/*:
+ + [NT] Simplified some bit operations done on file permissions.
+ * checks/binaries:
+ + [NT] Fix false-negative missing-dependency-on-phpapi when the
+ binary included a "SOVERSION" in its name. Thanks to Ondřej
+ Surý for the report. (Closes: #662936)
+ * checks/changelog-file:
+ + [NT] Do not emit "no-upstream-changelog" for transitional
+ packages. Thanks to Paul Wise for the report.
+ (Closes: #660076)
+ * checks/cruft:
+ + [NT] Added missing "unless" in the code. Fixes false
+ positive "source-contains-waf-binary". Thanks to
+ Dmitrijs Ledkovs for the report. (Closes: #661561)
+ * checks/debhelper:
+ + [NT] Fix FP executable-debhelper-file-without-being-executable
+ emitted for directories. Thanks to Felix Geyer for the report
+ and the patch. (Closes: #663447)
+ * checks/files.desc:
+ + [NT] Fix a typo in a tag description. Thanks to Ludovic
+ Rousseau for spotting it. (Closes: #663759)
+ * checks/scripts:
+ + [NT] Allow fontforge-nox as (alternative) provider for the
+ fontforge interpreter. Thanks to Martin Erik Werner for
+ the report. (Closes: #661363)
+ + [NT] Move %interpreters map to a separate data file.
+ * checks/source-copyright.desc:
+ + [NT] Update references for copyright-format checks. Thanks
+ to Thijs Kinkhorst for the report and the patch.
+ (Closes: #661778)
+ + [NT] Added trailing slash to copyright-format URLs in tag
+ descriptions for consistency with the policy.
+
+ * collection/*:
+ + [NT] Removed assumption that "cwd" is the same as the
+ directory for the package being examined.
+ * collection/java-info:
+ + [NT] Added missing "use Util".
+ * collection/scripts:
+ + [NT] Use "fail" from Util.pm rather than using an embedded
+ copy.
+ * collection/strings:
+ + [NT] Use Lintian::Collect to find ELF files.
+
+ * data/scripts/interpreters:
+ + [NT] New file.
+
+ * frontend/lintian:
+ + [NT] Pass directory of the package to the collections.
+
+ * lib/Lintian/Check.pm:
+ + [NT] Fixed false positive "*-address-malformed" if the local
+ part of the email was "0". Thanks to Christopher Vollick for
+ the report. (Closes: #663659)
+ * lib/Lintian/Tag/Info.pm:
+ + [NT] Fixed issue where "Experimental: no" was handled as a
+ "yes" when generating a tag description.
+ * lib/Util.pm:
+ + [NT] If no locale can be found, just set LC_ALL to en_US.UTF-8.
+ This fixes an issue with Lintian in backports when only
+ locales-all is installed. Thanks to Peter Palfrader for the
+ report. (Closes: #663459)
+
+ * private/runtests:
+ + [NT] Support using en_US.UTF-8 from locales-all, when that is
+ available. This allows locales-all to be used as a substitute
+ for locales when compiling Lintian on Squeeze.
+
+ * reporting/harness:
+ + [NT] Corrected inverted logic when checking for dry-run.
+
+ -- Niels Thykier Wed, 14 Mar 2012 15:00:25 +0100
+
lintian (2.5.5) unstable; urgency=low
The "Policy 3.9.3" release.
diff -Nru lintian-2.5.5/debian/control lintian-2.5.6/debian/control
--- lintian-2.5.5/debian/control 2012-02-23 12:06:05.000000000 +0000
+++ lintian-2.5.6/debian/control 2012-03-12 14:40:11.000000000 +0000
@@ -11,7 +11,7 @@
Build-Depends: binutils,
bzip2,
cdbs,
- debhelper (>= 8.1.0~),
+ debhelper (>= 9),
default-jdk,
diffstat,
docbook-utils,
diff -Nru lintian-2.5.5/frontend/lintian lintian-2.5.6/frontend/lintian
--- lintian-2.5.5/frontend/lintian 2012-02-21 09:30:10.000000000 +0000
+++ lintian-2.5.6/frontend/lintian 2012-03-12 14:40:11.000000000 +0000
@@ -1273,7 +1273,7 @@
next unless $lpkg->is_coll_finished ($coll, $ci->{'version'});
my $script = "$opt{'LINTIAN_ROOT'}/collection/$ci->{'script'}";
debug_msg(1, "Auto removing: $ci->{'script'} ...");
- unless (Lintian::Command::Simple::rundir($base, $script, $pkg_name, "remove-${pkg_type}") == 0) {
+ unless (Lintian::Command::Simple::run ($script, $pkg_name, "remove-${pkg_type}", $base) == 0) {
warning("removing collect info $coll about package $pkg_name failed",
"skipping cleanup of $pkg_type package $pkg_name");
return 0;
@@ -1393,7 +1393,7 @@
debug_msg(1, "Collecting info: $coll ...");
my $script = "$opt{'LINTIAN_ROOT'}/collection/$ci->{'script'}";
my $cmd = Lintian::Command::Simple->new();
- unless ($cmd->background_dir($base, $script, $pkg_name, $pkg_type) > 0) {
+ unless ($cmd->background ($script, $pkg_name, $pkg_type, $base) > 0) {
warning("collect info $coll about package $pkg_name failed",
"skipping $action of $pkg_type package $pkg_name");
$exit_code = 2;
diff -Nru lintian-2.5.5/lib/Lintian/Check.pm lintian-2.5.6/lib/Lintian/Check.pm
--- lintian-2.5.5/lib/Lintian/Check.pm 2012-02-21 09:30:10.000000000 +0000
+++ lintian-2.5.6/lib/Lintian/Check.pm 2012-03-13 18:52:14.000000000 +0000
@@ -171,7 +171,16 @@
if (not $malformed and not Email::Valid->address($mail)) {
# Either not a valid email or possibly missing a comma between
# two entries.
- tag "$field-address-malformed", $maintainer;
+ $malformed = 1;
+ if ($mail =~ /^0/) {
+ # Email::Valid does not handle emails starting with "0" too
+ # well. So replace it with a "1", which Email::Valid cannot
+ # misinterpret as a "false-value".
+ my $copy = $mail;
+ $copy =~ s/^0/1/;
+ $malformed = 0 if Email::Valid->address ($copy);
+ }
+ tag "$field-address-malformed", $maintainer if $malformed;
}
if ($mail =~ /(?:localhost|\.localdomain|\.localnet)$/) {
tag "$field-address-is-on-localhost", $maintainer;
diff -Nru lintian-2.5.5/lib/Lintian/Collect/Package.pm lintian-2.5.6/lib/Lintian/Collect/Package.pm
--- lintian-2.5.5/lib/Lintian/Collect/Package.pm 2012-02-21 09:30:10.000000000 +0000
+++ lintian-2.5.6/lib/Lintian/Collect/Package.pm 2012-03-12 17:11:45.000000000 +0000
@@ -113,6 +113,7 @@
my $base_dir = $self->base_dir();
my (%idxh, %dir_counts);
my $num_idx;
+ my %rhlinks;
open my $idx, '<', "$base_dir/$index"
or croak "cannot open index file $base_dir/$index: $!";
if ($indexown) {
@@ -146,9 +147,12 @@
$name =~ s,^\./,,;
if ($name =~ s/ link to (.*)//) {
+ my $target = $1;
+ $target =~ s,^\./,,;
$file{type} = 'h';
- $file{link} = $1;
- $file{link} =~ s,^\./,,;
+ $file{link} = $target;
+
+ push @{$rhlinks{$target}}, $name;
} elsif ($file{type} eq 'l') {
($name, $file{link}) = split ' -> ', $name, 2;
}
@@ -162,8 +166,48 @@
$idxh{$name} = \%file;
}
foreach my $file (keys %idxh) {
- if ($dir_counts{$idxh{$file}->{name}}) {
- $idxh{$file}->{count} = $dir_counts{$idxh{$file}->{name}};
+ my $e = $idxh{$file};
+ if ($dir_counts{$e->{name}}) {
+ $e->{count} = $dir_counts{$e->{name}};
+ }
+ if ($rhlinks{$e->{name}}) {
+ # There is hard link pointing to this file (or hardlink).
+ my %candidates = ();
+ my @check = ($e->{name});
+ my @sorted;
+ my $target;
+ while ( my $current = pop @check) {
+ $candidates{$current} = 1;
+ foreach my $rdep (@{$rhlinks{$current}}) {
+ # There should not be any cicles, but just in case
+ push @check, $rdep unless $candidates{$rdep};
+ }
+ # Remove links we are fixing
+ delete $rhlinks{$current};
+ }
+ # keys %candidates will be a complete list of hardlinks
+ # that points (in)directly to $file. Time to normalize
+ # the links.
+ #
+ # Sort in reverse order (allows pop instead of unshift)
+ @sorted = sort {$b cmp $a} keys %candidates;
+ # Our prefered target
+ $target = pop @sorted;
+
+ foreach my $link (@sorted) {
+ next unless exists $idxh{$target};
+ my $le = $idxh{$link};
+ # We may be "demoting" a "real file" to a "hardlink"
+ $le->{type} = 'h';
+ $le->{link} = $target;
+ }
+ if ($target ne $e->{name}) {
+ $idxh{$target}->{type} = '-';
+ # hardlinks does not have size, so copy that from the original
+ # entry.
+ $idxh{$target}->{size} = $e->{size};
+ delete $idxh{$target}->{link};
+ }
}
}
$self->{$field} = \%idxh;
diff -Nru lintian-2.5.5/lib/Lintian/Profile.pm lintian-2.5.6/lib/Lintian/Profile.pm
--- lintian-2.5.5/lib/Lintian/Profile.pm 2012-02-21 09:30:10.000000000 +0000
+++ lintian-2.5.6/lib/Lintian/Profile.pm 2012-03-12 14:40:11.000000000 +0000
@@ -97,8 +97,9 @@
sub new {
my ($type, $name, $root, $ppath) = @_;
my $profile;
- croak "Illegal profile name \"$name\".\n"
+ croak "Illegal profile name \"$name\""
if $name =~ m,^/,o or $name =~ m/\./o;
+ croak "Undefined profile path" unless $ppath;
my $self = {
'parent-map' => {},
'parents' => [],
@@ -113,7 +114,7 @@
};
$self = bless $self, $type;
$profile = $self->find_profile($name);
- croak "Cannot find profile $name (in " . join(', ', @$ppath).").\n"
+ croak "Cannot find profile $name (in " . join(', ', @$ppath).")"
unless $profile;
$self->_read_profile($profile);
return $self;
@@ -224,7 +225,7 @@
my ($self, @tags) = @_;
for my $tag (@tags) {
my $ti = $self->{'known-tags'}->{$tag};
- croak "Unknown tag $tag.\n" unless $ti;
+ croak "Unknown tag $tag" unless $ti;
next if exists $self->{'enabled-tags'}->{$tag};
$self->{'enabled-tags'}->{$tag} = 1;
$self->{'enabled-checks'}->{$ti->script}++;
@@ -241,7 +242,7 @@
my ($self, @tags) = @_;
for my $tag (@tags) {
my $ti = $self->{'known-tags'}->{$tag};
- croak "Unknown tag $tag.\n" unless $ti;
+ croak "Unknown tag $tag" unless $ti;
next unless exists $self->{'enabled-tags'}->{$tag};
delete $self->{'enabled-tags'}->{$tag};
$self->{'enabled-checks'}->{$ti->script}--;
@@ -269,7 +270,7 @@
sub find_profile {
my ($self, $pname, @dirs) = @_;
my $pfile;
- croak "\"$pname\" is not a valid profile name.\n" if $pname =~ m/\./o;
+ croak "\"$pname\" is not a valid profile name" if $pname =~ m/\./o;
# Allow @dirs to override the default path for this profile-search
if (ref $self) {
push @dirs, @{ $self->{'profile-path'} } if defined $self->{'profile-path'};
@@ -296,12 +297,12 @@
my $pname;
@pdata = read_dpkg_control($pfile, 0);
$pheader = shift @pdata;
- croak "Profile field is missing from $pfile.\n"
+ croak "Profile field is missing from $pfile"
unless defined $pheader && $pheader->{'profile'};
$pname = $pheader->{'profile'};
- croak "Invalid Profile field in $pfile.\n"
+ croak "Invalid Profile field in $pfile"
if $pname =~ m,^/,o or $pname =~ m/\./o;
- croak "Recursive definition of $pname.\n"
+ croak "Recursive definition of $pname"
if exists $pmap->{$pname};
$pmap->{$pname} = 0; # Mark as being loaded.
$self->{'name'} = $pname unless exists $self->{'name'};
@@ -309,10 +310,10 @@
my $parent = $pheader->{'extends'};
my $plist = $self->{'parents'};
my $parentf;
- croak "Invalid Extends field in $pfile.\n"
+ croak "Invalid Extends field in $pfile"
unless $parent && $parent !~ m/\./o;
$parentf = $self->find_profile($parent);
- croak "Cannot find $parent, which $pname extends.\n"
+ croak "Cannot find $parent, which $pname extends"
unless $parentf;
$self->_read_profile($parentf);
# Use the extends field in parents, even though the extended
@@ -343,11 +344,11 @@
my $noover = $self->{'non-overridable-tags'};
my $sev_map = $self->{'severity-changes'};
$self->_check_for_invalid_fields($section, \%SEC_FIELDS, $pname, "section $sno");
- croak "Profile \"$pname\" is missing Tags field (or it is empty) in section $sno.\n" unless @tags;
- croak "Profile \"$pname\" contains invalid severity \"$severity\" in section $sno.\n"
+ croak "Profile \"$pname\" is missing Tags field (or it is empty) in section $sno" unless @tags;
+ croak "Profile \"$pname\" contains invalid severity \"$severity\" in section $sno"
if $severity && !$SEVERITIES{$severity};
foreach my $tag (@tags) {
- croak "Unknown check $tag in $pname (section $sno).\n" unless $self->{'known-tags'}->{$tag};
+ croak "Unknown check $tag in $pname (section $sno)" unless $self->{'known-tags'}->{$tag};
if ($severity) {
$self->{'known-tags'}->{$tag}->set_severity ($severity);
$sev_map->{$tag} = $severity;
@@ -388,7 +389,7 @@
my ($field, $tag) = @_;
unless (exists $self->{'known-tags'}->{$tag}) {
$self->_load_checks($pname);
- croak "Unknown tag \"$tag\" in profile \"$pname\".\n"
+ croak "Unknown tag \"$tag\" in profile \"$pname\""
unless exists $self->{'known-tags'}->{$tag};
}
return $tag;
@@ -432,9 +433,9 @@
foreach my $element (split m/\s*+,\s*+/o, $map->{$field}){
if (exists $dupmap{$element}){
my $other = $dupmap{$element};
- croak "\"$element\" appears in both \"$field\" and \"$other\" in profile \"$name\".\n"
+ croak "\"$element\" appears in both \"$field\" and \"$other\" in profile \"$name\""
unless $other eq $field;
- croak "\"$element\" appears twice in the field \"$field\" in profile \"$name\".\n";
+ croak "\"$element\" appears twice in the field \"$field\" in profile \"$name\"";
}
$dupmap{$element} = $field;
}
@@ -454,7 +455,7 @@
($bool =~ m/^\d++$/o && $bool != 0);
return 0 if $bool eq 'no' || $bool eq 'false' ||
($bool =~ m/^\d++$/o && $bool == 0);
- croak "\"$bool\" is not a boolean value in $pname (section $sno).\n";
+ croak "\"$bool\" is not a boolean value in $pname (section $sno)";
}
# $self->_split_comma_sep_field($data)
@@ -479,7 +480,7 @@
my ($self, $para, $known, $pname, $paraname) = @_;
foreach my $field (keys %$para) {
next if exists $known->{$field};
- croak "Unknown field \"$field\" in $pname ($paraname).\n";
+ croak "Unknown field \"$field\" in $pname ($paraname)";
}
}
@@ -487,7 +488,7 @@
my ($self, $profile, $check) = @_;
my $root = $self->root;
my $cf = "$root/checks/${check}.desc";
- croak "$profile references unknown $check.\n" unless -f $cf;
+ croak "$profile references unknown $check" unless -f $cf;
my $c = Lintian::CheckScript->new ($cf);
return if $self->{'check-scripts'}->{$c->name};
$self->{'check-scripts'}->{$c->name} = $c;
diff -Nru lintian-2.5.5/lib/Lintian/Tag/Info.pm lintian-2.5.6/lib/Lintian/Tag/Info.pm
--- lintian-2.5.5/lib/Lintian/Tag/Info.pm 2012-02-21 09:30:10.000000000 +0000
+++ lintian-2.5.6/lib/Lintian/Tag/Info.pm 2012-03-12 14:40:11.000000000 +0000
@@ -270,7 +270,7 @@
my $stype = $self->{'script-type'};
push(@text, '', "Check: $script, Type: $stype");
}
- if ($self->{experimental}) {
+ if ($self->experimental) {
push(@text, '',
'This tag is marked experimental, which means that the code that'
. ' generates it is not as well-tested as the rest of Lintian'
diff -Nru lintian-2.5.5/lib/Util.pm lintian-2.5.6/lib/Util.pm
--- lintian-2.5.5/lib/Util.pm 2012-02-21 09:30:10.000000000 +0000
+++ lintian-2.5.6/lib/Util.pm 2012-03-12 14:40:11.000000000 +0000
@@ -292,9 +292,11 @@
#
# Based on LOCPATH (and /usr/lib/locale), this function will set
# LC_ALL to C.UTF-8 or en_US.UTF-8. If neither LOCPATH nor
-# /usr/lib/locale has any of those locales, then LC_ALL will be
-# cleared. It is possible to skip the LC_ALL check by passing a
-# truth value as first argument.
+# /usr/lib/locale has any of those locales, then LC_ALL will be set to
+# en_US.UTF-8.
+#
+# It is possible to skip the LC_ALL check by passing a truth value as
+# first argument.
sub clean_env {
my ($no_lcall) = @_;
my @whitelist = qw(PATH INTLTOOL_EXTRACT LOCPATH);
@@ -312,7 +314,10 @@
}
}
}
- fail ("clean_env: could not find needed locale");
+ # We could not find any valid locale so far - presumably we get our locales
+ # from "locales-all", so just set it to "en_US.UTF-8".
+ # (related bug: #663459)
+ $ENV{LC_ALL} = 'en_US.UTF-8';
}
# Translate permission strings like `-rwxrwxrwx' into an octal number.
diff -Nru lintian-2.5.5/private/runtests lintian-2.5.6/private/runtests
--- lintian-2.5.5/private/runtests 2012-02-21 09:30:10.000000000 +0000
+++ lintian-2.5.6/private/runtests 2012-03-12 14:40:11.000000000 +0000
@@ -39,7 +39,16 @@
exit 1
}
-if [ ! -e "/usr/lib/locale/C.UTF-8" ] ; then
+# In Wheezy (and newer) libc-bin provides a C.UTF-8 locale.
+# In Squeeze (and older) we either need locales-all or generate
+# an en_US.UTF-8 locale ourselves.
+if [ -e "/usr/lib/locale/C.UTF-8" ] ; then
+ echo "Using C.UTF-8 locale from /usr/lib/locale"
+ unset LOCPATH
+elif dpkg -l | grep -q ^"ii *locales-all " ; then
+ echo "Using en_US.UTF-8 locale from locales-all"
+ unset LOCPATH
+else
LOCPATH="$(pwd)/debian/test.locale"
export LOCPATH
@@ -53,9 +62,6 @@
else
echo "Using pre-generated en_US.UTF-8 locale in $LOCPATH"
fi
-else
- echo "Using C.UTF-8 locale from /usr/lib/locale"
- unset LOCPATH
fi
if [ "${NEW_SUITE}" = 1 ] ; then
diff -Nru lintian-2.5.5/reporting/harness lintian-2.5.6/reporting/harness
--- lintian-2.5.5/reporting/harness 2012-02-21 09:30:10.000000000 +0000
+++ lintian-2.5.6/reporting/harness 2012-03-12 14:40:11.000000000 +0000
@@ -277,12 +277,13 @@
Log('Updating lintian.log...');
my $nfd;
if ($opt{'dry-run'}) {
- rename $lintian_log, $old_lintian_log;
- open $nfd, '>', $lintian_log
- or Die ("cannot open lintian.log $lintian_log for writing: $!");
- } else {
open $nfd, '>', '/dev/null'
or Die ("cannot open lintian.log /dev/null for writing: $!");
+ } else {
+ rename $lintian_log, $old_lintian_log
+ or Die ("cannot rename lintian.log to $old_lintian_log: $!");
+ open $nfd, '>', $lintian_log
+ or Die ("cannot open lintian.log $lintian_log for writing: $!");
}
open my $ofd, '<', $old_lintian_log
or Die ("cannot open old lintian.log $old_lintian_log for reading: $!");
diff -Nru lintian-2.5.5/t/runtests lintian-2.5.6/t/runtests
--- lintian-2.5.5/t/runtests 2012-02-23 12:17:04.000000000 +0000
+++ lintian-2.5.6/t/runtests 2012-03-12 14:40:11.000000000 +0000
@@ -462,18 +462,18 @@
my @data = <$in>;
close $in;
$status = ($? >> 8) & 255;
- @data = sort @data if $testdata->{sort};
- open my $fd, '>', $out or fail "opening $out: $!";
- print $fd $_ for @data;
- close $fd or fail "closing $out: $!";
+ unless ($status == 0 or $status == 1) {
+ msg_print "FAILED\n";
+ msg_print @data;
+ fail "$LINTIAN @options $file exited with status $status";
+ } else {
+ @data = sort @data if $testdata->{sort};
+ open my $fd, '>', $out or fail "opening $out: $!";
+ print $fd $_ for @data;
+ close $fd or fail "closing $out: $!";
+ }
} else {
- # Set it to 255 so it fails below
- $status = 255;
- }
-
- unless ($status == 0 or $status == 1) {
- msg_print "FAILED:\n";
- fail("$LINTIAN @options $file exited with status $status\n");
+ fail ("pipe+fork: $!");
}
return 1;
}
@@ -630,7 +630,7 @@
msg_print "TODO\n";
return 1;
} else {
- msg_print "FAILED:\n";
+ msg_print "FAILED\n";
runsystem_ok('diff', '-u', $expected, $actual);
return;
}
diff -Nru lintian-2.5.5/t/scripts/needs-info-missing.t lintian-2.5.6/t/scripts/needs-info-missing.t
--- lintian-2.5.5/t/scripts/needs-info-missing.t 2011-01-27 13:31:42.000000000 +0000
+++ lintian-2.5.6/t/scripts/needs-info-missing.t 2012-03-12 14:40:11.000000000 +0000
@@ -22,7 +22,8 @@
use Util qw(read_dpkg_control slurp_entire_file);
# Find all of the desc files in checks. We'll do one check per description.
-our @DESCS = (<$ENV{LINTIAN_ROOT}/checks/*.desc>);
+our @DESCS = (<$ENV{LINTIAN_ROOT}/checks/*.desc>,
+ <$ENV{LINTIAN_ROOT}/collection/*.desc>);
our @MODULES = (<$ENV{LINTIAN_ROOT}/lib/Lintian/Collect.pm>,
<$ENV{LINTIAN_ROOT}/lib/Lintian/Collect/*.pm>);
@@ -117,7 +118,8 @@
}
my $short = $desc;
- $short =~ s,^\Q$ENV{LINTIAN_ROOT}/checks/,,;
+ $short =~ s,^\Q$ENV{LINTIAN_ROOT}/,,;
+ $short =~ s,^collection/,coll/,;
is($missing, 0, "$short has all required needs-info for Lintian::Collect") or
diag(@warnings);
}
diff -Nru lintian-2.5.5/t/scripts/unpack-level.t lintian-2.5.6/t/scripts/unpack-level.t
--- lintian-2.5.5/t/scripts/unpack-level.t 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/scripts/unpack-level.t 2012-03-12 14:40:11.000000000 +0000
@@ -31,7 +31,7 @@
qr|->unpacked|,
qr,
qr,
- qr,
+ qr,
);
# For each desc file, load the first stanza of the file and check that if
diff -Nru lintian-2.5.5/t/templates/tests/pedantic/debian/compat lintian-2.5.6/t/templates/tests/pedantic/debian/compat
--- lintian-2.5.5/t/templates/tests/pedantic/debian/compat 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/templates/tests/pedantic/debian/compat 2012-03-12 14:40:11.000000000 +0000
@@ -1 +1 @@
-7
+9
diff -Nru lintian-2.5.5/t/templates/tests/pedantic/debian/control.in lintian-2.5.6/t/templates/tests/pedantic/debian/control.in
--- lintian-2.5.5/t/templates/tests/pedantic/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/templates/tests/pedantic/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Homepage: http://lintian.debian.org/
Package: {$srcpkg}
diff -Nru lintian-2.5.5/t/templates/tests/skel/debian/compat lintian-2.5.6/t/templates/tests/skel/debian/compat
--- lintian-2.5.5/t/templates/tests/skel/debian/compat 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/templates/tests/skel/debian/compat 2012-03-12 14:40:11.000000000 +0000
@@ -1 +1 @@
-7
+9
diff -Nru lintian-2.5.5/t/templates/tests/skel/debian/control.in lintian-2.5.6/t/templates/tests/skel/debian/control.in
--- lintian-2.5.5/t/templates/tests/skel/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/templates/tests/skel/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/binaries-doesnt-match-sonames/debian/debian/control.in lintian-2.5.6/t/tests/binaries-doesnt-match-sonames/debian/debian/control.in
--- lintian-2.5.5/t/tests/binaries-doesnt-match-sonames/debian/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/binaries-doesnt-match-sonames/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: libs
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: mylibany
Architecture: any
diff -Nru lintian-2.5.5/t/tests/binaries-misplaced/debian/debian/rules lintian-2.5.6/t/tests/binaries-misplaced/debian/debian/rules
--- lintian-2.5.5/t/tests/binaries-misplaced/debian/debian/rules 2011-12-07 14:24:45.000000000 +0000
+++ lintian-2.5.6/t/tests/binaries-misplaced/debian/debian/rules 2012-03-12 14:40:11.000000000 +0000
@@ -2,11 +2,11 @@
pkg=binaries-misplaced
%:
dh $@
-binary:
- dh --before dh_install binary
+
+override_dh_install:
mkdir debian/$(pkg)/etc/
cp -a /bin/true debian/$(pkg)/etc/foo
# explicitly call dh_shlibdeps since debhelper is being
# "smart" and not calling it in newer versons (8.9.something)
dh_shlibdeps
- dh --remaining binary
+ dh_install
diff -Nru lintian-2.5.5/t/tests/binaries-missing-depends/debian/debian/control.in lintian-2.5.6/t/tests/binaries-missing-depends/debian/debian/control.in
--- lintian-2.5.5/t/tests/binaries-missing-depends/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/binaries-missing-depends/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), perl
+Build-Depends: debhelper (>= 9), perl
Package: libbasic2
Architecture: any
diff -Nru lintian-2.5.5/t/tests/binaries-missing-depends-on-libc/debian/debian/control.in lintian-2.5.6/t/tests/binaries-missing-depends-on-libc/debian/debian/control.in
--- lintian-2.5.5/t/tests/binaries-missing-depends-on-libc/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/binaries-missing-depends-on-libc/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), perl
+Build-Depends: debhelper (>= 9), perl
Package: libbasic2
Architecture: any
diff -Nru lintian-2.5.5/t/tests/binaries-multiarch/debian/debian/control.in lintian-2.5.6/t/tests/binaries-multiarch/debian/debian/control.in
--- lintian-2.5.5/t/tests/binaries-multiarch/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/binaries-multiarch/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: libs
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: libbasic2
Architecture: any
diff -Nru lintian-2.5.5/t/tests/binaries-multiarch-same/debian/debian/control.in lintian-2.5.6/t/tests/binaries-multiarch-same/debian/debian/control.in
--- lintian-2.5.5/t/tests/binaries-multiarch-same/debian/debian/control.in 2012-02-21 09:30:11.000000000 +0000
+++ lintian-2.5.6/t/tests/binaries-multiarch-same/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: libs
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: libbasic2
Architecture: any
diff -Nru lintian-2.5.5/t/tests/changelog-file-general/debian/debian/rules lintian-2.5.6/t/tests/changelog-file-general/debian/debian/rules
--- lintian-2.5.5/t/tests/changelog-file-general/debian/debian/rules 2011-01-27 13:31:44.000000000 +0000
+++ lintian-2.5.6/t/tests/changelog-file-general/debian/debian/rules 2012-03-12 14:40:11.000000000 +0000
@@ -4,9 +4,7 @@
%:
dh $@
-binary:
- dh binary --before dh_installchangelogs
+override_dh_installchangelogs:
install -c -m 644 debian/changelog \
debian/$(pkg)/usr/share/doc/$(pkg)/changelog.Debian
gzip -1 debian/$(pkg)/usr/share/doc/$(pkg)/changelog.Debian
- dh binary --after dh_installchangelogs
diff -Nru lintian-2.5.5/t/tests/conffiles-general/debian/debian/rules lintian-2.5.6/t/tests/conffiles-general/debian/debian/rules
--- lintian-2.5.5/t/tests/conffiles-general/debian/debian/rules 2011-01-27 13:31:44.000000000 +0000
+++ lintian-2.5.6/t/tests/conffiles-general/debian/debian/rules 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,6 @@
%:
dh $@
-binary:
- dh --before dh_builddeb binary
+
+override_dh_builddeb:
dpkg-deb --nocheck --build debian/$(pkg) ../$(pkg)_1.0_all.deb
- dh --after dh_builddeb binary
diff -Nru lintian-2.5.5/t/tests/control-file-duplicate/debian/debian/control.in lintian-2.5.6/t/tests/control-file-duplicate/debian/debian/control.in
--- lintian-2.5.5/t/tests/control-file-duplicate/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/control-file-duplicate/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), debhelper
+Build-Depends: debhelper (>= 9), debhelper
Build-Depends-Indep: foobar, foo, foobar
Build-Conflicts: bar,
baz,
diff -Nru lintian-2.5.5/t/tests/control-file-duplicate/tags lintian-2.5.6/t/tests/control-file-duplicate/tags
--- lintian-2.5.5/t/tests/control-file-duplicate/tags 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/control-file-duplicate/tags 2012-03-12 14:40:11.000000000 +0000
@@ -2,4 +2,4 @@
P: control-file-duplicate source: duplicate-in-relation-field in control-file-duplicate suggests: baz (= 1.0), baz, baz (>= 2.0)
P: control-file-duplicate source: duplicate-in-relation-field in source build-conflicts: bar, bar [i386]
P: control-file-duplicate source: duplicate-in-relation-field in source build-depends-indep: foobar, foobar
-P: control-file-duplicate source: duplicate-in-relation-field in source build-depends: debhelper (>= 7.0.50~), debhelper
+P: control-file-duplicate source: duplicate-in-relation-field in source build-depends: debhelper (>= 9), debhelper
diff -Nru lintian-2.5.5/t/tests/control-file-general/debian/debian/control.in lintian-2.5.6/t/tests/control-file-general/debian/debian/control.in
--- lintian-2.5.5/t/tests/control-file-general/debian/debian/control.in 2012-02-21 09:30:11.000000000 +0000
+++ lintian-2.5.6/t/tests/control-file-general/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -2,7 +2,7 @@
Priority: extra
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 9),
fiddle [amd64 powerpc mips mipsel hppa s390],
faddle
(>>
diff -Nru lintian-2.5.5/t/tests/control-file-hardcoded-libc/debian/debian/control.in lintian-2.5.6/t/tests/control-file-hardcoded-libc/debian/debian/control.in
--- lintian-2.5.5/t/tests/control-file-hardcoded-libc/debian/debian/control.in 2011-01-27 13:31:44.000000000 +0000
+++ lintian-2.5.6/t/tests/control-file-hardcoded-libc/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/control-file-library-dev/debian/debian/control.in lintian-2.5.6/t/tests/control-file-library-dev/debian/debian/control.in
--- lintian-2.5.5/t/tests/control-file-library-dev/debian/debian/control.in 2011-01-27 13:31:44.000000000 +0000
+++ lintian-2.5.6/t/tests/control-file-library-dev/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: libcontrol-file-foo1
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/control-file-national-encoding/debian/debian/control.in lintian-2.5.6/t/tests/control-file-national-encoding/debian/debian/control.in
--- lintian-2.5.5/t/tests/control-file-national-encoding/debian/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/control-file-national-encoding/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: all
diff -Nru lintian-2.5.5/t/tests/control-file-pedantic/debian/debian/control.in lintian-2.5.6/t/tests/control-file-pedantic/debian/debian/control.in
--- lintian-2.5.5/t/tests/control-file-pedantic/debian/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/control-file-pedantic/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Homepage: http://lintian.debian.org/
Package: {$srcpkg}-udeb
diff -Nru lintian-2.5.5/t/tests/control-file-pedantic-space/debian/debian/control.in lintian-2.5.6/t/tests/control-file-pedantic-space/debian/debian/control.in
--- lintian-2.5.5/t/tests/control-file-pedantic-space/debian/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/control-file-pedantic-space/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Homepage: http://lintian.debian.org/
Package: {$srcpkg}
diff -Nru lintian-2.5.5/t/tests/control-file-suggests-itself/debian/debian/control.in lintian-2.5.6/t/tests/control-file-suggests-itself/debian/debian/control.in
--- lintian-2.5.5/t/tests/control-file-suggests-itself/debian/debian/control.in 2011-01-27 13:31:44.000000000 +0000
+++ lintian-2.5.6/t/tests/control-file-suggests-itself/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/copyright-file-doc-symlink/debian/debian/control.in lintian-2.5.6/t/tests/copyright-file-doc-symlink/debian/debian/control.in
--- lintian-2.5.5/t/tests/copyright-file-doc-symlink/debian/debian/control.in 2011-01-27 13:31:44.000000000 +0000
+++ lintian-2.5.6/t/tests/copyright-file-doc-symlink/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/copyright-file-doc-symlink/debian/debian/rules lintian-2.5.6/t/tests/copyright-file-doc-symlink/debian/debian/rules
--- lintian-2.5.5/t/tests/copyright-file-doc-symlink/debian/debian/rules 2011-01-27 13:31:45.000000000 +0000
+++ lintian-2.5.6/t/tests/copyright-file-doc-symlink/debian/debian/rules 2012-03-12 14:40:11.000000000 +0000
@@ -5,12 +5,8 @@
%:
dh $@
-binary: binary-indep
-binary-arch:
-binary-indep:
- dh binary-indep --until dh_prep
+override_dh_prep:
mkdir -p debian/$(pkg)-helper/usr/share/doc
ln -s $(pkg) debian/$(pkg)-helper/usr/share/doc/$(pkg)-helper
mkdir -p debian/$(pkg)-weak/usr/share/doc
ln -s $(pkg) debian/$(pkg)-weak/usr/share/doc/$(pkg)-weak
- dh binary --remaining
diff -Nru lintian-2.5.5/t/tests/copyright-file-general/debian/debian/control.in lintian-2.5.6/t/tests/copyright-file-general/debian/debian/control.in
--- lintian-2.5.5/t/tests/copyright-file-general/debian/debian/control.in 2011-12-07 14:24:46.000000000 +0000
+++ lintian-2.5.6/t/tests/copyright-file-general/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: copyright-iso-8859-1
Architecture: all
diff -Nru lintian-2.5.5/t/tests/copyright-file-general/debian/debian/rules lintian-2.5.6/t/tests/copyright-file-general/debian/debian/rules
--- lintian-2.5.5/t/tests/copyright-file-general/debian/debian/rules 2011-01-27 13:31:45.000000000 +0000
+++ lintian-2.5.6/t/tests/copyright-file-general/debian/debian/rules 2012-03-12 14:40:11.000000000 +0000
@@ -2,14 +2,12 @@
%:
dh $@
-binary: binary-arch binary-indep
-binary-arch:
-binary-indep:
- dh binary-indep --until dh_installdocs
+override_dh_installdocs:
+ dh_installdocs
install -m 644 debian/copyright-no-errors.copyright debian/copyright-symlink/usr/share/doc/copyright-symlink/symlink
rm debian/copyright-symlink/usr/share/doc/copyright-symlink/copyright
ln -s symlink debian/copyright-symlink/usr/share/doc/copyright-symlink/copyright
gzip -9 debian/copyright-compressed/usr/share/doc/copyright-compressed/copyright
mkdir -p debian/copyright-old-style/usr/doc/copyright
mv debian/copyright-old-style/usr/share/doc/copyright-old-style/copyright debian/copyright-old-style/usr/doc/copyright/copyright-old-style
- dh binary-indep --remaining
+
diff -Nru lintian-2.5.5/t/tests/copyright-file-license-symlink/debian/debian/control.in lintian-2.5.6/t/tests/copyright-file-license-symlink/debian/debian/control.in
--- lintian-2.5.5/t/tests/copyright-file-license-symlink/debian/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/copyright-file-license-symlink/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Homepage: http://lintian.debian.org/
Package: {$srcpkg}-bad
diff -Nru lintian-2.5.5/t/tests/copyright-file-symlink/debian/debian/control.in lintian-2.5.6/t/tests/copyright-file-symlink/debian/debian/control.in
--- lintian-2.5.5/t/tests/copyright-file-symlink/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/copyright-file-symlink/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: symlink-to-foreign
Architecture: all
diff -Nru lintian-2.5.5/t/tests/cruft-contains-waf-stripped/desc lintian-2.5.6/t/tests/cruft-contains-waf-stripped/desc
--- lintian-2.5.5/t/tests/cruft-contains-waf-stripped/desc 1970-01-01 00:00:00.000000000 +0000
+++ lintian-2.5.6/t/tests/cruft-contains-waf-stripped/desc 2012-03-12 14:40:11.000000000 +0000
@@ -0,0 +1,6 @@
+Testname: cruft-contains-waf-stripped
+Sequence: 6000
+Version: 1.0-1
+Type: non-native
+Description: Check for sources with waf
+Test-Against: source-contains-waf-binary
diff -Nru lintian-2.5.5/t/tests/cruft-contains-waf-stripped/upstream/waf lintian-2.5.6/t/tests/cruft-contains-waf-stripped/upstream/waf
--- lintian-2.5.5/t/tests/cruft-contains-waf-stripped/upstream/waf 1970-01-01 00:00:00.000000000 +0000
+++ lintian-2.5.6/t/tests/cruft-contains-waf-stripped/upstream/waf 2012-03-12 14:40:11.000000000 +0000
@@ -0,0 +1,15 @@
+#!/usr/bin/python
+# encoding: ISO-8859-1
+#
+
+# We just do a little python... for the show
+
+import os, sys
+if sys.hexversion<0x203000f: raise ImportError("Waf requires python >= 2.3")
+ # and we are pretending to be a waf script
+
+# okay, thats enough...
+
+#==>
+# Here one would expect to find a tar.bz2 file...
+#<==
diff -Nru lintian-2.5.5/t/tests/cruft-crlf-eols/debian/debian/control.in lintian-2.5.6/t/tests/cruft-crlf-eols/debian/debian/control.in
--- lintian-2.5.5/t/tests/cruft-crlf-eols/debian/debian/control.in 2011-01-27 13:31:45.000000000 +0000
+++ lintian-2.5.6/t/tests/cruft-crlf-eols/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/cruft-general-diff/debian/debian/rules lintian-2.5.6/t/tests/cruft-general-diff/debian/debian/rules
--- lintian-2.5.5/t/tests/cruft-general-diff/debian/debian/rules 2011-01-27 13:31:45.000000000 +0000
+++ lintian-2.5.6/t/tests/cruft-general-diff/debian/debian/rules 2012-03-12 14:40:11.000000000 +0000
@@ -2,9 +2,8 @@
%:
dh $@
-build:
+override_dh_prep:
dh_prep -X~ -Xrej
- dh build --remaining
clean:
@echo 'Do nothing'
diff -Nru lintian-2.5.5/t/tests/cruft-general-native/debian/debian/rules lintian-2.5.6/t/tests/cruft-general-native/debian/debian/rules
--- lintian-2.5.5/t/tests/cruft-general-native/debian/debian/rules 2011-01-27 13:31:45.000000000 +0000
+++ lintian-2.5.6/t/tests/cruft-general-native/debian/debian/rules 2012-03-12 14:40:11.000000000 +0000
@@ -2,9 +2,8 @@
%:
dh $@
-build:
+override_dh_prep:
dh_prep -X~ -Xrej
- dh build --remaining
clean:
@echo 'Do nothing'
diff -Nru lintian-2.5.5/t/tests/cruft-general-quilt/debian/debian/rules lintian-2.5.6/t/tests/cruft-general-quilt/debian/debian/rules
--- lintian-2.5.5/t/tests/cruft-general-quilt/debian/debian/rules 2011-01-27 13:31:46.000000000 +0000
+++ lintian-2.5.6/t/tests/cruft-general-quilt/debian/debian/rules 2012-03-12 14:40:11.000000000 +0000
@@ -2,9 +2,8 @@
%:
dh $@
-build:
+override_dh_prep:
dh_prep -X~ -Xrej
- dh build --remaining
clean:
@echo 'Do nothing'
diff -Nru lintian-2.5.5/t/tests/cruft-general-wig-pen/debian/debian/rules lintian-2.5.6/t/tests/cruft-general-wig-pen/debian/debian/rules
--- lintian-2.5.5/t/tests/cruft-general-wig-pen/debian/debian/rules 2011-09-24 11:22:19.000000000 +0000
+++ lintian-2.5.6/t/tests/cruft-general-wig-pen/debian/debian/rules 2012-03-12 14:40:11.000000000 +0000
@@ -2,9 +2,8 @@
%:
dh $@
-build:
+override_dh_prep:
dh_prep -X~ -Xrej
- dh build --remaining
clean:
@echo 'Do nothing'
diff -Nru lintian-2.5.5/t/tests/cruft-updated-libtool/debian/debian/control.in lintian-2.5.6/t/tests/cruft-updated-libtool/debian/debian/control.in
--- lintian-2.5.5/t/tests/cruft-updated-libtool/debian/debian/control.in 2011-01-27 13:31:46.000000000 +0000
+++ lintian-2.5.6/t/tests/cruft-updated-libtool/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7), libtool
+Build-Depends: debhelper (>= 9), libtool
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/deb-format-udeb-compression/debian/debian/control.in lintian-2.5.6/t/tests/deb-format-udeb-compression/debian/debian/control.in
--- lintian-2.5.5/t/tests/deb-format-udeb-compression/debian/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/deb-format-udeb-compression/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: debian-installer
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: some-udeb
Architecture: all
diff -Nru lintian-2.5.5/t/tests/debhelper-arch-depends/debian/debian/control.in lintian-2.5.6/t/tests/debhelper-arch-depends/debian/debian/control.in
--- lintian-2.5.5/t/tests/debhelper-arch-depends/debian/debian/control.in 2011-09-16 10:22:23.000000000 +0000
+++ lintian-2.5.6/t/tests/debhelper-arch-depends/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7),
+Build-Depends: debhelper (>= 9),
cli-common-dev (>= 0.5.7) [i386 sparc amd64 ia64]
Package: {$srcpkg}
diff -Nru lintian-2.5.5/t/tests/debhelper-arch-depends/debian/debian/rules lintian-2.5.6/t/tests/debhelper-arch-depends/debian/debian/rules
--- lintian-2.5.5/t/tests/debhelper-arch-depends/debian/debian/rules 2011-01-27 13:31:46.000000000 +0000
+++ lintian-2.5.6/t/tests/debhelper-arch-depends/debian/debian/rules 2012-03-12 14:40:11.000000000 +0000
@@ -2,9 +2,7 @@
%:
dh $@
-binary: binary-arch binary-indep
-binary-arch:
-binary-indep:
- dh binary-indep --until dh_prep
+override_dh_prep:
-dh_clideps
- dh binary-indep --remaining
+ dh_prep
+
diff -Nru lintian-2.5.5/t/tests/debhelper-brace-expansion/debian/debian/rules lintian-2.5.6/t/tests/debhelper-brace-expansion/debian/debian/rules
--- lintian-2.5.5/t/tests/debhelper-brace-expansion/debian/debian/rules 2011-01-27 13:31:46.000000000 +0000
+++ lintian-2.5.6/t/tests/debhelper-brace-expansion/debian/debian/rules 2012-03-12 14:40:11.000000000 +0000
@@ -4,6 +4,5 @@
# Skip dh_install since there are braces in the install configuration file and
# it would error out on at least some systems.
-binary:
- dh binary --before dh_install
- dh binary --after dh_install
+override_dh_install:
+
diff -Nru lintian-2.5.5/t/tests/debhelper-deprecated/debian/debian/control.in lintian-2.5.6/t/tests/debhelper-deprecated/debian/debian/control.in
--- lintian-2.5.5/t/tests/debhelper-deprecated/debian/debian/control.in 2011-12-07 14:24:46.000000000 +0000
+++ lintian-2.5.6/t/tests/debhelper-deprecated/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), python-central, python-ply (>= 3.4-1~)
+Build-Depends: debhelper (>= 9), python-central, python-ply (>= 3.4-1~)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/debhelper-dh-compat/tags lintian-2.5.6/t/tests/debhelper-dh-compat/tags
--- lintian-2.5.5/t/tests/debhelper-dh-compat/tags 2011-01-27 13:31:47.000000000 +0000
+++ lintian-2.5.6/t/tests/debhelper-dh-compat/tags 2012-03-12 14:40:11.000000000 +0000
@@ -1,4 +1,4 @@
E: debhelper-dh-compat source: debhelper-compatibility-level-not-a-number '{3'
-E: debhelper-dh-compat source: declares-possibly-conflicting-debhelper-compat-versions rules='{3' compat=7
+E: debhelper-dh-compat source: declares-possibly-conflicting-debhelper-compat-versions rules='{3' compat=9
W: debhelper-dh-compat source: debian-rules-sets-DH_COMPAT line 3
W: debhelper-dh-compat source: package-uses-deprecated-debhelper-compat-version 3
diff -Nru lintian-2.5.5/t/tests/debhelper-dh-nativejava/debian/debian/control.in lintian-2.5.6/t/tests/debhelper-dh-nativejava/debian/debian/control.in
--- lintian-2.5.5/t/tests/debhelper-dh-nativejava/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/debhelper-dh-nativejava/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7), gcj-native-helper
+Build-Depends: debhelper (>= 9), gcj-native-helper
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/debhelper-dh-nativejava/debian/debian/rules lintian-2.5.6/t/tests/debhelper-dh-nativejava/debian/debian/rules
--- lintian-2.5.5/t/tests/debhelper-dh-nativejava/debian/debian/rules 2011-01-27 13:31:47.000000000 +0000
+++ lintian-2.5.6/t/tests/debhelper-dh-nativejava/debian/debian/rules 2012-03-12 14:40:11.000000000 +0000
@@ -2,9 +2,5 @@
%:
dh $@
-binary: binary-arch binary-indep
-binary-arch:
-binary-indep:
- dh binary-indep --until dh_prep
+override_dh_prep:
-dh_nativejava
- dh binary-indep --remaining
diff -Nru lintian-2.5.5/t/tests/debhelper-dh-python-helpers/debian/debian/control.in lintian-2.5.6/t/tests/debhelper-dh-python-helpers/debian/debian/control.in
--- lintian-2.5.5/t/tests/debhelper-dh-python-helpers/debian/debian/control.in 2011-12-07 14:24:46.000000000 +0000
+++ lintian-2.5.6/t/tests/debhelper-dh-python-helpers/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: python-cheshire
Section: python
diff -Nru lintian-2.5.5/t/tests/debhelper-executable-files/debian/debian/compat lintian-2.5.6/t/tests/debhelper-executable-files/debian/debian/compat
--- lintian-2.5.5/t/tests/debhelper-executable-files/debian/debian/compat 1970-01-01 00:00:00.000000000 +0000
+++ lintian-2.5.6/t/tests/debhelper-executable-files/debian/debian/compat 2012-03-12 14:40:11.000000000 +0000
@@ -0,0 +1 @@
+8
diff -Nru lintian-2.5.5/t/tests/debhelper-maintscripts-depends/debian/debian/compat lintian-2.5.6/t/tests/debhelper-maintscripts-depends/debian/debian/compat
--- lintian-2.5.5/t/tests/debhelper-maintscripts-depends/debian/debian/compat 1970-01-01 00:00:00.000000000 +0000
+++ lintian-2.5.6/t/tests/debhelper-maintscripts-depends/debian/debian/compat 2012-03-12 14:40:11.000000000 +0000
@@ -0,0 +1 @@
+7
diff -Nru lintian-2.5.5/t/tests/debhelper-maintscripts-depends/debian/debian/control.in lintian-2.5.6/t/tests/debhelper-maintscripts-depends/debian/debian/control.in
--- lintian-2.5.5/t/tests/debhelper-maintscripts-depends/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/debhelper-maintscripts-depends/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7.0.50~)
Package: debhelper-maint
Architecture: all
diff -Nru lintian-2.5.5/t/tests/debhelper-misc-depends-fp/debian/debian/control.in lintian-2.5.6/t/tests/debhelper-misc-depends-fp/debian/debian/control.in
--- lintian-2.5.5/t/tests/debhelper-misc-depends-fp/debian/debian/control.in 2011-12-07 14:24:46.000000000 +0000
+++ lintian-2.5.6/t/tests/debhelper-misc-depends-fp/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/debhelper-override-depends/debian/debian/compat lintian-2.5.6/t/tests/debhelper-override-depends/debian/debian/compat
--- lintian-2.5.5/t/tests/debhelper-override-depends/debian/debian/compat 1970-01-01 00:00:00.000000000 +0000
+++ lintian-2.5.6/t/tests/debhelper-override-depends/debian/debian/compat 2012-03-12 14:40:11.000000000 +0000
@@ -0,0 +1 @@
+7
diff -Nru lintian-2.5.5/t/tests/debhelper-unused-cdbs/debian/debian/control.in lintian-2.5.6/t/tests/debhelper-unused-cdbs/debian/debian/control.in
--- lintian-2.5.5/t/tests/debhelper-unused-cdbs/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/debhelper-unused-cdbs/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7), cdbs
+Build-Depends: debhelper (>= 9), cdbs
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/description-empty-paragraph/debian/debian/control.in lintian-2.5.6/t/tests/description-empty-paragraph/debian/debian/control.in
--- lintian-2.5.5/t/tests/description-empty-paragraph/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/description-empty-paragraph/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/description-general/debian/debian/control.in lintian-2.5.6/t/tests/description-general/debian/debian/control.in
--- lintian-2.5.5/t/tests/description-general/debian/debian/control.in 2011-12-07 14:24:46.000000000 +0000
+++ lintian-2.5.6/t/tests/description-general/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/description-homepage/debian/debian/control.in lintian-2.5.6/t/tests/description-homepage/debian/debian/control.in
--- lintian-2.5.5/t/tests/description-homepage/debian/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/description-homepage/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/description-wording/debian/debian/control.in lintian-2.5.6/t/tests/description-wording/debian/debian/control.in
--- lintian-2.5.5/t/tests/description-wording/debian/debian/control.in 2011-01-27 13:31:47.000000000 +0000
+++ lintian-2.5.6/t/tests/description-wording/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/fields-aspell/debian/debian/control.in lintian-2.5.6/t/tests/fields-aspell/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-aspell/debian/debian/control.in 2012-02-21 09:30:11.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-aspell/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: aspell-en
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/fields-bad-homepage/debian/debian/control.in lintian-2.5.6/t/tests/fields-bad-homepage/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-bad-homepage/debian/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-bad-homepage/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
# Whoops, typo
Homepage: ttp://lintian.debian.org/
diff -Nru lintian-2.5.5/t/tests/fields-build-depends-general/debian/debian/control.in lintian-2.5.6/t/tests/fields-build-depends-general/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-build-depends-general/debian/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-build-depends-general/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), bd-conflict, revision-1 (>= 1.0-1),
+Build-Depends: debhelper (>= 9), bd-conflict, revision-1 (>= 1.0-1),
bash, make, x-dev, build-essential, new-package | xlibmesa-gl-dev,
xorg-dev, java-propose-classpath, python3.2-dev, foo [all],
bar [i386 any], baz [source i3!86], baz [i386 !amd64],
diff -Nru lintian-2.5.5/t/tests/fields-cpan-homepage/debian/debian/control.in lintian-2.5.6/t/tests/fields-cpan-homepage/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-cpan-homepage/debian/debian/control.in 2011-01-27 13:31:48.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-cpan-homepage/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Homepage: http://search.cpan.org/Foo-Bar-9.0_01/
Package: {$srcpkg}
diff -Nru lintian-2.5.5/t/tests/fields-debug-bad/debian/debian/control.in lintian-2.5.6/t/tests/fields-debug-bad/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-debug-bad/debian/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-debug-bad/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/fields-depends-general/debian/debian/control.in lintian-2.5.6/t/tests/fields-depends-general/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-depends-general/debian/debian/control.in 2012-02-21 09:30:11.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-depends-general/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/fields-depends-metapackage/debian/debian/control.in lintian-2.5.6/t/tests/fields-depends-metapackage/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-depends-metapackage/debian/debian/control.in 2011-01-27 13:31:48.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-depends-metapackage/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), xorg-dev
+Build-Depends: debhelper (>= 9), xorg-dev
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/fields-depends-wildcard/debian/debian/control.in lintian-2.5.6/t/tests/fields-depends-wildcard/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-depends-wildcard/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-depends-wildcard/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/fields-dmua/debian/debian/control.in lintian-2.5.6/t/tests/fields-dmua/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-dmua/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-dmua/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
DM-Upload-Allowed: no
Package: {$srcpkg}
diff -Nru lintian-2.5.5/t/tests/fields-doc-pkg-wrong-arch/debian/debian/control.in lintian-2.5.6/t/tests/fields-doc-pkg-wrong-arch/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-doc-pkg-wrong-arch/debian/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-doc-pkg-wrong-arch/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: doc
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}-doc
Architecture: any
diff -Nru lintian-2.5.5/t/tests/fields-duplicate-build/debian/debian/control.in lintian-2.5.6/t/tests/fields-duplicate-build/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-duplicate-build/debian/debian/control.in 2011-01-27 13:31:48.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-duplicate-build/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), perl (>= 5.10) | libmodule-build-perl
+Build-Depends: debhelper (>= 9), perl (>= 5.10) | libmodule-build-perl
Build-Depends-Indep: perl (>= 5.10)
Package: {$srcpkg}
diff -Nru lintian-2.5.5/t/tests/fields-essential/debian/debian/control.in lintian-2.5.6/t/tests/fields-essential/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-essential/debian/debian/control.in 2011-01-27 13:31:48.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-essential/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -4,7 +4,7 @@
Maintainer: {$author}
Standards-Version: {$standards_version}
XS-Essential: no
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Essential: yes
diff -Nru lintian-2.5.5/t/tests/fields-essential/debian/debian/rules lintian-2.5.6/t/tests/fields-essential/debian/debian/rules
--- lintian-2.5.5/t/tests/fields-essential/debian/debian/rules 2011-01-27 13:31:48.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-essential/debian/debian/rules 2012-03-12 14:40:11.000000000 +0000
@@ -3,8 +3,7 @@
export DH_VERBOSE=1
%:
dh $@
-binary:
- dh --before dh_builddeb binary
+
+override_dh_builddeb:
dh_builddeb --package=$(pkg)
dpkg-deb --nocheck --build debian/$(pkg)2 ../$(pkg)2_1.0_all.deb
- dh --after dh_builddeb binary
diff -Nru lintian-2.5.5/t/tests/fields-essential-yes-source/debian/debian/control.in lintian-2.5.6/t/tests/fields-essential-yes-source/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-essential-yes-source/debian/debian/control.in 2011-01-27 13:31:48.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-essential-yes-source/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -4,7 +4,7 @@
Maintainer: {$author}
Standards-Version: {$standards_version}
Essential: yes
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/fields-indep-without-arch-indep/debian/debian/control.in lintian-2.5.6/t/tests/fields-indep-without-arch-indep/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-indep-without-arch-indep/debian/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-indep-without-arch-indep/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Build-Depends-Indep: some-package
Package: {$srcpkg}
diff -Nru lintian-2.5.5/t/tests/fields-java/debian/debian/control.in lintian-2.5.6/t/tests/fields-java/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-java/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-java/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: java
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), openjdk-6-doc
+Build-Depends: debhelper (>= 9), openjdk-6-doc
Package: lib{$srcpkg}-java
Architecture: all
diff -Nru lintian-2.5.5/t/tests/fields-maintainer/debian/debian/control.in lintian-2.5.6/t/tests/fields-maintainer/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-maintainer/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-maintainer/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -4,7 +4,7 @@
Maintainer: Mrs. Localhost
Uploaders: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/fields-maintainer-bounces/debian/debian/control.in lintian-2.5.6/t/tests/fields-maintainer-bounces/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-maintainer-bounces/debian/debian/control.in 2011-12-07 14:24:46.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-maintainer-bounces/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -5,7 +5,7 @@
Uploaders: I Will Loop ,
I Will Loop Too
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/fields-maintainer-general/debian/debian/control.in lintian-2.5.6/t/tests/fields-maintainer-general/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-maintainer-general/debian/debian/control.in 2011-12-07 14:24:46.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-maintainer-general/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -8,7 +8,7 @@
Mr. Missing Comma
Mrs. Missing Comma
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/fields-malformed-vcs-fields/debian/debian/control.in lintian-2.5.6/t/tests/fields-malformed-vcs-fields/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-malformed-vcs-fields/debian/debian/control.in 2011-01-27 13:31:48.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-malformed-vcs-fields/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Vcs-Browser: svn.debian.org/wsvn/foobar/trunk
Vcs-Svn: svn+ssh://svn.debian.org/svn/foobar/trunk
diff -Nru lintian-2.5.5/t/tests/fields-multi-arch/debian/debian/control.in lintian-2.5.6/t/tests/fields-multi-arch/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-multi-arch/debian/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-multi-arch/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}-same
Architecture: any
diff -Nru lintian-2.5.5/t/tests/fields-multiple-x-deps/debian/debian/control.in lintian-2.5.6/t/tests/fields-multiple-x-deps/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-multiple-x-deps/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-multiple-x-deps/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/fields-no-homepage/debian/debian/control.in lintian-2.5.6/t/tests/fields-no-homepage/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-no-homepage/debian/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-no-homepage/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/fields-perl-provides/debian/debian/control.in lintian-2.5.6/t/tests/fields-perl-provides/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-perl-provides/debian/debian/control.in 2011-12-07 14:24:46.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-perl-provides/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: libsys-syslog-perl
Section: perl
diff -Nru lintian-2.5.5/t/tests/fields-qa-maint-address/debian/debian/control.in lintian-2.5.6/t/tests/fields-qa-maint-address/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-qa-maint-address/debian/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-qa-maint-address/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: devel
Maintainer: Debian QA Group
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: all
diff -Nru lintian-2.5.5/t/tests/fields-qa-maint-name/debian/debian/control.in lintian-2.5.6/t/tests/fields-qa-maint-name/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-qa-maint-name/debian/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-qa-maint-name/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: devel
Maintainer: Debian QA
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: all
diff -Nru lintian-2.5.5/t/tests/fields-redundant/debian/debian/control.in lintian-2.5.6/t/tests/fields-redundant/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-redundant/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-redundant/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Bugs: debbugs://bugs.debian.org/
Origin: debian
diff -Nru lintian-2.5.5/t/tests/fields-section-general/debian/debian/control.in lintian-2.5.6/t/tests/fields-section-general/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-section-general/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-section-general/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: contrib/{$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: all
diff -Nru lintian-2.5.5/t/tests/fields-section-udeb/debian/debian/control.in lintian-2.5.6/t/tests/fields-section-udeb/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-section-udeb/debian/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-section-udeb/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: all
diff -Nru lintian-2.5.5/t/tests/fields-transitional/debian/debian/control.in lintian-2.5.6/t/tests/fields-transitional/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-transitional/debian/debian/control.in 2011-12-07 14:24:46.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-transitional/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: all
diff -Nru lintian-2.5.5/t/tests/fields-unknown-obsolete-fields/debian/debian/control.in lintian-2.5.6/t/tests/fields-unknown-obsolete-fields/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-unknown-obsolete-fields/debian/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-unknown-obsolete-fields/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
XS-Comment: This is random comment ending up in the dsc file.
Package: {$srcpkg}
diff -Nru lintian-2.5.5/t/tests/fields-uploaders/debian/debian/control.in lintian-2.5.6/t/tests/fields-uploaders/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-uploaders/debian/debian/control.in 2012-02-21 09:30:11.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-uploaders/debian/debian/control.in 2012-03-13 18:52:14.000000000 +0000
@@ -6,9 +6,10 @@
Mr. Weird,
Malformed Email <@ddress@myspace.com>,
John A. J. Doe ,
- Doris Double-Email >
+ Doris Double-Email >,
+ Valid email <0@somehwere.com>
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/fields-vcs-fields/debian/debian/control.in lintian-2.5.6/t/tests/fields-vcs-fields/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-vcs-fields/debian/debian/control.in 2011-01-27 13:31:48.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-vcs-fields/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Vcs-Browser: https://svn.debian.org/wsvn/foobar/trunk
Vcs-Svn: svn://svn.debian.org/svn/foobar/trunk
Vcs-Mtn: www.example.org org.debian.foobar
diff -Nru lintian-2.5.5/t/tests/fields-virtual-packages/debian/debian/control.in lintian-2.5.6/t/tests/fields-virtual-packages/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-virtual-packages/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-virtual-packages/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: any
diff -Nru lintian-2.5.5/t/tests/fields-wrong-section/debian/debian/control.in lintian-2.5.6/t/tests/fields-wrong-section/debian/debian/control.in
--- lintian-2.5.5/t/tests/fields-wrong-section/debian/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/fields-wrong-section/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: any
diff -Nru lintian-2.5.5/t/tests/files-arch-indep-not-marked-all/debian/debian/control.in lintian-2.5.6/t/tests/files-arch-indep-not-marked-all/debian/debian/control.in
--- lintian-2.5.5/t/tests/files-arch-indep-not-marked-all/debian/debian/control.in 2011-12-07 14:24:46.000000000 +0000
+++ lintian-2.5.6/t/tests/files-arch-indep-not-marked-all/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/files-bad-perm-owner/debian/debian/control.in lintian-2.5.6/t/tests/files-bad-perm-owner/debian/debian/control.in
--- lintian-2.5.5/t/tests/files-bad-perm-owner/debian/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/files-bad-perm-owner/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: binary
Architecture: all
diff -Nru lintian-2.5.5/t/tests/files-empty/debian/debian/control.in lintian-2.5.6/t/tests/files-empty/debian/debian/control.in
--- lintian-2.5.5/t/tests/files-empty/debian/debian/control.in 2011-01-27 13:31:49.000000000 +0000
+++ lintian-2.5.6/t/tests/files-empty/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/files-flash-non-free/debian/debian/control.in lintian-2.5.6/t/tests/files-flash-non-free/debian/debian/control.in
--- lintian-2.5.5/t/tests/files-flash-non-free/debian/debian/control.in 2011-01-27 13:31:49.000000000 +0000
+++ lintian-2.5.6/t/tests/files-flash-non-free/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Homepage: http://lintian.debian.org/
Package: {$srcpkg}
diff -Nru lintian-2.5.5/t/tests/files-fonts/debian/debian/control.in lintian-2.5.6/t/tests/files-fonts/debian/debian/control.in
--- lintian-2.5.5/t/tests/files-fonts/debian/debian/control.in 2012-02-21 09:30:11.000000000 +0000
+++ lintian-2.5.6/t/tests/files-fonts/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Homepage: http://lintian.debian.org/
Package: {$srcpkg}
diff -Nru lintian-2.5.5/t/tests/files-games-section/debian/debian/control.in lintian-2.5.6/t/tests/files-games-section/debian/debian/control.in
--- lintian-2.5.5/t/tests/files-games-section/debian/debian/control.in 2012-02-21 09:30:11.000000000 +0000
+++ lintian-2.5.6/t/tests/files-games-section/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}-both
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/files-gzip/debian/debian/rules lintian-2.5.6/t/tests/files-gzip/debian/debian/rules
--- lintian-2.5.5/t/tests/files-gzip/debian/debian/rules 2011-01-27 13:31:49.000000000 +0000
+++ lintian-2.5.6/t/tests/files-gzip/debian/debian/rules 2012-03-12 14:40:11.000000000 +0000
@@ -2,7 +2,7 @@
pkg=files-gzip
%:
dh $@
-binary:
- dh --until install binary
+
+override_dh_installdocs:
+ dh_installdocs
echo "Hello world :)" > debian/$(pkg)/usr/share/doc/$(pkg)/changelog.gz
- dh --after install binary
diff -Nru lintian-2.5.5/t/tests/files-gzip-ma-same/debian/debian/control.in lintian-2.5.6/t/tests/files-gzip-ma-same/debian/debian/control.in
--- lintian-2.5.5/t/tests/files-gzip-ma-same/debian/debian/control.in 2011-12-07 14:24:46.000000000 +0000
+++ lintian-2.5.6/t/tests/files-gzip-ma-same/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: any
diff -Nru lintian-2.5.5/t/tests/files-hardlinks/debian/debian/rules lintian-2.5.6/t/tests/files-hardlinks/debian/debian/rules
--- lintian-2.5.5/t/tests/files-hardlinks/debian/debian/rules 1970-01-01 00:00:00.000000000 +0000
+++ lintian-2.5.6/t/tests/files-hardlinks/debian/debian/rules 2012-03-12 17:11:45.000000000 +0000
@@ -0,0 +1,14 @@
+#!/usr/bin/make -f
+PKG:=files-hardlinks
+DIR:=$(CURDIR)/debian/$(PKG)/usr/share/$(PKG)
+
+%:
+ dh $@
+
+override_dh_install:
+ dh_install
+ mkdir -p $(DIR)/1st $(DIR)/2nd $(DIR)/3rd $(DIR)/4th
+ echo "Hallo world" > $(DIR)/3rd/orig
+ ln $(DIR)/3rd/orig $(DIR)/4th/link1
+ ln $(DIR)/4th/link1 $(DIR)/1st/link2
+ ln $(DIR)/3rd/orig $(DIR)/2nd/link3
diff -Nru lintian-2.5.5/t/tests/files-hardlinks/desc lintian-2.5.6/t/tests/files-hardlinks/desc
--- lintian-2.5.5/t/tests/files-hardlinks/desc 1970-01-01 00:00:00.000000000 +0000
+++ lintian-2.5.6/t/tests/files-hardlinks/desc 2012-03-12 17:11:45.000000000 +0000
@@ -0,0 +1,5 @@
+Testname: files-hardlinks
+Sequence: 6000
+Version: 1.0
+Description: Test for (stable) handling of hardlinks
+Test-For: package-contains-hardlink
diff -Nru lintian-2.5.5/t/tests/files-hardlinks/tags lintian-2.5.6/t/tests/files-hardlinks/tags
--- lintian-2.5.5/t/tests/files-hardlinks/tags 1970-01-01 00:00:00.000000000 +0000
+++ lintian-2.5.6/t/tests/files-hardlinks/tags 2012-03-12 17:11:45.000000000 +0000
@@ -0,0 +1,3 @@
+W: files-hardlinks: package-contains-hardlink usr/share/files-hardlinks/1st/link2 -> usr/share/files-hardlinks/2nd/link3
+W: files-hardlinks: package-contains-hardlink usr/share/files-hardlinks/1st/link2 -> usr/share/files-hardlinks/3rd/orig
+W: files-hardlinks: package-contains-hardlink usr/share/files-hardlinks/1st/link2 -> usr/share/files-hardlinks/4th/link1
diff -Nru lintian-2.5.5/t/tests/files-multiarch-missing-pre-deps/debian/debian/control.in lintian-2.5.6/t/tests/files-multiarch-missing-pre-deps/debian/debian/control.in
--- lintian-2.5.5/t/tests/files-multiarch-missing-pre-deps/debian/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/files-multiarch-missing-pre-deps/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: libs
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: libbasic2
Architecture: any
diff -Nru lintian-2.5.5/t/tests/files-multiarch-so-script/debian/debian/control.in lintian-2.5.6/t/tests/files-multiarch-so-script/debian/debian/control.in
--- lintian-2.5.5/t/tests/files-multiarch-so-script/debian/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/files-multiarch-so-script/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: libs
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: libbasic2
Architecture: any
diff -Nru lintian-2.5.5/t/tests/files-python-general/debian/debian/compat lintian-2.5.6/t/tests/files-python-general/debian/debian/compat
--- lintian-2.5.5/t/tests/files-python-general/debian/debian/compat 1970-01-01 00:00:00.000000000 +0000
+++ lintian-2.5.6/t/tests/files-python-general/debian/debian/compat 2012-03-12 14:40:11.000000000 +0000
@@ -0,0 +1 @@
+7
diff -Nru lintian-2.5.5/t/tests/files-python-helpers/debian/debian/control.in lintian-2.5.6/t/tests/files-python-helpers/debian/debian/control.in
--- lintian-2.5.5/t/tests/files-python-helpers/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/files-python-helpers/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: python
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: python-foo
Architecture: all
diff -Nru lintian-2.5.5/t/tests/files-python-modules/debian/debian/control.in lintian-2.5.6/t/tests/files-python-modules/debian/debian/control.in
--- lintian-2.5.5/t/tests/files-python-modules/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/files-python-modules/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: python
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: python-foo
Architecture: all
diff -Nru lintian-2.5.5/t/tests/files-uses-perl4-libs-with-dep/debian/debian/control.in lintian-2.5.6/t/tests/files-uses-perl4-libs-with-dep/debian/debian/control.in
--- lintian-2.5.5/t/tests/files-uses-perl4-libs-with-dep/debian/debian/control.in 2011-12-07 14:24:47.000000000 +0000
+++ lintian-2.5.6/t/tests/files-uses-perl4-libs-with-dep/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/files-uses-perl4-libs-without-dep/debian/debian/control.in lintian-2.5.6/t/tests/files-uses-perl4-libs-without-dep/debian/debian/control.in
--- lintian-2.5.5/t/tests/files-uses-perl4-libs-without-dep/debian/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/files-uses-perl4-libs-without-dep/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), perl
+Build-Depends: debhelper (>= 9), perl
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/group-checks-circular-deps/debian/debian/control.in lintian-2.5.6/t/tests/group-checks-circular-deps/debian/debian/control.in
--- lintian-2.5.5/t/tests/group-checks-circular-deps/debian/debian/control.in 2011-12-07 14:24:47.000000000 +0000
+++ lintian-2.5.6/t/tests/group-checks-circular-deps/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: root
Architecture: all
diff -Nru lintian-2.5.5/t/tests/group-checks-file-conflict/debian/debian/control.in lintian-2.5.6/t/tests/group-checks-file-conflict/debian/debian/control.in
--- lintian-2.5.5/t/tests/group-checks-file-conflict/debian/debian/control.in 2012-02-21 09:30:11.000000000 +0000
+++ lintian-2.5.6/t/tests/group-checks-file-conflict/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: pkga
Architecture: all
diff -Nru lintian-2.5.5/t/tests/group-checks-multi-arch/debian/debian/control.in lintian-2.5.6/t/tests/group-checks-multi-arch/debian/debian/control.in
--- lintian-2.5.5/t/tests/group-checks-multi-arch/debian/debian/control.in 2012-02-21 09:30:11.000000000 +0000
+++ lintian-2.5.6/t/tests/group-checks-multi-arch/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: pkg-foreign
Architecture: all
diff -Nru lintian-2.5.5/t/tests/group-checks-wrong-priorities/debian/debian/control.in lintian-2.5.6/t/tests/group-checks-wrong-priorities/debian/debian/control.in
--- lintian-2.5.5/t/tests/group-checks-wrong-priorities/debian/debian/control.in 2011-12-07 14:24:47.000000000 +0000
+++ lintian-2.5.6/t/tests/group-checks-wrong-priorities/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: pkg-optional
Architecture: all
diff -Nru lintian-2.5.5/t/tests/init.d-general/debian/debian/control.in lintian-2.5.6/t/tests/init.d-general/debian/debian/control.in
--- lintian-2.5.5/t/tests/init.d-general/debian/debian/control.in 2011-01-27 13:31:50.000000000 +0000
+++ lintian-2.5.6/t/tests/init.d-general/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/init.d-lsb-headers/debian/debian/control.in lintian-2.5.6/t/tests/init.d-lsb-headers/debian/debian/control.in
--- lintian-2.5.5/t/tests/init.d-lsb-headers/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/init.d-lsb-headers/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/init.d-script-registration/debian/debian/rules lintian-2.5.6/t/tests/init.d-script-registration/debian/debian/rules
--- lintian-2.5.5/t/tests/init.d-script-registration/debian/debian/rules 2011-01-27 13:31:50.000000000 +0000
+++ lintian-2.5.6/t/tests/init.d-script-registration/debian/debian/rules 2012-03-12 14:40:11.000000000 +0000
@@ -1,10 +1,9 @@
#!/usr/bin/make -f
%:
- dh $*
+ dh $@
-binary:
- dh $@ --until dh_fixperms
+override_dh_fixperms:
+ dh_fixperms
chmod -x debian/init.d-script-registration/etc/init.d/README
chmod -x debian/init.d-script-registration/etc/init.d/skeleton
- dh $@ --remaining
diff -Nru lintian-2.5.5/t/tests/java-classpath/debian/debian/control.in lintian-2.5.6/t/tests/java-classpath/debian/debian/control.in
--- lintian-2.5.5/t/tests/java-classpath/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/java-classpath/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), javahelper (>= 0.32~), default-jdk
+Build-Depends: debhelper (>= 9), javahelper (>= 0.32~), default-jdk
Package: libcp-missing-java
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/java-jars/debian/debian/control.in lintian-2.5.6/t/tests/java-jars/debian/debian/control.in
--- lintian-2.5.5/t/tests/java-jars/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/java-jars/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), javahelper, default-jdk
+Build-Depends: debhelper (>= 9), javahelper, default-jdk
Package: libtesta-java
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/lintian-check-tags-file/debian/debian/control.in lintian-2.5.6/t/tests/lintian-check-tags-file/debian/debian/control.in
--- lintian-2.5.5/t/tests/lintian-check-tags-file/debian/debian/control.in 2011-01-27 13:31:50.000000000 +0000
+++ lintian-2.5.6/t/tests/lintian-check-tags-file/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Section: unknown
diff -Nru lintian-2.5.5/t/tests/lintian-display-level/debian/debian/control.in lintian-2.5.6/t/tests/lintian-display-level/debian/debian/control.in
--- lintian-2.5.5/t/tests/lintian-display-level/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/lintian-display-level/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/lintian-ftp-rejects/debian/debian/control.in lintian-2.5.6/t/tests/lintian-ftp-rejects/debian/debian/control.in
--- lintian-2.5.5/t/tests/lintian-ftp-rejects/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/lintian-ftp-rejects/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/lintian-output-colons/debian/debian/control.in lintian-2.5.6/t/tests/lintian-output-colons/debian/debian/control.in
--- lintian-2.5.5/t/tests/lintian-output-colons/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/lintian-output-colons/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/lintian-output-letter/debian/debian/control.in lintian-2.5.6/t/tests/lintian-output-letter/debian/debian/control.in
--- lintian-2.5.5/t/tests/lintian-output-letter/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/lintian-output-letter/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/lintian-output-xml/debian/debian/control.in lintian-2.5.6/t/tests/lintian-output-xml/debian/debian/control.in
--- lintian-2.5.5/t/tests/lintian-output-xml/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/lintian-output-xml/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/lintian-overrides/debian/debian/rules lintian-2.5.6/t/tests/lintian-overrides/debian/debian/rules
--- lintian-2.5.5/t/tests/lintian-overrides/debian/debian/rules 2011-01-27 13:31:51.000000000 +0000
+++ lintian-2.5.6/t/tests/lintian-overrides/debian/debian/rules 2012-03-12 14:40:11.000000000 +0000
@@ -5,9 +5,8 @@
%:
dh $@
-binary:
- dh binary --before install
+override_dh_fixperms:
install -D -m 0644 $(CURDIR)/debian/overrides \
$(CURDIR)/debian/$(pkg)/usr/share/lintian/overrides/$(pkg)
dh_fixperms
- dh binary --remaining
+
diff -Nru lintian-2.5.5/t/tests/lintian-suppress-tags/debian/debian/control.in lintian-2.5.6/t/tests/lintian-suppress-tags/debian/debian/control.in
--- lintian-2.5.5/t/tests/lintian-suppress-tags/debian/debian/control.in 2011-01-27 13:31:51.000000000 +0000
+++ lintian-2.5.6/t/tests/lintian-suppress-tags/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Section: unknown
diff -Nru lintian-2.5.5/t/tests/manpages-dependencies/debian/debian/control.in lintian-2.5.6/t/tests/manpages-dependencies/debian/debian/control.in
--- lintian-2.5.5/t/tests/manpages-dependencies/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/manpages-dependencies/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: pecho
Architecture: all
diff -Nru lintian-2.5.5/t/tests/menu-format-general/debian/debian/control.in lintian-2.5.6/t/tests/menu-format-general/debian/debian/control.in
--- lintian-2.5.5/t/tests/menu-format-general/debian/debian/control.in 2011-11-29 19:31:23.000000000 +0000
+++ lintian-2.5.6/t/tests/menu-format-general/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: menu-none
Architecture: all
diff -Nru lintian-2.5.5/t/tests/menus-doc-base-registration/debian/debian/control.in lintian-2.5.6/t/tests/menus-doc-base-registration/debian/debian/control.in
--- lintian-2.5.5/t/tests/menus-doc-base-registration/debian/debian/control.in 2011-01-27 13:31:52.000000000 +0000
+++ lintian-2.5.6/t/tests/menus-doc-base-registration/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}-pdf
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/ocaml-general/debian/debian/control.in lintian-2.5.6/t/tests/ocaml-general/debian/debian/control.in
--- lintian-2.5.5/t/tests/ocaml-general/debian/debian/control.in 2011-01-27 13:31:52.000000000 +0000
+++ lintian-2.5.6/t/tests/ocaml-general/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: libocaml-general-ocaml
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/patch-systems-dpatch-description/debian/debian/control.in lintian-2.5.6/t/tests/patch-systems-dpatch-description/debian/debian/control.in
--- lintian-2.5.5/t/tests/patch-systems-dpatch-description/debian/debian/control.in 2011-01-27 13:31:53.000000000 +0000
+++ lintian-2.5.6/t/tests/patch-systems-dpatch-description/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), dpatch
+Build-Depends: debhelper (>= 9), dpatch
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/patch-systems-empty-series/debian/debian/control.in lintian-2.5.6/t/tests/patch-systems-empty-series/debian/debian/control.in
--- lintian-2.5.5/t/tests/patch-systems-empty-series/debian/debian/control.in 2011-01-27 13:31:53.000000000 +0000
+++ lintian-2.5.6/t/tests/patch-systems-empty-series/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: quilt, debhelper (>= 7)
+Build-Depends: quilt, debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/patch-systems-no-readme-source/debian/debian/control.in lintian-2.5.6/t/tests/patch-systems-no-readme-source/debian/debian/control.in
--- lintian-2.5.5/t/tests/patch-systems-no-readme-source/debian/debian/control.in 2011-01-27 13:31:53.000000000 +0000
+++ lintian-2.5.6/t/tests/patch-systems-no-readme-source/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: quilt, debhelper (>= 7)
+Build-Depends: quilt, debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/patch-systems-quilt-description/debian/debian/control.in lintian-2.5.6/t/tests/patch-systems-quilt-description/debian/debian/control.in
--- lintian-2.5.5/t/tests/patch-systems-quilt-description/debian/debian/control.in 2011-01-27 13:31:53.000000000 +0000
+++ lintian-2.5.6/t/tests/patch-systems-quilt-description/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: quilt, debhelper (>= 7)
+Build-Depends: quilt, debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/patch-systems-quilt-general/debian/debian/control.in lintian-2.5.6/t/tests/patch-systems-quilt-general/debian/debian/control.in
--- lintian-2.5.5/t/tests/patch-systems-quilt-general/debian/debian/control.in 2011-01-27 13:31:53.000000000 +0000
+++ lintian-2.5.6/t/tests/patch-systems-quilt-general/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), quilt, dpatch
+Build-Depends: debhelper (>= 9), quilt, dpatch
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/patch-systems-quilt-no-series/debian/debian/control.in lintian-2.5.6/t/tests/patch-systems-quilt-no-series/debian/debian/control.in
--- lintian-2.5.5/t/tests/patch-systems-quilt-no-series/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/patch-systems-quilt-no-series/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: quilt, debhelper (>= 7)
+Build-Depends: quilt, debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/patch-systems-quilt-source/debian/debian/control.in lintian-2.5.6/t/tests/patch-systems-quilt-source/debian/debian/control.in
--- lintian-2.5.5/t/tests/patch-systems-quilt-source/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/patch-systems-quilt-source/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), quilt
+Build-Depends: debhelper (>= 9), quilt
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/rules-build-dep-pattern/debian/debian/control.in lintian-2.5.6/t/tests/rules-build-dep-pattern/debian/debian/control.in
--- lintian-2.5.5/t/tests/rules-build-dep-pattern/debian/debian/control.in 2011-01-27 13:31:53.000000000 +0000
+++ lintian-2.5.6/t/tests/rules-build-dep-pattern/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/rules-dh-unused-target-nonempty/debian/debian/rules lintian-2.5.6/t/tests/rules-dh-unused-target-nonempty/debian/debian/rules
--- lintian-2.5.5/t/tests/rules-dh-unused-target-nonempty/debian/debian/rules 2011-01-27 13:31:53.000000000 +0000
+++ lintian-2.5.6/t/tests/rules-dh-unused-target-nonempty/debian/debian/rules 2012-03-12 14:40:11.000000000 +0000
@@ -1,6 +1,9 @@
#!/usr/bin/make -f
build: build-stamp
+build-arch:
+build-indep:
+
build-stamp:
dh build
touch $@
@@ -23,4 +26,4 @@
binary: binary-arch binary-indep
-.PHONY: binary binary-arch binary-indep install clean build
+.PHONY: binary binary-arch binary-indep install clean build build-arch build-indep
diff -Nru lintian-2.5.5/t/tests/rules-dh-unused-target-nonempty/tags lintian-2.5.6/t/tests/rules-dh-unused-target-nonempty/tags
--- lintian-2.5.5/t/tests/rules-dh-unused-target-nonempty/tags 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/rules-dh-unused-target-nonempty/tags 2012-03-12 14:40:11.000000000 +0000
@@ -1,3 +1 @@
W: rules-dh-unused-target-nonempty source: binary-arch-rules-but-pkg-is-arch-indep
-W: rules-dh-unused-target-nonempty source: debian-rules-missing-recommended-target build-arch
-W: rules-dh-unused-target-nonempty source: debian-rules-missing-recommended-target build-indep
diff -Nru lintian-2.5.5/t/tests/rules-general/debian/debian/control.in lintian-2.5.6/t/tests/rules-general/debian/debian/control.in
--- lintian-2.5.5/t/tests/rules-general/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/rules-general/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends-Indep: debhelper (>= 7.0.50~), python
+Build-Depends-Indep: debhelper (>= 9), python
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/rules-general/debian/debian/rules lintian-2.5.6/t/tests/rules-general/debian/debian/rules
--- lintian-2.5.5/t/tests/rules-general/debian/debian/rules 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/rules-general/debian/debian/rules 2012-03-12 14:40:11.000000000 +0000
@@ -5,9 +5,6 @@
%:
dh $@
-override_dh_python:
- dh_python2
-
clean:
dh_clean
echo $(DEB_BUILD_OPTS) $(PWD)
diff -Nru lintian-2.5.5/t/tests/rules-general/tags lintian-2.5.6/t/tests/rules-general/tags
--- lintian-2.5.5/t/tests/rules-general/tags 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/rules-general/tags 2012-03-12 14:40:11.000000000 +0000
@@ -1,4 +1,4 @@
E: rules-general source: clean-should-be-satisfied-by-build-depends debhelper
E: rules-general source: debian-rules-automatically-updates-control line 3
-W: rules-general source: debian-rules-uses-DEB_BUILD_OPTS line 13
-W: rules-general source: debian-rules-uses-pwd line 13
+W: rules-general source: debian-rules-uses-DEB_BUILD_OPTS line 10
+W: rules-general source: debian-rules-uses-pwd line 10
diff -Nru lintian-2.5.5/t/tests/rules-including-deprecated-makefiles/debian/debian/control.in lintian-2.5.6/t/tests/rules-including-deprecated-makefiles/debian/debian/control.in
--- lintian-2.5.5/t/tests/rules-including-deprecated-makefiles/debian/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/rules-including-deprecated-makefiles/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), cdbs
+Build-Depends: debhelper (>= 9), cdbs
Package: {$srcpkg}
Architecture: all
diff -Nru lintian-2.5.5/t/tests/rules-missing-targets/debian/debian/control.in lintian-2.5.6/t/tests/rules-missing-targets/debian/debian/control.in
--- lintian-2.5.5/t/tests/rules-missing-targets/debian/debian/control.in 2011-12-07 14:24:47.000000000 +0000
+++ lintian-2.5.6/t/tests/rules-missing-targets/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: any
diff -Nru lintian-2.5.5/t/tests/scripts-control-interpreters/debian/debian/control.in lintian-2.5.6/t/tests/scripts-control-interpreters/debian/debian/control.in
--- lintian-2.5.5/t/tests/scripts-control-interpreters/debian/debian/control.in 2011-01-27 13:31:54.000000000 +0000
+++ lintian-2.5.6/t/tests/scripts-control-interpreters/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}-paths
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/scripts-interpreters/debian/debian/control.in lintian-2.5.6/t/tests/scripts-interpreters/debian/debian/control.in
--- lintian-2.5.5/t/tests/scripts-interpreters/debian/debian/control.in 2011-12-07 14:24:47.000000000 +0000
+++ lintian-2.5.6/t/tests/scripts-interpreters/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/scripts-ocamlrun/debian/debian/control.in lintian-2.5.6/t/tests/scripts-ocamlrun/debian/debian/control.in
--- lintian-2.5.5/t/tests/scripts-ocamlrun/debian/debian/control.in 2011-01-27 13:31:54.000000000 +0000
+++ lintian-2.5.6/t/tests/scripts-ocamlrun/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/scripts-uses-perl4-libs-with-dep/debian/debian/control.in lintian-2.5.6/t/tests/scripts-uses-perl4-libs-with-dep/debian/debian/control.in
--- lintian-2.5.5/t/tests/scripts-uses-perl4-libs-with-dep/debian/debian/control.in 2011-12-07 14:24:47.000000000 +0000
+++ lintian-2.5.6/t/tests/scripts-uses-perl4-libs-with-dep/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), perl
+Build-Depends: debhelper (>= 9), perl
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/scripts-uses-perl4-libs-without-dep/debian/debian/control.in lintian-2.5.6/t/tests/scripts-uses-perl4-libs-without-dep/debian/debian/control.in
--- lintian-2.5.5/t/tests/scripts-uses-perl4-libs-without-dep/debian/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/scripts-uses-perl4-libs-without-dep/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), perl
+Build-Depends: debhelper (>= 9), perl
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/shared-libs-control-file/debian/debian/control.in lintian-2.5.6/t/tests/shared-libs-control-file/debian/debian/control.in
--- lintian-2.5.5/t/tests/shared-libs-control-file/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/shared-libs-control-file/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: libs
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: libnoshf1
Architecture: any
diff -Nru lintian-2.5.5/t/tests/shared-libs-exec-bit/debian/debian/control.in lintian-2.5.6/t/tests/shared-libs-exec-bit/debian/debian/control.in
--- lintian-2.5.5/t/tests/shared-libs-exec-bit/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/shared-libs-exec-bit/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: libs
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: libexecbit1
Architecture: any
diff -Nru lintian-2.5.5/t/tests/shared-libs-exec-bit/debian/debian/rules lintian-2.5.6/t/tests/shared-libs-exec-bit/debian/debian/rules
--- lintian-2.5.5/t/tests/shared-libs-exec-bit/debian/debian/rules 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/shared-libs-exec-bit/debian/debian/rules 2012-03-12 14:40:11.000000000 +0000
@@ -1,7 +1,5 @@
#!/usr/bin/make -f
-DUPSHF:=debian/libdupshf1/DEBIAN/shlibs
-
%:
dh $@
diff -Nru lintian-2.5.5/t/tests/shared-libs-exit/debian/debian/control.in lintian-2.5.6/t/tests/shared-libs-exit/debian/debian/control.in
--- lintian-2.5.5/t/tests/shared-libs-exit/debian/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/shared-libs-exit/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: libs
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: libexecbit1
Architecture: any
diff -Nru lintian-2.5.5/t/tests/shared-libs-exit/debian/debian/rules lintian-2.5.6/t/tests/shared-libs-exit/debian/debian/rules
--- lintian-2.5.5/t/tests/shared-libs-exit/debian/debian/rules 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/shared-libs-exit/debian/debian/rules 1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#!/usr/bin/make -f
-
-DUPSHF:=debian/libdupshf1/DEBIAN/shlibs
-
-%:
- dh $@
diff -Nru lintian-2.5.5/t/tests/shared-libs-exit-fork/debian/debian/control.in lintian-2.5.6/t/tests/shared-libs-exit-fork/debian/debian/control.in
--- lintian-2.5.5/t/tests/shared-libs-exit-fork/debian/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/shared-libs-exit-fork/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: libs
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: libexecbit1
Architecture: any
diff -Nru lintian-2.5.5/t/tests/shared-libs-exit-fork/debian/debian/rules lintian-2.5.6/t/tests/shared-libs-exit-fork/debian/debian/rules
--- lintian-2.5.5/t/tests/shared-libs-exit-fork/debian/debian/rules 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/shared-libs-exit-fork/debian/debian/rules 1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#!/usr/bin/make -f
-
-DUPSHF:=debian/libdupshf1/DEBIAN/shlibs
-
-%:
- dh $@
diff -Nru lintian-2.5.5/t/tests/shared-libs-la-files/debian/debian/control.in lintian-2.5.6/t/tests/shared-libs-la-files/debian/debian/control.in
--- lintian-2.5.5/t/tests/shared-libs-la-files/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/shared-libs-la-files/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: all
diff -Nru lintian-2.5.5/t/tests/shared-libs-ldconfig-scripts/debian/debian/control.in lintian-2.5.6/t/tests/shared-libs-ldconfig-scripts/debian/debian/control.in
--- lintian-2.5.5/t/tests/shared-libs-ldconfig-scripts/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/shared-libs-ldconfig-scripts/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: libs
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: libfoo1
Architecture: any
diff -Nru lintian-2.5.5/t/tests/shared-libs-missing-ldconfig-symlink/debian/debian/control.in lintian-2.5.6/t/tests/shared-libs-missing-ldconfig-symlink/debian/debian/control.in
--- lintian-2.5.5/t/tests/shared-libs-missing-ldconfig-symlink/debian/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/shared-libs-missing-ldconfig-symlink/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: libs
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: libexecbit1
Architecture: any
diff -Nru lintian-2.5.5/t/tests/shared-libs-missing-ldconfig-symlink/debian/debian/rules lintian-2.5.6/t/tests/shared-libs-missing-ldconfig-symlink/debian/debian/rules
--- lintian-2.5.5/t/tests/shared-libs-missing-ldconfig-symlink/debian/debian/rules 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/shared-libs-missing-ldconfig-symlink/debian/debian/rules 1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#!/usr/bin/make -f
-
-DUPSHF:=debian/libdupshf1/DEBIAN/shlibs
-
-%:
- dh $@
diff -Nru lintian-2.5.5/t/tests/shared-libs-multi-arch-foreign/debian/debian/control.in lintian-2.5.6/t/tests/shared-libs-multi-arch-foreign/debian/debian/control.in
--- lintian-2.5.5/t/tests/shared-libs-multi-arch-foreign/debian/debian/control.in 2012-02-21 09:30:11.000000000 +0000
+++ lintian-2.5.6/t/tests/shared-libs-multi-arch-foreign/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: libs
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: libhallo1
Architecture: any
diff -Nru lintian-2.5.5/t/tests/shared-libs-multi-arch-foreign/debian/debian/rules lintian-2.5.6/t/tests/shared-libs-multi-arch-foreign/debian/debian/rules
--- lintian-2.5.5/t/tests/shared-libs-multi-arch-foreign/debian/debian/rules 2012-02-21 09:30:11.000000000 +0000
+++ lintian-2.5.6/t/tests/shared-libs-multi-arch-foreign/debian/debian/rules 1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#!/usr/bin/make -f
-
-DUPSHF:=debian/libdupshf1/DEBIAN/shlibs
-
-%:
- dh $@
diff -Nru lintian-2.5.5/t/tests/shared-libs-non-pic-i386/debian/debian/control.in lintian-2.5.6/t/tests/shared-libs-non-pic-i386/debian/debian/control.in
--- lintian-2.5.5/t/tests/shared-libs-non-pic-i386/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/shared-libs-non-pic-i386/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: libs
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: libbaz3-1
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/shared-libs-symbols-file/debian/debian/control.in lintian-2.5.6/t/tests/shared-libs-symbols-file/debian/debian/control.in
--- lintian-2.5.5/t/tests/shared-libs-symbols-file/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/shared-libs-symbols-file/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: libs
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: libfoo1
Architecture: any
diff -Nru lintian-2.5.5/t/tests/shared-libs-unversioned/debian/debian/control.in lintian-2.5.6/t/tests/shared-libs-unversioned/debian/debian/control.in
--- lintian-2.5.5/t/tests/shared-libs-unversioned/debian/debian/control.in 2011-01-27 13:31:55.000000000 +0000
+++ lintian-2.5.6/t/tests/shared-libs-unversioned/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: libs
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: libfoo
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/spelling-multiword/debian/debian/control.in lintian-2.5.6/t/tests/spelling-multiword/debian/debian/control.in
--- lintian-2.5.5/t/tests/spelling-multiword/debian/debian/control.in 2012-02-21 09:30:11.000000000 +0000
+++ lintian-2.5.6/t/tests/spelling-multiword/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/spelling-package-name/debian/debian/control.in lintian-2.5.6/t/tests/spelling-package-name/debian/debian/control.in
--- lintian-2.5.5/t/tests/spelling-package-name/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/spelling-package-name/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: nam
Architecture: all
diff -Nru lintian-2.5.5/t/tests/standards-version-invalid/debian/debian/control.in lintian-2.5.6/t/tests/standards-version-invalid/debian/debian/control.in
--- lintian-2.5.5/t/tests/standards-version-invalid/debian/debian/control.in 2011-01-27 13:31:55.000000000 +0000
+++ lintian-2.5.6/t/tests/standards-version-invalid/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: 3.8
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/standards-version-newer/debian/debian/control.in lintian-2.5.6/t/tests/standards-version-newer/debian/debian/control.in
--- lintian-2.5.5/t/tests/standards-version-newer/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/standards-version-newer/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: 5.15.0.0
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/standards-version-old/debian/debian/control.in lintian-2.5.6/t/tests/standards-version-old/debian/debian/control.in
--- lintian-2.5.5/t/tests/standards-version-old/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/standards-version-old/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: 3.9.0
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Package: {$srcpkg}
Architecture: {$architecture}
diff -Nru lintian-2.5.5/t/tests/strings-elf-detection/debian/debian/clean lintian-2.5.6/t/tests/strings-elf-detection/debian/debian/clean
--- lintian-2.5.5/t/tests/strings-elf-detection/debian/debian/clean 1970-01-01 00:00:00.000000000 +0000
+++ lintian-2.5.6/t/tests/strings-elf-detection/debian/debian/clean 2012-03-12 14:40:11.000000000 +0000
@@ -0,0 +1,3 @@
+true
+foo
+bar::ELF
diff -Nru lintian-2.5.5/t/tests/strings-elf-detection/debian/debian/rules lintian-2.5.6/t/tests/strings-elf-detection/debian/debian/rules
--- lintian-2.5.5/t/tests/strings-elf-detection/debian/debian/rules 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/strings-elf-detection/debian/debian/rules 2012-03-12 14:40:11.000000000 +0000
@@ -2,14 +2,11 @@
pkg=strings-elf-detection
%:
dh $@
-binary:
- dh --before dh_install binary
+
+override_dh_install:
cp /bin/true .
touch foo bar::ELF
mkdir -p debian/$(pkg)/usr/lib/foo
cp /bin/true debian/$(pkg)/usr/lib/foo/true\ false
- dh --remaining binary
+ dh_install
-clean:
- dh clean
- $(RM) true foo bar::ELF
diff -Nru lintian-2.5.5/t/tests/symlinks-broken/debian/debian/control.in lintian-2.5.6/t/tests/symlinks-broken/debian/debian/control.in
--- lintian-2.5.5/t/tests/symlinks-broken/debian/debian/control.in 2011-09-15 14:51:45.000000000 +0000
+++ lintian-2.5.6/t/tests/symlinks-broken/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: devel
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: broken-links
Architecture: all
diff -Nru lintian-2.5.5/t/tests/unpack-slashes-in-field-name/debian/debian/control.in lintian-2.5.6/t/tests/unpack-slashes-in-field-name/debian/debian/control.in
--- lintian-2.5.5/t/tests/unpack-slashes-in-field-name/debian/debian/control.in 2011-01-27 13:31:55.000000000 +0000
+++ lintian-2.5.6/t/tests/unpack-slashes-in-field-name/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
XS-../foo: bar
Package: {$srcpkg}
diff -Nru lintian-2.5.5/t/tests/version-substvars-general/debian/debian/control.in lintian-2.5.6/t/tests/version-substvars-general/debian/debian/control.in
--- lintian-2.5.5/t/tests/version-substvars-general/debian/debian/control.in 2011-10-05 11:38:09.000000000 +0000
+++ lintian-2.5.6/t/tests/version-substvars-general/debian/debian/control.in 2012-03-12 14:40:11.000000000 +0000
@@ -3,7 +3,7 @@
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 9)
Package: program-bin
Architecture: any