[Debian-ha-commits] [cluster-glue] 07/73: Imported Debian patch 1.0.5-1
Richard Winters
devrik-guest at moszumanska.debian.org
Sat Apr 18 20:24:29 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 b8c3ca0f2e3189ef79a9f98b0edd9fe1a4e041b1
Merge: 6e7f743 e0526c9
Author: Martin Loschwitz <madkiss at debian.org>
Date: Fri Apr 16 06:25:09 2010 +0000
Imported Debian patch 1.0.5-1
.hg_archival.txt | 2 +-
.hgtags | 2 +
ChangeLog | 31 +++
cluster-glue-fedora.spec | 2 +-
cluster-glue-suse.spec | 4 +-
configure.ac | 3 +-
debian/changelog | 9 +-
debian/control | 2 +-
debian/patches/01_stylesheet_path.dpatch | 19 ++
doc/stonith/README.ippower9258 | 68 ++++++
hb_report/hb_report.in | 6 +-
include/clplumbing/ipc.h | 2 -
lib/clplumbing/cl_msg_types.c | 2 +
lib/clplumbing/ipcsocket.c | 70 ++----
lib/plugins/stonith/external/Makefile.am | 2 +-
lib/plugins/stonith/external/ippower9258.in | 316 ++++++++++++++++++++++++++++
lib/plugins/stonith/external/sbd | 14 +-
lib/stonith/sbd.c | 2 +-
lrm/lrmd/lrmd.c | 2 +-
19 files changed, 482 insertions(+), 76 deletions(-)
diff --cc debian/changelog
index d0944f6,0000000..e5373aa
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,126 -1,0 +1,125 @@@
- cluster-glue (1.0.3+hg2366-5) unstable; urgency=low
++cluster-glue (1.0.5-1) unstable; urgency=low
+
- * Rebuild and do NOT include the .orig.tar.gz in the .changes-file.
- Wasn't this default until some time ago?!
++ * New upstream version 1.0.5
+
- -- Martin Loschwitz <madkiss at debian.org> Tue, 06 Apr 2010 15:20:30 +0000
++ -- 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)
++ 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/control
index 0ca315e,0000000..1af794e
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,52 -1,0 +1,52 @@@
+Source: cluster-glue
+Section: admin
+Priority: optional
+Maintainer: Debian HA Maintainers <debian-ha-maintainers at lists.alioth.debian.org>
+Uploaders: Martin Loschwitz <madkiss at debian.org>, Anibal Monsalve Salazar <anibal at debian.org>, Simon Horman <horms at debian.org>, Frederik Schüler <fs at debian.org>
+Build-Depends: debhelper (>= 7), libsnmp-dev, libglib2.0-dev, perl, net-tools, iputils-ping, python, psmisc, libnet1-dev, iproute, libtool, libcurl4-openssl-dev | libcurl3-openssl-dev, libxml2-dev, bison, flex, uuid-dev, lynx, libbz2-dev, zlib1g-dev, uuid-dev, libsensors4-dev | libsensors-dev, libltdl3-dev, swig, openssh-client, libgnutls-dev, python-central (>= 0.5), python-dev, libpam0g-dev, libncurses5-dev, psmisc, libopenhpi-dev, libopenipmi-dev, autoconf, automake, libtool, xsltpro [...]
+Standards-Version: 3.8.4
+Homepage: http://hg.linux-ha.org/glue/
+XS-Python-Version: current
+
+Package: libcluster-glue
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: cluster-glue (<= 1.0.3-2), heartbeat (<= 2.99.2+sles11r9-5)
+Conflicts: cluster-glue (<= 1.0.3-2), heartbeat (<= 2.99.2+sles11r9-5)
+Description: The reusable cluster components for Linux HA (libraries)
+ This package contains the libraries provided by the cluster
+ glue component by the Linux-HA project; it offers various
+ re-usable cluster stack libraries. If you plan to run the
+ Linux-HA cluster stack, you will need this package.
+
+Package: libcluster-glue-dev
+Architecture: any
+Section: libdevel
+Depends: ${shlibs:Depends}, ${misc:Depends}, libcluster-glue (= ${binary:Version})
+Replaces: cluster-glue-dev (<= 1.0.3-2)
+Conflicts: cluster-glue-dev (<= 1.0.3-2)
+Description: The reusable cluster components for Linux HA (library dev files)
+ This package contains the headers for the libraries provided
+ by the cluster glue component by the Linux-HA project; it
+ offers various re-usable cluster stack libraries. If you plan
+ to run the Linux-HA cluster stack, you will need this package.
+
+Package: cluster-glue
+Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}, libauthen-radius-perl, libcrypt-ssleay-perl, libdbi-perl, libdigest-hmac-perl, libdigest-md5-perl, libmail-pop3client-perl, libmailtools-perl, libnet-dns-perl, libnet-imap-simple-perl, libnet-imap-simple-ssl-perl, libnet-ldap-perl, libnet-perl, libwww-perl, python
++Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, python, libtimedate-perl
+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: The reusable cluster components for Linux HA
+ This package contains various reusable cluster components from
+ the Linux HA project. Originally belonging to Heartbeat, they
+ can and sometimes must be used with OpenAIS driven clusters as
+ well.
+
+Package: cluster-glue-dev
+Architecture: any
+Depends: cluster-glue (= ${binary:Version}), ${misc:Depends}
+Replaces: libheartbeat2-dev (<= 2.99.2+sles11r9-5), heartbeat-dev (<= 2.99.2+sles11r9-5)
+Conflicts: libheartbeat2-dev (<= 2.99.2+sles11r9-5), heartbeat-dev (<= 2.99.2+sles11r9-5)
+Description: Development files for the cluster glue components
+ This package includes headers and static libraries for the glue
+ cluster components.
diff --cc debian/patches/01_stylesheet_path.dpatch
index 0000000,0000000..fbeae05
new file mode 100755
--- /dev/null
+++ b/debian/patches/01_stylesheet_path.dpatch
@@@ -1,0 -1,0 +1,19 @@@
++#! /bin/sh /usr/share/dpatch/dpatch-run
++## 01_stylesheet_path.dpatch by <ivoks at lucid.init.lan>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: No description.
++
++ at DPATCH@
++diff -urNad cluster-glue-1.0.2~rc2a~/doc/Makefile.am cluster-glue-1.0.2~rc2a/doc/Makefile.am
++--- cluster-glue-1.0.2~rc2a~/doc/Makefile.am 2009-12-23 14:34:45.000000000 +0000
+++++ cluster-glue-1.0.2~rc2a/doc/Makefile.am 2010-01-04 15:17:59.000000000 +0000
++@@ -33,7 +33,7 @@
++
++ EXTRA_DIST = $(man_MANS)
++
++-STYLESHEET_PREFIX ?= http://docbook.sourceforge.net/release/xsl/current
+++STYLESHEET_PREFIX ?= /usr/share/xml/docbook/stylesheet/docbook-xsl
++ MANPAGES_STYLESHEET ?= $(STYLESHEET_PREFIX)/manpages/docbook.xsl
++ HTML_STYLESHEET ?= $(STYLESHEET_PREFIX)/xhtml/docbook.xsl
++ FO_STYLESHEET ?= $(STYLESHEET_PREFIX)/fo/docbook.xsl
--
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