[libxml-parser-perl] 02/03: Fix outdated vendorarch directory in doc-base file lists. (Closes: #758294)

Niko Tyni ntyni at moszumanska.debian.org
Sat Sep 6 15:44:57 UTC 2014


This is an automated email from the git hooks/post-receive script.

ntyni pushed a commit to branch master
in repository libxml-parser-perl.

commit ce215710bac77154f9bd62a7f8cb420ef8872f92
Author: Niko Tyni <ntyni at debian.org>
Date:   Sat Sep 6 12:39:09 2014 +0300

    Fix outdated vendorarch directory in doc-base file lists. (Closes: #758294)
    
    debhelper doesn't support executable doc-base files, so use
    a template file and sed instead.
    
    Note that dh_installdocs looks at all files matching debian/*.doc-base.*
    so use the "_in" suffix instead.
---
 debian/clean                                                         | 1 +
 .../{libxml-parser-perl.doc-base => libxml-parser-perl.doc-base_in}  | 4 ++--
 debian/rules                                                         | 5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..8b3e6ad
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+debian/libxml-parser-perl.doc-base
diff --git a/debian/libxml-parser-perl.doc-base b/debian/libxml-parser-perl.doc-base_in
similarity index 58%
rename from debian/libxml-parser-perl.doc-base
rename to debian/libxml-parser-perl.doc-base_in
index 25aacf9..a4d8f2c 100644
--- a/debian/libxml-parser-perl.doc-base
+++ b/debian/libxml-parser-perl.doc-base_in
@@ -6,5 +6,5 @@ Section: Programming/Perl
 
 Format: Text
 Files:
- /usr/lib/perl5/XML/Parser/Encodings/README
- /usr/lib/perl5/XML/Parser/Encodings/Japanese_Encodings.msg
+ @ARCHLIB@/XML/Parser/Encodings/README
+ @ARCHLIB@/XML/Parser/Encodings/Japanese_Encodings.msg
diff --git a/debian/rules b/debian/rules
index b4b173d..196034d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,7 @@ EG:=$(TMP)/usr/share/doc/$(PKG)/examples
 XE_FILES:=$(wildcard /usr/share/libxml-encoding-perl/*.xml)
 ENC_FILES:=$(wildcard debian/encodings/*.enc)
 
+ARCHLIB := $(shell perl -MConfig -e 'print $$Config{vendorarch}')
 
 %:
 	dh $@
@@ -22,6 +23,10 @@ override_dh_auto_build:
 	$(foreach f,$(ENC_FILES),rm -f blib/lib/XML/Parser/Encodings/$(basename $(notdir $(f))).enc;)
 	$(foreach f,$(ENC_FILES),cp $f blib/lib/XML/Parser/Encodings/;)
 
+override_dh_installdocs:
+	sed -e 's, at ARCHLIB@,$(ARCHLIB),g' debian/libxml-parser-perl.doc-base_in > debian/libxml-parser-perl.doc-base
+	dh_installdocs
+
 make_encodings: /usr/share/libxml-encoding-perl
 	rm -rf debian/encodings/*
 	$(foreach f,$(XE_FILES),compile_encoding -o debian/encodings/$(basename $(notdir $(f))).enc $f;)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libxml-parser-perl.git



More information about the Pkg-perl-cvs-commits mailing list