[libapache2-mod-perl2] 03/04: Fix arch-indep-only builds

[Niko Tyni]

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

ntyni pushed a commit to branch master
in repository libapache2-mod-perl2.

commit 1599c6a23beed9cf8cba5213393caa2d2d478314
Author: Niko Tyni <ntyni at debian.org>
Date:   Tue Nov 24 20:18:30 2015 +0200

    Fix arch-indep-only builds
    
    Instead of juggling and removing files installed into specific packages
    (debian/libapache2-mod-perl2 et al.), do that in debian/tmp before
    dh_install so they work for both arch-dep and arch-indep builds.
    
    Closes: #806053
---
 debian/libapache2-mod-perl2.install |  1 -
 debian/rules                        | 15 ++++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/debian/libapache2-mod-perl2.install b/debian/libapache2-mod-perl2.install
index f1d45f9..91c1341 100644
--- a/debian/libapache2-mod-perl2.install
+++ b/debian/libapache2-mod-perl2.install
@@ -1,3 +1,2 @@
-debian/tmp/usr/bin/*
 debian/tmp/usr/lib/*
 debian/tmp/usr/share/*
diff --git a/debian/rules b/debian/rules
index a1d1948..71da208 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
-PACKAGE = $(firstword $(shell dh_listpackages))
-TMP     = $(CURDIR)/debian/$(PACKAGE)
+TMP     = $(CURDIR)/debian/tmp
 MPR     = $(CURDIR)/ModPerl-Registry
 APR     = $(CURDIR)/Apache-Reload
 PVA     = $(shell perl -MConfig -e'print substr($$Config{vendorarch},1)')
@@ -38,21 +37,19 @@ override_dh_clean:
 override_dh_install:
 	mkdir -p $(CURDIR)/debian/docs
 	perl debian/transform_pod2html.pl $(CURDIR) docs debian
-	dh_install
-	mv $(TMP)/usr/bin/mp2bug $(TMP)/usr/share/libapache2-mod-perl2/
-	rm -r $(TMP)/usr/bin/
+	install -d $(TMP)/usr/share/bug
 	install -m755 debian/libapache2-mod-perl2.bug $(TMP)/usr/share/bug/libapache2-mod-perl2
+	install -d $(TMP)/usr/share/libapache2-mod-perl2
+	mv $(TMP)/usr/bin/mp2bug $(TMP)/usr/share/libapache2-mod-perl2
 	rm $(TMP)/$(PVA)/Apache2/Reload.pm
 	rm $(TMP)/$(PVA)/Apache/SizeLimit.pm
 	rm $(TMP)/$(PVA)/Apache/Reload.pm
-
-override_dh_installman:
-	dh_installman
 	rm $(TMP)/usr/share/man/man3/Apache2::Reload.3pm
 	rm $(TMP)/usr/share/man/man3/Apache::SizeLimit.3pm
 	rm $(TMP)/usr/share/man/man3/Apache::Reload.3pm
+	dh_install
 
-override_dh_installexamples:
+override_dh_installexamples-indep:
 	dh_installexamples
 	prename 's,\.,,' debian/libapache2-mod-perl2-dev/usr/share/doc/libapache2-mod-perl2-dev/examples/code/.debug-*
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libapache2-mod-perl2.git