[SCM] Debian package checker branch, master, updated. 2.5.0-rc2-122-g12888e8

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

The following commit has been merged in the master branch:
commit 0a90642b6fd4eaeeadb8bf0876bd20d7764817b4
Author: Niels Thykier <niels@thykier.net>
Date:   Tue Jan 18 00:17:53 2011 +0100

    Removed the / prefix from output of the conffiles check

diff --git a/checks/conffiles b/checks/conffiles
index 7e43522..d0e47a4 100644
--- a/checks/conffiles
+++ b/checks/conffiles
@@ -46,18 +46,19 @@ while (<IN>) {
 	tag "relative-conffile", $_;
 	$_ = '/' . $_;
     }
+    my $file = $_;
+    $file =~ s@^/++@@o;
+    $conffiles{$file}++;
 
-    $conffiles{$_}++;
-
-    if ($conffiles{$_} > 1) {
-	tag "duplicate-conffile", $_;
+    if ($conffiles{$file} > 1) {
+	tag "duplicate-conffile", $file;
     }
 
     if (m,^/usr/,) {
-	tag "file-in-usr-marked-as-conffile", $_;
+	tag "file-in-usr-marked-as-conffile", $file;
     } else {
 	unless (m,^/etc/,) {
-	    tag "non-etc-file-marked-as-conffile", $_;
+	    tag "non-etc-file-marked-as-conffile", $file;
 	}
     }
 
diff --git a/t/tests/conffiles-general/tags b/t/tests/conffiles-general/tags
index 9f7dc60..ce92674 100644
--- a/t/tests/conffiles-general/tags
+++ b/t/tests/conffiles-general/tags
@@ -1,4 +1,4 @@
-E: conffiles-general: duplicate-conffile /etc/foo
-E: conffiles-general: file-in-usr-marked-as-conffile /usr/share/foo
-E: conffiles-general: non-etc-file-marked-as-conffile /var/cache/foo
+E: conffiles-general: duplicate-conffile etc/foo
+E: conffiles-general: file-in-usr-marked-as-conffile usr/share/foo
+E: conffiles-general: non-etc-file-marked-as-conffile var/cache/foo
 E: conffiles-general: relative-conffile etc/foo
diff --git a/testset/tags.etcfiles b/testset/tags.etcfiles
index 7875f92..1a77b2d 100644
--- a/testset/tags.etcfiles
+++ b/testset/tags.etcfiles
@@ -7,7 +7,7 @@ E: etcfiles: malformed-md5sums-control-file line 7
 E: etcfiles: md5sum-mismatch etc/improper
 E: etcfiles: md5sums-lists-nonexisting-file usr/bin/foo
 E: etcfiles: no-copyright-file
-E: etcfiles: non-etc-file-marked-as-conffile /var/lib/foo
+E: etcfiles: non-etc-file-marked-as-conffile var/lib/foo
 E: only-etcfiles: extended-description-is-empty
 I: etcfiles source: missing-debian-source-format
 W: etcfiles source: ancient-standards-version 3.5.0 (current is 3.9.1)

-- 
Debian package checker