[SCM] Debian package checker branch, master, updated. 2.5.6-62-g9685ecd

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

The following commit has been merged in the master branch:
commit 9685ecd905dc7a45c2179f68cc72b806396674ca
Author: Niels Thykier <niels@thykier.net>
Date:   Fri Apr 6 16:15:52 2012 +0200

    Remove more old-style copyright handling file
    
    The tag diff is caused by coll/copyright-file incorrectly assuming
    that if "usr/share/doc/$pkg/copyright" does not exist, then we are
    looking for an old-style copyright file.  This assumption fails
    when an a new style copyright file is compressed.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/copyright-file b/checks/copyright-file
index 8ac297f..8e09e16 100644
--- a/checks/copyright-file
+++ b/checks/copyright-file
@@ -47,7 +47,7 @@ my $linked = 0;
 # Read package contents...
 foreach (@{$info->sorted_index}) {
     my $index_info = $info->index->{$_};
-    if (m,usr/(?:share/)?doc/$ppkg/copyright(\.\S+)?$,) {
+    if (m,usr/share/doc/$ppkg/copyright(\.\S+)?$,) {
         my $ext = $1;
 
         $ext = '' if (! defined $ext);
diff --git a/collection/copyright-file b/collection/copyright-file
index 7185816..7bb8c39 100755
--- a/collection/copyright-file
+++ b/collection/copyright-file
@@ -34,12 +34,7 @@ if ( -e "$dir/copyright" ) {
     unlink "$dir/copyright" or fail "unlink 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; }
-else { $file = $file2; }
+my $file = "$dir/unpacked/usr/share/doc/$pkg/copyright";
 
 # If copyright was a symlink, we need to make a copy of it.  Just hardlinking
 # to the symlink may leave a relative symlink into a directory we can't
diff --git a/debian/changelog b/debian/changelog
index 45fd19d..dbc9b80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -78,6 +78,8 @@ lintian (2.5.7) UNRELEASED; urgency=low
   * collection/bin-pkg-control{,.desc}:
     + [NT] Compress control-index file and bump version of
       bin-pkg-control.
+  * collection/copyright-file:
+    + [NT] Remove code to look for old-style copyright file.
   * collection/file-info{,.desc}:
     + [NT] Compress file-info output and bump version of file-info.
   * collection/hardening-info{,.desc}:
diff --git a/t/tests/copyright-file-general/tags b/t/tests/copyright-file-general/tags
index 9dc7113..44996c1 100644
--- a/t/tests/copyright-file-general/tags
+++ b/t/tests/copyright-file-general/tags
@@ -20,7 +20,6 @@ E: copyright-php: copyright-refers-to-problematic-php-license
 E: copyright-poor-common-licenses: copyright-should-refer-to-common-license-file-for-gpl
 E: copyright-symlink: copyright-file-is-symlink
 P: copyright-crln: copyright-has-crs
-W: copyright-compressed: copyright-without-copyright-notice
 W: copyright-full-apache-2: copyright-without-copyright-notice
 W: copyright-iso-8859-1: debian-copyright-file-uses-obsolete-national-encoding at line 3
 W: copyright-misc-errors: copyright-contains-dh-make-perl-boilerplate

-- 
Debian package checker