From: Joey Hess <joey@kitenet.net>
Date: Sun, 23 Dec 2007 02:03:21 +0000 (-0500)
Subject: * dh_installdocs: Tighten doc-base document id parsing to only accept
X-Git-Tag: 5.0.63~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ed94a7f07c230ad18f01a69f17c81829a57be309;p=debhelper.git

* 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 9bd1dcc..0f6d49e 100644
--- 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 61b6599..956a7fb 100755
--- 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;
 			}