[Debian-ha-commits] [cluster-glue] 63/73: Rules tweak
Richard Winters
devrik-guest at moszumanska.debian.org
Sat Apr 18 20:24:40 UTC 2015
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 ed53eb09448eb55b9ae6a24c80055f5d376ca192
Author: Richard B Winters <rik at mmogp.com>
Date: Thu Apr 16 17:06:41 2015 -0400
Rules tweak
---
debian/control | 53 +++++++++++++++++++++++++++++++++++++++--------------
debian/rules | 23 ++++++++++++++---------
2 files changed, 53 insertions(+), 23 deletions(-)
diff --git a/debian/control b/debian/control
index a07ccff..839a2db 100644
--- a/debian/control
+++ b/debian/control
@@ -57,6 +57,7 @@ Uploaders: Martin Loschwitz <madkiss at debian.org>,
Simon Horman <horms at debian.org>,
Frederik Schüler <fs at debian.org>,
Richard B Winters <rik at mmogp.com>
+<<<<<<< Upstream, based on debianhistory
Build-Depends: debhelper (>= 7),
asciidoc,
autoconf,
@@ -67,14 +68,23 @@ Build-Depends: debhelper (>= 7),
=======
chrpath,
>>>>>>> fe7846a Add missing dh-autoreconf B-D
+=======
+Build-Depends: debhelper (>= 9),
+ asciidoc,
+ autoconf,
+ automake,
+ bison,
+ chrpath,
+>>>>>>> 3949db4 Rules tweak
dh-autoreconf,
- docbook-xsl,
+ docbook-xsl,
docbook-xml,
- flex,
- help2man,
- iproute,
- iputils-ping,
+ flex,
+ help2man,
+ iproute,
+ iputils-ping,
libaio-dev,
+<<<<<<< Upstream, based on debianhistory
libbz2-dev,
libcurl4-openssl-dev | libcurl3-openssl-dev,
libdbus-glib-1-dev,
@@ -87,23 +97,30 @@ Build-Depends: debhelper (>= 7),
libxml2-utils
>>>>>>> 56527a7 Updated fields for folding
=======
+=======
+ libbz2-dev,
+ libcurl4-openssl-dev | libcurl3-openssl-dev,
+ libdbus-glib-1-dev,
+ libdbus-1-dev,
+>>>>>>> 3949db4 Rules tweak
libglib2.0-dev,
libltdl3-dev,
- libnet1-dev,
- libncurses5-dev,
- libopenhpi-dev,
+ libnet1-dev,
+ libncurses5-dev,
+ libopenhpi-dev,
libopenipmi-dev,
libpam0g-dev,
libsensors4-dev | libsensors-dev,
- libtool,
+ libtool,
libsnmp-dev,
- libxml2-dev,
+ libxml2-dev,
libxml2-utils,
- lynx,
- net-tools,
- openssh-client,
- perl,
+ lynx,
+ net-tools,
+ openssh-client,
+ perl,
psmisc,
+<<<<<<< Upstream, based on debianhistory
python-dev (>= 2.6.6-3~),
python (>= 2.6.6-3~),
swig,
@@ -111,6 +128,14 @@ Build-Depends: debhelper (>= 7),
xsltproc,
zlib1g-dev,
>>>>>>> f822afd Removed duplicate depends on source package; libtool,psmisc
+=======
+ python-dev (>= 2.6.6-3~),
+ python (>= 2.6.6-3~),
+ swig,
+ uuid-dev,
+ xsltproc,
+ zlib1g-dev
+>>>>>>> 3949db4 Rules tweak
Standards-Version: 3.9.5
Homepage: http://hg.linux-ha.org/glue/
Vcs-Git: https://alioth.debian.org/anonscm/git/debian-ha/cluster-glue.git
diff --git a/debian/rules b/debian/rules
index a0ba69d..70405ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,11 @@ DH_VERBOSE = 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
+# We don't need - or can't, rather, enforce (cf. Policy 10.2)
+# because libtool does some chrpath's and re-linking through out
+# the build process, and these options fail the build before
+# lib tool gets it's chance to do anything.
+# export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs
# main packaging script based on dh7 syntax
%:
@@ -17,20 +20,22 @@ 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 --enable-dependency-tracking --disable-fatal-warnings \
- --includedir=../../pils
+ ./configure --sysconfdir=/etc --localstatedir=/var \
+ --with-gnu-ld --enable-dependency-tracking \
+ --disable-fatal-warnings
-LDFLAGS += -L../../pils/.lib
override_dh_auto_install:
dh_auto_install
- rm -v debian/tmp/usr/lib/*/lib*.la
+# install logd.cf configuration file
+# mkdir -p $(CURDIR)/debian/cluster-glue/etc/
+# cp -ax $(CURDIR)/logd/logd.cf $(CURDIR)/debian/cluster-glue/etc/
override_dh_installinit:
dh_installinit --name=logd -pcluster-glue -u 'defaults 20 32'
+override_dh_installchangelogs:
+ dh_installchangelogs ChangeLog
+
override_dh_python2:
dh_python2
dh_python2 /usr/lib/stonith/plugins/stonith2
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/cluster-glue.git
More information about the Debian-HA-Commits
mailing list