[Debian-ha-commits] [cluster-glue] 58/73: Updating rules implementation for the latest standards

[Richard Winters]

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

devrik-guest pushed a commit to branch master
in repository cluster-glue.

commit fb700d44c22c2e89210a64aa8740f816a1645b64
Author: Richard B Winters <rik at mmogp.com>
Date:   Thu Apr 16 14:41:13 2015 -0400

    Updating rules implementation for the latest standards
    
    Change-Id: I96e26aac950e86dc7fbbe2205167838200c4ef9d
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 debian/rules | 103 ++++++++++-------------------------------------------------
 1 file changed, 17 insertions(+), 86 deletions(-)

diff --git a/debian/rules b/debian/rules
index 8eb7455..6265a26 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,98 +1,29 @@
 #!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#DH_VERBOSE = 1
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-# Hardening, see FEATURE AREAS in dpkg-buildflags(1)
+# 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
 
-DTMP:=$(CURDIR)/debian/tmp
-RELEASE := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }')
-UPSTREAM := $(shell echo "$(RELEASE)" | sed 's/:\?\([0-9\.]\+\)-[0-9].*/\1/')
-
-configure: configure-stamp
-configure-stamp: 
-	dh_testdir
-	test -x ./configure || ./autogen.sh
-	./configure --with-ocf-root=/usr/lib/ocf --with-initdir=/etc/init.d \
-		    --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-  		    --mandir=/usr/share/man --libdir=/usr/lib \
-		    --enable-upstart --disable-fatal-warnings
-	touch configure-stamp
-
-build: build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp  
-	$(MAKE)
-	touch $@
-
-build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp  
-	touch $@
-
-clean: 
-	dh_testdir
-	dh_testroot
-	[ ! -f Makefile ] || $(MAKE) clean
-	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean 
-
-install: install-indep install-arch
-install-indep:
-
-install-arch:
-	dh_testdir
-	dh_testroot
-	dh_prep -s
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-	for file in `find debian/tmp -name '*.la'`; do \
-		sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \
-	done
-	chrpath -r "" debian/tmp/usr/lib/stonith/plugins/stonith2/ipmilan.so || true
-	dh_install --sourcedir=$(CURDIR)/debian/tmp --list-missing
+# 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
 
-	# install logd.cf configuration file
-	mkdir -p $(CURDIR)/debian/cluster-glue/etc/
-	cp -ax $(CURDIR)/logd/logd.cf $(CURDIR)/debian/cluster-glue/etc/
+# main packaging script based on dh7 syntax
+%:
+	dh $@ --with autoreconf --fail-missing --link-doc=liblrm2,libpils2,libplumb2,libplumbgpl2,libstonith1
 
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installman
-	dh_lintian
-	dh_installinit --name=logd -pcluster-glue -u 'defaults 20 32'
-	dh_python2
-	dh_python2 /usr/lib/stonith/plugins/stonith2
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_perl
-	dh_makeshlibs -V
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+override_dh_autoreconf:
+	dh_autoreconf ./autogen.sh
 
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+override_dh_auto_install:
+	dh_auto_install
+	rm -v debian/tmp/usr/lib/*/lib*.la
 
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
-	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
 
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
+override_dh_strip:
+	dh_strip --dbg-package=liblrm2-dbg,libpils2-dbg,libplumb2-dbg,libplumbgpl2-dbg,libstonith1-dbg

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