[log4shib] 01/01: Arch and indep builds require different pruning

Ferenc Wágner wferi-guest at moszumanska.debian.org
Fri Jan 15 00:35:15 UTC 2016


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

wferi-guest pushed a commit to branch debian/master
in repository log4shib.

commit 03f342f6ce0398e9e7808c5181bbea0f50bcb3ed
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Fri Jan 15 01:32:24 2016 +0100

    Arch and indep builds require different pruning
    
    Previously arch builds failed, because the doc directory was not present.
---
 debian/changelog | 1 +
 debian/rules     | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9ea919f..52f13b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ log4shib (1.0.9-1) unstable; urgency=medium
   * [9b68d45] Omit useless MD5 files generated by Doxygen
   * [66da772] Specify the empty pkg-config Cflags setting via a variable
   * [68876b7] New license for config/ltmain.sh and m4/ax_pthread.m4
+  * Arch and indep builds require different pruning
 
  -- Ferenc Wágner <wferi at niif.hu>  Fri, 15 Jan 2016 00:05:41 +0100
 
diff --git a/debian/rules b/debian/rules
index 7591188..29dc28b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,13 +21,16 @@ override_dh_auto_configure:
 	dh_auto_configure -- --disable-static $(DEBUG) log4shib_cflags=' '
 # avoid leaking build flags into the pkg-config file
 
-override_dh_install:
+override_dh_install-arch:
 	pod2man --release=$(VERSION) --section=1 --center=log4shib \
 	    debian/log4shib-config.pod debian/log4shib-config.1
-	find debian/tmp/usr/share/doc/log4shib-*/api/html -name "*.md5" -delete
 	rm debian/tmp/usr/lib/x86_64-linux-gnu/liblog4shib.la
 	dh_install -Xman3 --fail-missing
 
+override_dh_install-indep:
+	find debian/tmp/usr/share/doc/log4shib-*/api/html -name "*.md5" -delete
+	dh_install -Xman3 --fail-missing
+
 override_dh_autoreconf:
 	dh_autoreconf --as-needed
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/log4shib.git



More information about the Pkg-shibboleth-devel mailing list