[SCM] Debian package checker branch, master, updated. 2.5.4-28-gb9aeafc

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit b4fcacf009643298a3d6050146e0253bb88cca63
Author: Jakub Wilk <jwilk@debian.org>
Date:   Sun Dec 4 16:46:25 2011 +0100

    Fixed f-n empty-binary-package if it contained /u/s/doc symlink
    
    Acked-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/files b/checks/files
index 9a7ccca..e88834a 100644
--- a/checks/files
+++ b/checks/files
@@ -244,6 +244,8 @@ if (!$is_dummy) {
                 $is_empty = 0;
                 last;
             }
+            # Skip /usr/share/doc/$pkg symlinks.
+            next if $file eq "usr/share/doc/$pkg";
             # For files directly in /usr/share/doc/$pkg, if the file isn't one
             # of the uninteresting ones, the package isn't empty.
             unless ($STANDARD_FILES->known(basename($file))) {
diff --git a/debian/changelog b/debian/changelog
index 8fa85db..3358eac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ lintian (2.5.5) UNRELEASED; urgency=low
   * checks/files:
     + [JW,NT] Skip "Multi-Arch: same" check of gzip files if their
       install path contains the architecture.  (Closes: #650665)
+    + [JW]  Fixed a false-negative "empty-binary-package" if the
+      package contained the /u/s/doc/$pkg symlink.
+      (Closes: #650959)
   * checks/scripts:
     + [NT] Accepted patch from Evan Broder to check for missing
       versioned pre-depends on dpkg when using maintscript helper.
diff --git a/testset/tags.binary b/testset/tags.binary
index 71edc92..1028eb9 100644
--- a/testset/tags.binary
+++ b/testset/tags.binary
@@ -69,6 +69,7 @@ W: binary source: package-would-benefit-from-build-arch-targets
 W: binary source: substvar-source-version-is-deprecated binary
 W: binary source: substvar-source-version-is-deprecated binary-data
 W: binary-data: control-file-is-empty md5sums
+W: binary-data: empty-binary-package
 W: binary: binary-without-manpage usr/bin/hello
 W: binary: binary-without-manpage usr/bin/hello-static
 W: binary: binary-without-manpage usr/bin/hello.static
diff --git a/testset/tags.foo++ b/testset/tags.foo++
index f2eb407..b7e5f66 100644
--- a/testset/tags.foo++
+++ b/testset/tags.foo++
@@ -23,5 +23,6 @@ W: foo++ source: debian-watch-file-unknown-version 0
 W: foo++ source: uploader-address-looks-weird Jeroen van Wolffelaar<jeroen@localhost.localdomain>
 W: foo++ source: uploader-not-full-name Frank
 W: foo++ source: uploader-not-full-name Josip
+W: foo++-helper: empty-binary-package
 W: foo++: latest-debian-changelog-entry-without-new-date
 W: foo++: readme-debian-contains-invalid-email-address foo@unknown

-- 
Debian package checker