[Debian-ha-commits] [cluster-glue] 25/73: Imported Debian patch 1.0.7+hg2618-1

Richard Winters devrik-guest at moszumanska.debian.org
Sat Apr 18 20:24:32 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 3190f095525767ddd2420c69712ddc13009614aa
Merge: e121b66 9aefb34
Author: Martin Loschwitz <madkiss at debian.org>
Date:   Wed Aug 24 09:00:46 2011 +0000

    Imported Debian patch 1.0.7+hg2618-1

 .hg_archival.txt                         |   2 +-
 .hgtags                                  |   1 +
 cluster-glue-fedora.spec                 |   1 +
 cluster-glue-suse.spec                   |   1 +
 configure.ac                             |  15 +-
 debian/changelog                         |   7 +
 debian/patches/debian-changes-1.0.7-3.3  | 522 -----------------
 debian/patches/series                    |   1 -
 debian/rules                             |   1 -
 doc/stonith/Makefile.am                  |   3 +-
 doc/stonith/README.vcenter               |  90 +++
 hb_report/hb_report.in                   | 299 ++++++----
 hb_report/utillib.sh                     |  59 ++
 include/clplumbing/cl_log.h              |  22 +
 include/glue_config.h.in                 |   6 +
 lib/clplumbing/cl_log.c                  | 111 ++++
 lib/clplumbing/ipcsocket.c               | 113 ++--
 lib/plugins/lrm/raexecocf.c              |  16 +-
 lib/plugins/stonith/external.c           |   9 +-
 lib/plugins/stonith/external/Makefile.am |   7 +-
 lib/plugins/stonith/external/hetzner     | 132 +++++
 lib/plugins/stonith/external/ipmi        |  13 +-
 lib/plugins/stonith/external/libvirt     | 259 +++++++++
 lib/plugins/stonith/external/rackpdu     |   3 +-
 lib/plugins/stonith/external/sbd         |  53 +-
 lib/plugins/stonith/external/vcenter     | 266 +++++++++
 lib/plugins/stonith/meatware.c           |   2 +
 lib/stonith/Makefile.am                  |   2 +-
 lib/stonith/{sbd.c => sbd-common.c}      | 585 ++++++++-----------
 lib/stonith/sbd-md.c                     | 936 +++++++++++++++++++++++++++++++
 lib/stonith/sbd.h                        | 131 +++--
 lrm/admin/Makefile.am                    |   1 +
 lrm/admin/cibsecret.in                   | 347 ++++++++++++
 lrm/lrmd/Makefile.am                     |   2 +-
 lrm/lrmd/cib_secrets.c                   | 205 +++++++
 lrm/lrmd/lrmd.c                          |  92 ++-
 lrm/lrmd/lrmd.h                          |   5 +
 lrm/test/regression.sh.in                |   2 +-
 38 files changed, 3134 insertions(+), 1188 deletions(-)

