summaryrefslogtreecommitdiff
path: root/dh_installdocs
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2012-09-17 13:36:47 -0400
committerJoey Hess <joey@kitenet.net>2012-09-17 13:36:47 -0400
commitd5c2fb4cf3d9be4bb991a8dc918fd2c6a48fe374 (patch)
tree74f1316e5ee62d5d37d36fb09ba7771346350458 /dh_installdocs
parent2baf12c9e1c8c0b0cea3dc45aff3e75ea15f372a (diff)
dh_installdocs: Support having the same document id in different binary packages built from the same source. Closes: #525821 Thanks, Don Armstrong
Diffstat (limited to 'dh_installdocs')
-rwxr-xr-xdh_installdocs5
1 files changed, 3 insertions, 2 deletions
diff --git a/dh_installdocs b/dh_installdocs
index bb09ee3..f0b5c5e 100755
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -316,13 +316,14 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
# install to usr/share/doc-base/packagename-extrabits
# if the doc-base file is
# packagename.doc-base.extrabits
- if ($used_doc_ids{$doc_ids{$fn}}>1) {
+ if ($used_doc_ids{$doc_ids{$fn}} > 1) {
my $fn_no_docbase = $fn;
$fn_no_docbase =~ s/\.doc-base(?:\.(.*))?/
if (defined $1 and length $1) {"-$1"} else {''}/xe;
doit("install","-g",0,"-o",0,"-m644","-p","debian/$fn",
"$tmp/usr/share/doc-base/$fn_no_docbase");
- } else {
+ }
+ else {
doit("install","-g",0,"-o",0,"-m644","-p","debian/$fn",
"$tmp/usr/share/doc-base/$doc_ids{$fn}");
}