* dh_installdocs: Tighten doc-base document id parsing to only accept

  the characters that the doc-base manual allows in the id. Closes: #445541

diff --git a/debian/changelog b/debian/changelog
index 9bd1dccd292337ac40761e66cfe096f2c634cbd0..0f6d49ef7a2719797c5ddad6541189aa4cfae2c4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (5.0.63) UNRELEASED; urgency=low
+
+  * dh_installdocs: Tighten doc-base document id parsing to only accept
+    the characters that the doc-base manual allows in the id. Closes: #445541
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 22 Dec 2007 21:02:11 -0500
+
 debhelper (5.0.62) unstable; urgency=low
 
   * Remove execute bit from desktop files in /usr/share/applications.

diff --git a/dh_installdocs b/dh_installdocs
index 61b65996e909ef288743e641c1ee7bbfd63fbd76..956a7fb801cd63f37fde895603e7bb03fdc01d7b 100755 (executable)
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -205,7 +205,7 @@ 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+(.*)(\s+)?/) {
+                       if (/^Document:\s+([-+.a-z0-9]+)/) {
                                $doc_ids{$fn}=$1;
                                last;
                        }