[Debian-ha-commits] [cluster-glue] 64/73: Multiple edits
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 355482c17aef200d5f226fffd26f52b3023fc4cb
Author: Richard B Winters <rik at mmogp.com>
Date: Thu Apr 16 21:12:21 2015 -0400
Multiple edits
- debian/control: Bumped standards; No changes required
- debian/control: Updated depends in order to attempt and resolve
intra-source-package-circular-dependency warnings through lintian
- debian/cluster-glue.install: Removed combine-logs.pl as it's no longer
part of upstream source
- debian/cluster-glue.install: Replaced etc/init.d/logd with
/lib/systemd/system/logd.service; See entry for cluster-glue.logd.init
- debian/cluster-glue.logd.init: Removed as upstream builds - and in
favor of - a systemd service file; logd.service
- debian/rules: Streamlined and updated for latest upstream release;
- Migrated cluster-glue/etc/logd.cf cluster-glue.install
- Removed some flags from ./configure as they are set appropriately by
default
- Removed logd init instruction as upstream builds a logd.service file
- debian/cluster-glue.copyright added for source package
- debian/watch added
Change-Id: I4fa47d1d57c5a02003ae5162c68e09502ce9bbb5
Signed-off-by: Richard B Winters <rik at mmogp.com>
---
debian/cluster-glue.copyright | 141 +++++++++++++++++++++++++
debian/cluster-glue.install | 3 +-
debian/cluster-glue.logd.init | 101 ------------------
debian/control | 232 +++++++++++++++++++++++++++++++-----------
debian/rules | 19 ++--
debian/watch | 4 +
6 files changed, 324 insertions(+), 176 deletions(-)
diff --git a/debian/cluster-glue.copyright b/debian/cluster-glue.copyright
new file mode 100644
index 0000000..b1712df
--- /dev/null
+++ b/debian/cluster-glue.copyright
@@ -0,0 +1,141 @@
+This package was first debianized by Paolo Molaro <lupus at debian.org> on
+Wed, 17 Nov 1999 17:30:23 +0100.
+
+The original sources can be found at:
+ http://linux-ha.org/wiki/Download
+
+Upstream Authors (from AUTHORS) and copyright holders: (c) 1998-2010
+
+ Alan Robertson <alanr at unix.sh>
+ Andreas Mock <andreas.mock at web.de>
+ Andrew Beekhof <andrew at beekhof.net>
+ Dave Blaschke <debltc at us.ibm.com>
+ David Lee <t.d.lee at durham.ac.uk>
+ Dejan Muhamedagic <dejan at hello-penguin.com>
+ Hannes Eder <heder at google.com>
+ Huang Zhen <zhenhltc at cn.ibm.com>
+ Junko Ikeda <ikedaj at intellilink.co.jp>
+ Lars Marowsky-Bree <lmb at suse.de>
+ Martin Bene <martin.bene at icomedias.com>
+ Phil Carns <carns at mcs.anl.gov>
+ Satomi Taniguchi <taniguchis at intellilink.co.jp>
+ Sean Reifschneider <jafo at tummy.com>
+ Sebastian Reitenbach <itlistuser at rapideye.de>
+ Serge Dubrouski <sergeyfd at gmail.com>
+ Simon Horman <horms at verge.net.au>
+ Xinwei Hu <hxinwei at gmail.com>
+
+Code for the following pieces borrowed from code by:
+ Tom Vogt <tom at lemuria.org> (udp code)
+ yuri volobuev <volobuev at t1.chem.umn.edu> (send_arp.c)
+ 'Network UPS Tools' by Russell Kroll <rkroll at exploits.org>
+ homepage: http://www.exploits.org/nut/
+ (Andreas Piesk borrowed code for APCSmart support)
+ David C. Teigland <teigland at sistina.com>
+ wrote original meatware support for GFS stomith
+ salz at pebbles.bbn.com - replacement scandir function
+ Internet Software Consortium (bind) - replacement inet_pton()
+ function
+ Matt Soffen <matt at soffen.com> (replace/alphasort.c,
+ replace/daemon.c)
+
+NOTE: The work of everyone on this project is dearly appreciated. If you
+ are not listed here but should be, please notify us!
+
+Although upstream claims differently, the contents of this package do
+not fall under one common license.
+
+=====================================================================
+
+The following components of this package are licensed under the GNU
+Lesser General Public License 2.1 (LGPL):
+
+include/clplumbing/Gmain_timeout.h, include/clplumbing/apphb_cs.h,
+include/clplumbing/coredumps.h, include/clplumbing/netstring.h,
+include/ha_msg.h, include/lha_internal.h, include/pils/generic.h,
+include/pils/interface.h, include/pils/plugin.h.in,
+lib/clplumbing/cl_malloc.c, lib/clplumbing/cl_msg.c,
+lib/clplumbing/cl_msg_types.c, lib/clplumbing/cl_poll.c,
+lib/clplumbing/coredumps.c, lib/clplumbing/cpulimits.c,
+lib/pils/main.c, lib/pils/pils.c, lib/pils/test.c,
+replace/NoSuchFunctionName.c, replace/setenv.c,
+replace/strerror.c, replace/strlcat.c, replace/strlcpy.c,
+replace/strndup.c, replace/strnlen.c, replace/unsetenv.c
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+=====================================================================
+
+The following component of this package are licensed under the terms
+of the BSD license:
+
+replace/daemon.c
+replace/alphasort.c
+
+The BSD license is as follows.
+
+Copyright (c) The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+3. Neither the name of the University nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+=====================================================================
+
+The following component of this package is public domain software and
+does not fall under any license's terms:
+
+replace/scandir.c
+
+=====================================================================
+
+Files: debian/*
+Copyright: 1999-2015 Debian-HA Maintainers
+ 2009-2015 Martin Loschwitz <madkiss at debian.org>
+ 2010-2015 Ante Karamatic <ivoks at ubuntu.com>
+ 2010-2015 Frederik Schüler <fs at debian.org>
+ 2010-2015 Simon Horman <horms at debian.org>
+ 2011-2015 Julien Cristau <jcristau at debian.org>
+ 2011-2015 Luk Claes <luk at debian.org>
+ 2013-2015 Luca Falavigna <dktrkranz at debian.org>
+ 2014-2015 Matthias Klose <doko at debian.org>
+ 2015 Richard B Winters <rik at mmogp.com>
+
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/debian/cluster-glue.install b/debian/cluster-glue.install
index 1eb34be..aac58fa 100644
--- a/debian/cluster-glue.install
+++ b/debian/cluster-glue.install
@@ -81,10 +81,9 @@ usr/share/cluster-glue/lrmtest/lrmregtest-lsb
usr/share/cluster-glue/utillib.sh
usr/share/cluster-glue/ha_cf_support.sh
usr/share/cluster-glue/openais_conf_support.sh
-usr/share/cluster-glue/combine-logs.pl
usr/share/cluster-glue/ha_log.sh
usr/lib/stonith/plugins/xen0-ha-dom0-stonith-helper
-etc/init.d/logd
+lib/systemd/system/logd.service
usr/share/man/man1/ha_logger.1
usr/share/man/man8/meatclient.8
usr/share/man/man8/hb_report.8
diff --git a/debian/cluster-glue.logd.init b/debian/cluster-glue.logd.init
deleted file mode 100644
index 50f1512..0000000
--- a/debian/cluster-glue.logd.init
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/sh
-#
-#
-# logd Start logd (non-blocking log service)
-#
-# Author: Dejan Muhamedagic <dmuhamedagic at suse.de>
-# (After the heartbeat init script)
-# License: GNU General Public License (GPL)
-#
-# This script works correctly under SuSE, Debian,
-# Conectiva, Red Hat and a few others. Please let me know if it
-# doesn't work under your distribution, and we'll fix it.
-# We don't hate anyone, and like for everyone to use
-# our software, no matter what OS or distribution you're using.
-#
-# chkconfig: 2345 @LOGD_INITSTARTPRI@ @LOGD_INITSTOPPRI@
-# description: Startup script logd service.
-# processname: ha_logd
-# pidfile: /var/run/logd.pid
-# config: /etc/logd.cf
-#
-### BEGIN INIT INFO
-# Description: ha_logd is a non-blocking logging daemon.
-# It can log messages either to a file or through syslog
-# daemon.
-# Short-Description: ha_logd logging daemon
-# Provides: ha_logd
-# Required-Start: $network $syslog $remote_fs
-# Required-Stop: $network $syslog $remote_fs
-# X-Start-Before: heartbeat openais
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-### END INIT INFO
-
-. /lib/lsb/init-functions
-
-LOGD_CFG=/etc/logd.cf
-LOGD_OPT=""
-[ -f "$LOGD_CFG" ] && LOGD_OPT="-c $LOGD_CFG"
-LOGD_BIN="/usr/lib/heartbeat/ha_logd"
-
-if [ ! -f $LOGD_BIN ]; then
- echo -n "ha_logd not installed."
- exit 5
-fi
-
-StartLogd() {
- echo -n "Starting ha_logd: "
- $LOGD_BIN -s >/dev/null 2>&1
- if [ $? -eq 0 ]; then
- echo "logd is already running"
- return 0
- fi
-
- $LOGD_BIN -d $LOGD_OPT >/dev/null 2>&1
- if [ $? -ne 0 ]; then
- echo "starting logd failed"
- exit 1
- fi
- echo "ok"
- exit 0
-}
-
-StopLogd() {
- echo -n "Stopping ha_logd: "
-
- $LOGD_BIN -s >/dev/null 2>&1
- if [ $? -ne 0 ]; then
- echo "logd is already stopped"
- return 0
- fi
-
- $LOGD_BIN -k >/dev/null 2>&1
- if [ $? -ne 0 ]; then
- echo "stopping logd failed"
- exit 1
- fi
- echo "stopped"
- exit 0
-}
-
-StatusLogd() {
- $LOGD_BIN -s
- exit $?
-}
-
-case "$1" in
- start) StartLogd ;;
- status) StatusLogd ;;
- stop) StopLogd ;;
- restart|force-reload)
- sleeptime=1
- $0 stop && sleep $sleeptime && $0 start
- echo
- ;;
-
- *)
- echo "Usage: $0 {start|stop|status|restart}"
- exit 1
-esac
-
diff --git a/debian/control b/debian/control
index 839a2db..75d4685 100644
--- a/debian/control
+++ b/debian/control
@@ -77,6 +77,8 @@ Build-Depends: debhelper (>= 9),
chrpath,
>>>>>>> 3949db4 Rules tweak
dh-autoreconf,
+ dh-python,
+ dh-systemd,
docbook-xsl,
docbook-xml,
flex,
@@ -135,9 +137,14 @@ Build-Depends: debhelper (>= 9),
uuid-dev,
xsltproc,
zlib1g-dev
+<<<<<<< Upstream, based on debianhistory
>>>>>>> 3949db4 Rules tweak
Standards-Version: 3.9.5
Homepage: http://hg.linux-ha.org/glue/
+=======
+Standards-Version: 3.9.6
+Homepage: http://www.linux-ha.org/wiki/Downloads
+>>>>>>> 62cbdd5 Multiple edits
Vcs-Git: https://alioth.debian.org/anonscm/git/debian-ha/cluster-glue.git
Vcs-Browser: http://anonscm.debian.org/cgit/debian-ha/cluster-glue.git
@@ -151,11 +158,14 @@ Depends: ${misc:Depends},
libplumb2 (>= ${binary:Version}),
libplumbgpl2 (>= ${binary:Version}),
libstonith1 (>= ${binary:Version})
+Replaces: libcluster-glue (<= 1.0.6-1)
+Conflicts: libcluster-glue (<= 1.0.6-1)
Description: Reusable cluster libraries (transitional package)
This package used to contain all the libraries from cluster-glue,
the reusable cluster components package. It's now a transitional
package without any content, depending on all the single library
packages that now exist.
+<<<<<<< Upstream, based on debianhistory
Package: liblrm2
Architecture: any
@@ -273,6 +283,11 @@ Description: Reusable cluster development files -- libstonith1
This package contains the development files of the stonith
library from cluster-glue, the reusable cluster components
package.
+=======
+ .
+ If you want to use the pacemaker cluster manager, than you want
+ to install this package.
+>>>>>>> 62cbdd5 Multiple edits
Package: libcluster-glue-dev
Architecture: all
@@ -290,91 +305,184 @@ Description: Reusable cluster components for Linux HA (transitional package)
package. It's now a transitional package without any content,
depending on all the single library development packages that
now exist.
+ .
+ If you are developing with lib-cluster-glue, you probably want to
+ install this package.
+
+Package: cluster-glue
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ ${perl:Depends},
+ ${python:Depends}, ,
+ liblrm2 (>= ${binary:Version}),
+ libpils2 (>= ${binary:Version}),
+ libplumb2 (>= ${binary:Version}),
+ libplumbgpl2 (>= ${binary:Version}),
+ libstonith1 (>= ${binary:Version})
+Replaces: heartbeat (<= 2.99.2+sles11r9-5), heartbeat-common (<= 2.99.2+sles11r9-5), libheartbeat2 (<= 2.99.2+sles11r9-5)
+Conflicts: heartbeat (<= 2.99.2+sles11r9-5), heartbeat-common (<= 2.99.2+sles11r9-5), libheartbeat2 (<= 2.99.2+sles11r9-5)
+Description: Reusable cluster components for Linux HA
+ This package contains node fencing plugins, an error reporting
+ utility, and other reusable cluster components from
+ the Linux HA project.
+ .
+ If you are using the pacemaker/corosync HA cluster stack, you
+ probably want to install this package.
-Package: liblrm2-dbg
+Package: cluster-glue-dbg
Architecture: any
-Depends: liblrm2 (= ${binary:Version}),
+Section: debug
+Priority: extra
+Depends: cluster-glue (= ${binary:Version}),
+ ${misc:Depends}
+Description: Reusable cluster libraries debugging symbols
+ This package contains debugging symbols for all the libraries
+ for which libcluster-glue is dependent upon.
+ .
+ If you are developing with libcluster-glue, you probably want to
+ install this package.
+
+Package: cluster-glue-dev
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ ${perl:Depends},
+ liblrm2-dev (>= ${binary:Version}),
+ libpils2-dev (>= ${binary:Version}),
+ libplumb2-dev (>= ${binary:Version}),
+ libplumbgpl2-dev (>= ${binary:Version}),
+ libstonith1-dev (>= ${binary:Version})
+Replaces: libcluster-glue-dev (<= 1.0.6-1)
+Conflicts: libcluster-glue-dev (<= 1.0.6-1)
+Description: Development files for the cluster glue components
+ This package includes headers and static libraries for the glue
+ cluster components.
+ .
+ If you are developing for cluster-glue, you probably want to
+ install this package.
+
+Package: liblrm2
+Architecture: any
+Depends: ${shlibs:Depends},
${misc:Depends}
-Replaces: libcluster-glue (<= 1.0.6-1)
-Conflicts: libcluster-glue (<= 1.0.6-1)
Description: Reusable cluster libraries -- liblrm2
- This package contains debugging symbols for the lrm helper
- library from cluster-glue, the reusable cluster components
- package.
+ This package contains the lrm helper library from cluster-glue,
+ the reusable cluster components package.
+ .
+ If you want to use the pacemaker cluster manager, than you want
+ to install this package.
-Package: libpils2-dbg
+Package: libpils2
Architecture: any
-Depends: libpils2 (= ${binary:Version}),
+Depends: ${shlibs:Depends},
${misc:Depends}
-Replaces: libcluster-glue (<= 1.0.6-1)
-Conflicts: libcluster-glue (<= 1.0.6-1)
Description: Reusable cluster libraries -- libpils2
- This package contains debugging symbols for the pils library
- from cluster-glue, the reusable cluster components package.
+ This package contains the pils library from cluster-glue, the
+ reusable cluster components package.
+ .
+ If you want to use the pacemaker cluster manager, than you want
+ to install this package.
-Package: libplumb2-dbg
+Package: libplumb2
Architecture: any
-Depends: libplumb2 (= ${binary:Version}),
+Depends: ${shlibs:Depends},
${misc:Depends}
-Replaces: libcluster-glue (<= 1.0.6-1)
-Conflicts: libcluster-glue (<= 1.0.6-1)
Description: Reusable cluster libraries -- libplumb2
- This package contains debugging symbols for the plumber library
- from cluster-glue, the reusable cluster components package.
+ This package contains the plumber library from cluster-glue, the
+ reusable cluster components package.
+ .
+ If you want to use the pacemaker cluster manager, than you want
+ to install this package.
-Package: libplumbgpl2-dbg
+Package: libplumbgpl2
Architecture: any
-Depends: libplumbgp12 (= ${binary:Version}),
+Depends: ${shlibs:Depends},
${misc:Depends}
-Replaces: libcluster-glue (<= 1.0.6-1)
-Conflicts: libcluster-glue (<= 1.0.6-1)
Description: Reusable cluster libraries -- libplumbgpl2
- This package contains debugging symbols for the plumber
- library from cluster-glue, the reusable cluster components
- package, in the GPL version.
+ This package contains the plumber library from cluster-glue,
+ the reusable cluster components package, in the GPL version.
+ .
+ If you want to use the pacemaker cluster manager, than you want
+ to install this package.
-Package: libstonith1-dbg
+Package: libstonith1
Architecture: any
-Depends: libstonith1 (= ${binary:Version}),
+Depends: ${shlibs:Depends},
${misc:Depends}
-Replaces: libcluster-glue (<= 1.0.6-1), libstonith0
-Conflicts: libcluster-glue (<= 1.0.6-1), libstonith0
+Replaces: libstonith0
+Conflicts: libstonith0
Description: Reusable cluster libraries -- libstonith1
- This package contains debugging symbols for the stonith
+ This package contains the stonith library from cluster-glue, the
+ reusable cluster components package.
+ .
+ If you want to use the pacemaker cluster manager, than you want
+ to install this package.
+
+Package: liblrm2-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends},
+ liblrm2 (= ${binary:Version})
+Description: Reusable cluster development files -- liblrm
+ This package contains the development files of the lrm helper
library from cluster-glue, the reusable cluster components
- package.
+ package.
+ .
+ If you are developing with liblrm2, you probably want to
+ install this package.
-Package: cluster-glue
+Package: libpils2-dev
+Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- ${perl:Depends},
- ${python:Depends},
- libtimedate-perl,
- liblrm2 (= ${binary:Version}),
+Depends: ${misc:Depends},
libpils2 (= ${binary:Version}),
- libplumb2 (= ${binary:Version}),
- libplumbgpl2 (= ${binary:Version}),
- libstonith1 (= ${binary:Version})
-Replaces: heartbeat (<= 2.99.2+sles11r9-5), heartbeat-common (<= 2.99.2+sles11r9-5), libheartbeat2 (<= 2.99.2+sles11r9-5)
-Conflicts: heartbeat (<= 2.99.2+sles11r9-5), heartbeat-common (<= 2.99.2+sles11r9-5), libheartbeat2 (<= 2.99.2+sles11r9-5)
-Description: Reusable cluster components for Linux HA
- This package contains node fencing plugins, an error reporting
- utility, and other reusable cluster components from
- the Linux HA project.
+ libltdl-dev
+Description: Reusable cluster development files -- libpils2
+ This package contains the development files of the pils
+ library from cluster-glue, the reusable cluster components
+ package.
+ .
+ If you are developing with libpils2, you probably want to
+ install this package.
-Package: cluster-glue-dev
+Package: libplumb2-dev
+Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- ${perl:Depends},
- liblrm2-dev (= ${binary:Version}),
- libpils2-dev (= ${binary:Version}),
- libplumb2-dev (= ${binary:Version}),
- libplumbgpl2-dev (= ${binary:Version}),
- libstonith1-dev (= ${binary:Version})
-Replaces: libcluster-glue-dev (<= 1.0.6-1)
-Conflicts: libcluster-glue-dev (<= 1.0.6-1)
-Description: Development files for the cluster glue components
- This package includes headers and static libraries for the glue
- cluster components.
+Depends: ${misc:Depends},
+ libplumb2 (= ${binary:Version})
+Description: Reusable cluster development files -- libplumb2
+ This package contains the development files of the plumber
+ library from cluster-glue, the reusable cluster components
+ package.
+ .
+ If you are developing with libplumb2, you probably want to
+ install this package.
+
+Package: libplumbgpl2-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends},
+ libplumbgpl2 (= ${binary:Version})
+Description: Reusable cluster development files -- libplumbgpl2
+ This package contains the development files of the plumber
+ library from cluster-glue, the reusable cluster components
+ package, in the GPL version.
+ .
+ If you are developing with libplumbgpl2, you probably want to
+ install this package.
+
+Package: libstonith1-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends},
+ libstonith1 (= ${binary:Version})
+Replaces: libstonith0-dev
+Conflicts: libstonith0-dev
+Description: Reusable cluster development files -- libstonith1
+ This package contains the development files of the stonith
+ library from cluster-glue, the reusable cluster components
+ package.
+ .
+ If you are developing with libstonith, you probably want to
+ install this package.
diff --git a/debian/rules b/debian/rules
index 70405ac..e731fa3 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
@@ -14,24 +14,21 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
# main packaging script based on dh7 syntax
%:
- dh $@ --with autoreconf,python2 --fail-missing --link-doc=liblrm2,libpils2,libplumb2,libplumbgpl2,libstonith1
+ dh $@ --with autoreconf,python2,systemd --fail-missing --link-doc=cluster-glue
override_dh_autoreconf:
dh_autoreconf ./autogen.sh
override_dh_auto_configure:
./configure --sysconfdir=/etc --localstatedir=/var \
- --with-gnu-ld --enable-dependency-tracking \
- --disable-fatal-warnings
+ --enable-upstart --enable-dependency-tracking --disable-fatal-warnings
override_dh_auto_install:
dh_auto_install
-# 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'
+# clear .la files, dependency_libs fields
+ for file in `find $(CURDIR)/debian/tmp -name '*.la'`; do \
+ sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \
+ done
override_dh_installchangelogs:
dh_installchangelogs ChangeLog
@@ -41,5 +38,5 @@ override_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
+ dh_strip --dbg-package=cluster-glue-dbg
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..35a6eec
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,4 @@
+version=3
+
+opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/ \
+ http://hg.linux-ha.org/glue/tags glue-(\d\S*)
--
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