[SCM] Debian package checker branch, master, updated. 2.5.0-rc2-122-g12888e8
The following commit has been merged in the master branch:
commit e0baf32a539406938864655ba7e323af559b6e2d
Author: Niels Thykier <niels@thykier.net>
Date: Mon Apr 11 21:00:58 2011 +0200
Fixed test regressions or tests triggering new tags
diff --git a/checks/symlinks b/checks/symlinks
index 921ed3a..e3cb625 100644
--- a/checks/symlinks
+++ b/checks/symlinks
@@ -67,7 +67,8 @@ foreach my $file (@{$info->sorted_index}) {
# even if they are not shipped by any binary from this
# source package.
next if $mylink =~ m@man/man\d/undocumented@o or
- $mylink =~ m@^etc/alternatives/@o;
+ $mylink =~ m@^etc/alternatives/@o or
+ $mylink eq 'lib/init/upstart-job';
# Possibly broken symlink
push @brokenlinks, [$file, $mylink, $target] unless $index->{$mylink};
diff --git a/t/tests/legacy-libbaz/tags b/t/tests/legacy-libbaz/tags
index 66d6198..64f3f69 100644
--- a/t/tests/legacy-libbaz/tags
+++ b/t/tests/legacy-libbaz/tags
@@ -72,5 +72,6 @@ W: libbaz2-dbg: wrong-section-according-to-package-name libbaz2-dbg => debug
W: libbaz2-dev: new-package-should-close-itp-bug
W: libbaz2-dev: wrong-section-according-to-package-name libbaz2-dev => libdevel
W: libbaz2: debian-changelog-file-is-a-symlink
+W: libbaz2: package-contains-broken-symlink usr/share/doc/libbaz2/changelog.gz /usr/share/doc/lintian/changelog.gz
W: libbaz2: package-name-doesnt-match-sonames libbaz2-1.0
W: libbaz2: symlink-should-be-relative usr/share/doc/libbaz2/changelog.gz /usr/share/doc/lintian/changelog.gz
diff --git a/t/tests/manpages-dependencies/debian/debian/control.in b/t/tests/manpages-dependencies/debian/debian/control.in
index 9f3301d..cfd4133 100644
--- a/t/tests/manpages-dependencies/debian/debian/control.in
+++ b/t/tests/manpages-dependencies/debian/debian/control.in
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 7.0.50~)
Package: pecho
Architecture: all
-Depends: $\{misc:Depends\}, {$srcpkg}-data
+Depends: $\{misc:Depends\}, pecho-data
Description: {$description}
This is a test package designed to exercise some feature or tag of
Lintian. It is part of the Lintian test suite and may do very odd
diff --git a/t/tests/manpages-dependencies/desc b/t/tests/manpages-dependencies/desc
index bb8abfb..cbebedb 100644
--- a/t/tests/manpages-dependencies/desc
+++ b/t/tests/manpages-dependencies/desc
@@ -1,4 +1,4 @@
-Testname: manpages-general
+Testname: manpages-dependencies
Sequence: 6000
Version: 1.0
Description: Test for manpages in dependencies
diff --git a/t/tests/spelling-multiword/debian/debian/control.in b/t/tests/spelling-multiword/debian/debian/control.in
index a5b7830..3d0761c 100644
--- a/t/tests/spelling-multiword/debian/debian/control.in
+++ b/t/tests/spelling-multiword/debian/debian/control.in
@@ -18,7 +18,6 @@ Description: {$description}
* Allows to
* An other error
* Debian/GNU Linux
- * Helps to
* Permits to
* Requires to
* This packages
diff --git a/t/tests/spelling-multiword/tags b/t/tests/spelling-multiword/tags
index 4a5e916..6f6bedf 100644
--- a/t/tests/spelling-multiword/tags
+++ b/t/tests/spelling-multiword/tags
@@ -1,7 +1,6 @@
W: spelling-multiword: spelling-error-in-description Allows to Allows one to
W: spelling-multiword: spelling-error-in-description An other Another
W: spelling-multiword: spelling-error-in-description Debian/GNU Linux Debian GNU/Linux
-W: spelling-multiword: spelling-error-in-description Helps to Helps one to
W: spelling-multiword: spelling-error-in-description Permits to Permits one to
W: spelling-multiword: spelling-error-in-description Requires to Requires one to
W: spelling-multiword: spelling-error-in-description This packages These packages
diff --git a/t/tests/version-substvars-general/debian/debian/control.in b/t/tests/version-substvars-general/debian/debian/control.in
index 2dfa8b2..1430063 100644
--- a/t/tests/version-substvars-general/debian/debian/control.in
+++ b/t/tests/version-substvars-general/debian/debian/control.in
@@ -19,7 +19,6 @@ Description: {$description}
Package: program-data
Architecture: all
Depends: $\{shlibs:Depends\}, $\{misc:Depends\},
- program-bin (= $\{binary:Version\}),
foreign-pkg (= $\{Source-Version\})
Description: {$description} - data
This is a test package designed to exercise some feature or tag of
@@ -40,3 +39,15 @@ Description: {$description} - extra utils
be an empty package.
.
Extra utils.
+
+Package: program-data-extra
+Architecture: all
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\},
+ program-bin (= $\{binary:Version\}),
+Description: {$description} - extra data
+ This is a test package designed to exercise some feature or tag of
+ Lintian. It is part of the Lintian test suite and may do very odd
+ things. It should not be installed like a regular package. It may
+ be an empty package.
+ .
+ Extra-Data package.
diff --git a/t/tests/version-substvars-general/tags b/t/tests/version-substvars-general/tags
index d3e4301..a394168 100644
--- a/t/tests/version-substvars-general/tags
+++ b/t/tests/version-substvars-general/tags
@@ -1,4 +1,4 @@
-E: version-substvars-general source: not-binnmuable-all-depends-any program-data -> program-bin
+E: version-substvars-general source: not-binnmuable-all-depends-any program-data-extra -> program-bin
E: version-substvars-general source: not-binnmuable-any-depends-all program-bin -> program-data
E: version-substvars-general source: not-binnmuable-any-depends-any program-utils -> program-bin
E: version-substvars-general source: version-substvar-for-external-package program-data -> foreign-pkg
diff --git a/testset/fields/debian/changelog b/testset/fields/debian/changelog
index d9c6822..1840a57 100644
--- a/testset/fields/debian/changelog
+++ b/testset/fields/debian/changelog
@@ -7,4 +7,4 @@ fields (1.5-.3) unstable; urgency=low
- debian-revision-should-not-be-zero
- new-essential-package
- -- Tobias Quathamer <toddy@debian.org> Sun, 13 Mar 2011 14:30:00 +0100
+ -- Tobias Quathamer <toddy@debian.org> Sun, 10 Apr 2011 14:30:00 +0100
diff --git a/testset/tags.binary b/testset/tags.binary
index 5fb5f01..343970d 100644
--- a/testset/tags.binary
+++ b/testset/tags.binary
@@ -61,6 +61,7 @@ I: binary: no-md5sums-control-file
W: binary source: ancient-standards-version 3.2.1 (current is 3.9.1)
W: binary source: debian-rules-ignores-make-clean-error line 12
W: binary source: debian-rules-uses-pwd line 9
+W: binary source: intra-source-package-circular-dependency binary binary-data
W: binary source: maintainer-upload-has-incorrect-version-number 4-1.1
W: binary source: native-package-with-dash-version
W: binary source: substvar-source-version-is-deprecated binary
@@ -114,6 +115,7 @@ W: binary: menu-item-uses-apps-section usr/share/menu/binary:7
W: binary: menu-item-uses-windowmanagers-section usr/lib/menu/binary:13
W: binary: menu-item-uses-windowmanagers-section usr/share/menu/binary:13
W: binary: old-fsf-address-in-copyright-file
+W: binary: package-contains-broken-symlink usr/share/doc/binary/html/ch3.html /usr/share/doc/binary/htm/ch1.html
W: binary: package-contains-hardlink usr/bar2 -> usr/share/baz
W: binary: package-contains-upstream-install-documentation usr/share/doc/binary/INSTALL
W: binary: spelling-error-in-description dont don't
diff --git a/testset/tags.filenames b/testset/tags.filenames
index 9df0968..93ab101 100644
--- a/testset/tags.filenames
+++ b/testset/tags.filenames
@@ -106,6 +106,8 @@ W: filenames: menu-file-in-usr-lib usr/lib/menu/menu
W: filenames: no-priority-field
W: filenames: no-section-field
W: filenames: non-standard-dir-perm usr/lib/filenames/readonly/ 0555 != 0755
+W: filenames: package-contains-broken-symlink usr/lib/filenames/symlink2ok /etc/symlink
+W: filenames: package-contains-broken-symlink usr/lib/filenames/symlink3wrong /usr/lib/filenames/symlink2
W: filenames: package-contains-bts-control-dir usr/lib/perl5/.be/
W: filenames: package-contains-bts-control-dir usr/lib/perl5/.ditrack/
W: filenames: package-contains-devhelp-file-without-symlink usr/share/doc/filenames/bad-devhelp/c.devhelp.gz
--
Debian package checker
Reply to: