[Debian-ha-commits] [cluster-glue] 60/73: Added several overrides

[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 4d73b19abc8e33d8eb03513705ec4e7ef6ae920e
Author: Richard B Winters <rik at mmogp.com>
Date:   Thu Apr 16 14:55:36 2015 -0400

    Added several overrides
    
    Change-Id: I6be921255a4a00d7d6eda7f30e8d097f431c10f4
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 debian/control | 10 +++++-----
 debian/rules   | 21 +++++++++++++++------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/debian/control b/debian/control
index 816b9ae..1272080 100644
--- a/debian/control
+++ b/debian/control
@@ -263,7 +263,7 @@ Description: Reusable cluster components for Linux HA (transitional package)
 
 Package: liblrm2-dbg
 Architecture: any
-Depends: ${shlibs:Depends}, 
+Depends: liblrm2 (= ${binary:Version}), 
  ${misc:Depends}
 Replaces: libcluster-glue (<= 1.0.6-1)
 Conflicts: libcluster-glue (<= 1.0.6-1)
@@ -274,7 +274,7 @@ Description: Reusable cluster libraries -- liblrm2
 
 Package: libpils2-dbg
 Architecture: any
-Depends: ${shlibs:Depends}, 
+Depends: libpils2 (= ${binary:Version}), 
  ${misc:Depends}
 Replaces: libcluster-glue (<= 1.0.6-1)
 Conflicts: libcluster-glue (<= 1.0.6-1)
@@ -284,7 +284,7 @@ Description: Reusable cluster libraries -- libpils2
  
 Package: libplumb2-dbg
 Architecture: any
-Depends: ${shlibs:Depends}, 
+Depends: libplumb2 (= ${binary:Version}), 
  ${misc:Depends}
 Replaces: libcluster-glue (<= 1.0.6-1)
 Conflicts: libcluster-glue (<= 1.0.6-1)
@@ -294,7 +294,7 @@ Description: Reusable cluster libraries -- libplumb2
 
 Package: libplumbgpl2-dbg
 Architecture: any
-Depends: ${shlibs:Depends}, 
+Depends: libplumbgp12 (= ${binary:Version}), 
  ${misc:Depends}
 Replaces: libcluster-glue (<= 1.0.6-1)
 Conflicts: libcluster-glue (<= 1.0.6-1)
@@ -305,7 +305,7 @@ Description: Reusable cluster libraries -- libplumbgpl2
 
 Package: libstonith1-dbg
 Architecture: any
-Depends: ${shlibs:Depends}, 
+Depends: libstonith1 (= ${binary:Version}), 
  ${misc:Depends}
 Replaces: libcluster-glue (<= 1.0.6-1), libstonith0
 Conflicts: libcluster-glue (<= 1.0.6-1), libstonith0
diff --git a/debian/rules b/debian/rules
index 6265a26..a9c6ca9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # See debhelper(7) (uncomment to enable)
 # output every command that modifies files on the build system.
-#DH_VERBOSE = 1
+DH_VERBOSE = 1
 
 # see FEATURE AREAS in dpkg-buildflags(1)
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
@@ -9,21 +9,30 @@ 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
-
 # main packaging script based on dh7 syntax
 %:
-	dh $@ --with autoreconf --fail-missing --link-doc=liblrm2,libpils2,libplumb2,libplumbgpl2,libstonith1
+	dh $@ --with autoreconf,python2 --fail-missing --link-doc=liblrm2,libpils2,libplumb2,libplumbgpl2,libstonith1
 
 override_dh_autoreconf:
 	dh_autoreconf ./autogen.sh
 
+override_dh_auto_configure:
+	 ./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
+
 override_dh_auto_install:
 	dh_auto_install
 	rm -v debian/tmp/usr/lib/*/lib*.la
 
+override_dh_installinit:
+	dh_installinit --name=logd -pcluster-glue -u 'defaults 20 32'
+
+override_dh_python2:
+	dh_python2
+	dh_python2 /usr/lib/stonith/plugins/stonith2
 
 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