dh_installdocs: Loosen the Document field parsing, to accept everything doc-base...

diff --git a/debian/changelog b/debian/changelog
index 34cb71febfd7d8650b68bec9d550d8b3c4caf9af..adb1b2f01de2e5eaa7a1925b2aa09618bfaaf10d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ debhelper (7.3.16) UNRELEASED; urgency=low
 
   * dh_desktop: Clarify in man page why it's a no-op.
     Closes: #543364
+  * dh_installdocs: Loosen the Document field parsing, to accept
+    everything doc-base *really* accepts in a doc id (not just what
+    it's documented to accept). Closes: #543499
 
  -- Joey Hess <joeyh@debian.org>  Mon, 24 Aug 2009 12:59:02 -0400
 

diff --git a/dh_installdocs b/dh_installdocs
index 87954116b3fd3b5d9f4d31a0b61e73f8e613e581..1226cf8fabe4bebd5ccc1d9a4ae009c81e3507af 100755 (executable)
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -200,7 +200,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                # Parse the file to get the doc id.
                open (IN, "debian/$fn") || die "Cannot read debian/$fn.";
                while (<IN>) {
-                       if (/^Document:\s+([-+.a-z0-9]+)/) {
+                       s/\s*$//;
+                       if (/^Document\s*:\s*(.*)/) {
                                $doc_ids{$fn}=$1;
                                last;
                        }