[SCM] Debian package checker branch, master, updated. 2.5.6-90-g052a8fe

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

The following commit has been merged in the master branch:
commit 052a8fe13660517a18b82829f88f1720f28d981c
Author: Niels Thykier <niels@thykier.net>
Date:   Thu Apr 12 22:29:35 2012 +0200

    c/changelog-file: Move doc symlink check up
    
    If usr/share/doc/$pkg is a symlink, there is no do anything in this
    check.
    
    Also remove "usr/doc/" case in a regex.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/changelog-file b/checks/changelog-file
index 628b75e..71bdbd6 100644
--- a/checks/changelog-file
+++ b/checks/changelog-file
@@ -46,6 +46,12 @@ my @doc_files;
 my %file_info;
 my %is_a_symlink;
 
+
+# skip packages which have a /usr/share/doc/$pkg -> foo symlink
+return 0 if $info->index->{"usr/share/doc/$pkg"} and
+    $info->index->{"usr/share/doc/$pkg"}->{type} eq 'l';
+
+
 # Modify the file_info by following symbolic links.
 for my $file (@{$info->sorted_index}) {
     next unless $file =~ m/doc/o;
@@ -82,13 +88,9 @@ for my $file (@{$info->sorted_index}) {
 # Read package contents....  Capitalization errors are dealt with later.
 foreach (@{$info->sorted_index}) {
     next unless length $_;
-    # skip packages which have a /usr/share/doc/$pkg -> foo symlink
-    if (m,usr/share/doc/$ppkg$, and defined $info->index->{$_}->{link}) {
-        return 0;
-    }
 
     # we are only interested in files or symlinks in /usr/(share/)?doc/$pkg
-    if (m,usr/(?:share/)?doc/$ppkg/([^/\s]+), ) {
+    if (m,usr/share/doc/$ppkg/([^/\s]+), ) {
         my $file = $1;
         my $file1 = "usr/share/doc/$pkg/$file";
 

-- 
Debian package checker