[Debian-ha-commits] [libqb] 02/08: #### Import Feri's improvements to debian/rules

[Richard Winters]

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

devrik-guest pushed a commit to branch debian
in repository libqb.

commit 7d038ebb6d514ec1b3e82aeb3189de8f072d1954
Author: Richard B Winters <rik at mmogp.com>
Date:   Mon Apr 13 20:27:31 2015 -0400

    #### Import Feri's improvements to debian/rules
    
    - Streamline debian/rules (Feri)
    
    Change-Id: I2ecbb37cab777dfcd3964a102489638079504dfc
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 rules | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/rules b/rules
index 31ae540..9cb9692 100755
--- a/rules
+++ b/rules
@@ -6,6 +6,9 @@
 # see FEATURE AREAS in dpkg-buildflags(1)
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+# Ensure that we link against all needed libraries (cf. Policy 10.2)
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs
+
 # libqb is linked against pthread, rt and dl, yet it uses none
 # of their symbols according to dpkg-buildflags, but this is
 # not true; see configure.ac for more information
@@ -14,26 +17,21 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 %:
 	dh $@ --with autoreconf --fail-missing --link-doc=libqb0
 
+override_dh_auto_build:
+	dh_auto_build
+	$(MAKE) doxygen
+	rm docs/html/*.md5
+
+DOC = debian/tmp/usr/share/doc/libqb
+
 override_dh_auto_install:
-# Perform the install like normal	
 	dh_auto_install
-# This is here so we can ensure a properly set .la file
-# see: wiki.debian.org/ReleaseGoals/LAFileRemoval
-	for file in `find debian/tmp -name '*.la'`; do \
-		sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \
-	done
-# In order to a avoid duplicate license warning, we delete 
-# COPYING
-	find ./debian/tmp -name "COPYING" -delete
+	rm -v debian/tmp/usr/lib/*/lib*.la
+	rm "$(DOC)/COPYING" "$(DOC)/INSTALL"
+	mv "$(DOC)" "$(DOC)0"
 
 override_dh_autoreconf:
 	dh_autoreconf ./autogen.sh
 
-override_dh_auto_configure:
-# This was added in order to fix an issue running tests
-# when building with pbuilder.
-	mkdir -p `pwd`/dev/shm `pwd`/var/run
-	dh_auto_configure -- --localstatedir=`pwd`/var
-
 override_dh_strip:
 	dh_strip --dbg-package=libqb0-dbg

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/libqb.git