diff --cc debian/changelog
index d65004c,0000000..bb420c8
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,191 -1,0 +1,198 @@@
++cluster-glue (1.0.7+hg2618-1) unstable; urgency=low
++
++  * New upstream Mercurial Checkout
++  * Acknowledging previous NMUs; thank you very much!
++
++ -- Martin Loschwitz <madkiss at debian.org>  Wed, 24 Aug 2011 09:00:46 +0000
++
 +cluster-glue (1.0.7-3.3) unstable; urgency=low
 +
 +  * Non-maintainer upload.
 +  * Also empty dependency_libs for plugins.
 +
 + -- Luk Claes <luk at debian.org>  Sun, 03 Jul 2011 09:39:39 +0200
 +
 +cluster-glue (1.0.7-3.2) unstable; urgency=low
 +
 +  * Non-maintainer upload.
 +  * Remove references to other libraries from dependency_libs field
 +    closes: #619551.
 +
 + -- Luk Claes <luk at debian.org>  Sun, 29 May 2011 19:06:36 +0200
 +
 +cluster-glue (1.0.7-3.1) unstable; urgency=high
 +
 +  * Non-maintainer upload.
 +  * High urgency for RC bug fix.
 +  * Add missing dependency on libltdl-dev to libpils2-dev, closes: #621078.
 +
 + -- Julien Cristau <jcristau at debian.org>  Sun, 08 May 2011 17:29:13 +0200
 +
 +cluster-glue (1.0.7-3) unstable; urgency=low
 +
 +  [ Andres Rodriguez ]
 +  * Remove ${shlibs:depends} from library -dev packages.
 +
 + -- Simon Horman <horms at debian.org>  Mon, 20 Dec 2010 09:29:12 +0900
 +
 +cluster-glue (1.0.7-2) unstable; urgency=low
 +
 +  * New upstream for unstable
 +
 + -- Simon Horman <horms at debian.org>  Thu, 16 Dec 2010 23:11:46 +0900
 +
 +cluster-glue (1.0.7-1) experimental; urgency=low
 +
 +  * New Upstream
 +
 + -- Simon Horman <horms at debian.org>  Thu, 16 Dec 2010 21:34:47 +0900
 +
 +cluster-glue (1.0.6+hg2461-1) experimental; urgency=low
 +
 +  * Upload to experimental
 +  * New upstream checkout (2010-10-19) 
 +  * Major change: Library split into multiple packages to comply with
 +    Debian policy better (as per c. 8.1)
 +  * Removed the "spelling-fixes"-patch as it was applied by upstream
 +  * Bumped Standards-Version to 3.9.1
 +
 + -- Martin Loschwitz <madkiss at debian.org>  Tue, 19 Oct 2010 11:50:00 +0200
 +
 +cluster-glue (1.0.6-1) unstable; urgency=low
 +
 +  * New upstream (closes: #588938)
 +    - Cleans CFLAGS in a dash-friendly way (closes: #582875)
 +
 + -- Simon Horman <horms at debian.org>  Wed, 14 Jul 2010 09:53:50 +0900
 +
 +cluster-glue (1.0.5-2) unstable; urgency=low
 +
 +  * Add build dependency on docbook-xml.
 +
 + -- Frederik Schüler <fs at debian.org>  Mon, 03 May 2010 20:05:32 +0200
 +
 +cluster-glue (1.0.5-1) unstable; urgency=low
 +
 +  * New upstream version 1.0.5 
 +
 + -- Martin Loschwitz <madkiss at debian.org>  Fri, 16 Apr 2010 06:25:09 +0000
 +
 +cluster-glue (1.0.3+hg2366-4) unstable; urgency=low
 +
 +  * Disable fatal warnings to make cluster-glue compile on numerous 
 +  architectures other than x86(_64) 
 +
 + -- Martin Loschwitz <madkiss at debian.org>  Tue, 06 Apr 2010 13:08:01 +0000
 +
 +cluster-glue (1.0.3+hg2366-3) unstable; urgency=low
 +
 +  * Added files to cluster-glue.install that were added upstream 
 +
 + -- Martin Loschwitz <madkiss at debian.org>  Tue, 30 Mar 2010 11:03:34 +0000
 +
 +cluster-glue (1.0.3+hg2366-2) unstable; urgency=low
 +
 +  * Include patch by Simon Hormann to Replaces/Conflicts 
 +
 + -- Martin Loschwitz <madkiss at debian.org>  Tue, 30 Mar 2010 07:04:53 +0000
 +
 +cluster-glue (1.0.3+hg2366-1) unstable; urgency=low
 +
 +  * New upstream checkout.
 +  * Updated debian/copyright to reflect the current situation
 +  * Remove useless STYLESHEET_PREFIX patch from debian/patches
 +
 + -- Martin Loschwitz <madkiss at debian.org>  Tue, 30 Mar 2010 06:28:50 +0000
 +
 +cluster-glue (1.0.3+hg2365-1) unstable; urgency=low
 +
 +  * New upstream checkout.
 +  * Move lintian overides from cluster-glue to libcluster-glue.
 +
 + -- Frederik Schüler <fs at debian.org>  Fri, 12 Mar 2010 12:36:56 +0100
 +
 +cluster-glue (1.0.3+hg2337-2) unstable; urgency=low
 +
 +  * Add libcluster-glue{-dev}.install files, and actually install libraries.
 +
 + -- Frederik Schüler <fs at debian.org>  Tue, 09 Mar 2010 13:12:04 +0100
 +
 +cluster-glue (1.0.3+hg2337-1) unstable; urgency=low
 +
 +  [ Martin G. Loschwitz ] 
 +  * Replaced the copyright-file with the one updated by Ante Karamatic
 +  * Split cluster-glue into libcluster-glue{-dev} and cluster-glue{-dev}
 + 
 + -- Martin Loschwitz <madkiss at debian.org>  Wed, 02 Mar 2010 13:02:00 +0100
 +
 +cluster-glue (1.0.3-2) UNRELEASED; urgency=low
 +
 +  [ Simon Horman ]
 +  * Do not do a binary-indep build as there is nothing to do.
 +  * Build-Depend on libsensors4-dev | libsensors-dev.
 +
 +  [ Frederik Schüler ]
 +  * Bump standards to version 3.8.4, no changes needed.
 +  * Switch to source version 3.0 "quilt".
 +  * Switch to debian compatibility level 7.
 +  * Drop dpatch.
 +  * Add misc-depends to cluster-glue-dev.
 +  * Add linian overrides.
 +  * Remove rpath from ipmilan.so.
 +
 + -- Frederik Schüler <fs at debian.org>  Fri, 26 Feb 2010 19:39:13 +0100
 +
 +cluster-glue (1.0.3-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Martin Loschwitz <madkiss at debian.org>  Wed, 03 Feb 2010 08:05:00 +0100
 +
 +cluster-glue (1.0.2~rc2b+hg20100127-0test1) unstable; urgency=low
 +
 +  * New build of the Debian version of this package, incorporating many
 +    changes done by Ante Karamatic (thank you very much!)
 +  * New upstream checkout
 +
 + -- Martin Loschwitz <madkiss at debian.org>  Wed, 26 Jan 2010 12:58:00 +0200
 +
 +cluster-glue (1.0.2~rc2a-0ubuntu0ppa2) lucid; urgency=low
 +
 +  * Addes docbook-xsl to build-depends
 +  * debian/patches/01_stylesheet_path.dpatch:
 +    - use local docbook
 +
 + -- Ante Karamatic <ivoks at ubuntu.com>  Mon, 04 Jan 2010 15:18:40 +0000
 +
 +cluster-glue (1.0.2~rc2a-0ubuntu0ppa1) lucid; urgency=low
 +
 +  * New upstream checkout
 +  * Added xsltproc to build-depends; needed for rebuilding of man pages
 +  * Modified paths in cluster-glue.install and cluster-glue-dev.install
 +
 + -- Ante Karamatic <ivoks at ubuntu.com>  Sun, 03 Jan 2010 09:38:25 +0000
 +
 +cluster-glue (1.0+hg20091102-1~bpo50+1) lenny-backports; urgency=low
 +
 +  * Rebuild for lenny-backports.
 +
 + -- Martin Loschwitz <madkiss at debian.org>  Mon, 02 Nov 2009 15:02:29 +0000
 +
 +cluster-glue (1.0+hg20091102-1) unstable; urgency=low
 +
 +  * New upstream checkout
 +
 + -- Martin Loschwitz <madkiss at debian.org>  Mon, 02 Nov 2009 00:00:00 +0100
 +
 +cluster-glue (1.0+hg20091012-1) unstable; urgency=low
 +
 +  * New upstream checkout
 +  * Adopting numerous changes from HG
 +
 + -- Martin Loschwitz <madkiss at debian.org>  Mon, 12 Oct 2009 16:14:00 +0200
 +
 +cluster-glue (1.0+hg20090915-1) unstable; urgency=low
 +
 +  * Initial release of packages for the cluster-glue-framework
 +
 + -- Martin Loschwitz <madkiss at debian.org>  Tue, 15 Sep 2009 09:56:16 +0000
diff --cc debian/rules
index f8ae633,0000000..37e4a68
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,104 -1,0 +1,103 @@@
 +#!/usr/bin/make -f
 +
 +# 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)
 +
 +
 +CFLAGS = -Wall -g
 +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 +       CFLAGS += -O0
 +else
 +       CFLAGS += -O2
 +endif
 +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 +       INSTALL_PROGRAM += -s
 +endif
 +
 +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 +  NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 +  MAKEFLAGS += -j$(NUMJOBS)
 +endif
 +
 +
 +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 \
 +		    --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
 +	dh_install --sourcedir=$(CURDIR)/debian/tmp --list-missing
 +
 +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_strip
 +	dh_compress
 +	dh_fixperms
 +	dh_perl
 +	dh_makeshlibs
 +	dh_installdeb
 +	dh_shlibdeps
 +	dh_gencontrol
 +	dh_md5sums
 +	dh_builddeb
 +
 +# Build architecture independant packages using the common target.
 +binary-indep: build-indep install-indep
 +	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 +
 +# 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

-- 
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