diff -ruN 1.0.7/ubuntu-orig/cluster-glue-1.0.7/debian/changelog 1.0.8/cluster-glue-1.0.8/debian/changelog --- 1.0.7/ubuntu-orig/cluster-glue-1.0.7/debian/changelog 2011-06-04 04:32:04.000000000 +0000 +++ 1.0.8/cluster-glue-1.0.8/debian/changelog 2011-10-20 09:29:47.736402346 +0000 @@ -1,67 +1,55 @@ -cluster-glue (1.0.7-3.2ubuntu1) oneiric; urgency=low +cluster-glue (1.0.8-1) unstable; urgency=low - * Merge from Debian unstable. Remaining changes: - - debian/rules: Add -V argument to dh_makeshlibs. - - Enable Upstart RA: - + debian/cluster-glue.install: Install upstart RA. - + debian/control: Build-depends on libdbus-glib-1-dev and libdbus-1-dev. - + debian/patches/raexecupstart.patch: Fix deadlock - * Dropped changes, included in Debian: - - debian/rules: clean the dependency_libs out of .la files at build - time, per Policy 10.2 + * New upstream version 1.0.8. + * Added numerous new files to debian/cluster-glue.install - -- Steve Langasek Sat, 04 Jun 2011 04:32:03 +0000 + -- Martin Loschwitz Thu, 20 Oct 2011 09:05:29 +0000 -cluster-glue (1.0.7-3.2) unstable; urgency=low +cluster-glue (1.0.7+hg2618-3) UNRELEASED; urgency=low - * Non-maintainer upload. - * Remove references to other libraries from dependency_libs field - closes: #619551. + * Integrated numerous changes from the Ubuntu version of this package, + worth being mentioned is the upstart patch. - -- Luk Claes Sun, 29 May 2011 19:06:36 +0200 + -- Martin Loschwitz Thu, 20 Oct 2011 08:54:26 +0000 -cluster-glue (1.0.7-3.1ubuntu1) oneiric; urgency=low +cluster-glue (1.0.7+hg2618-2) unstable; urgency=low - * Merge from Debian unstable. Remaining changes: - - debian/rules: Add -V argument to dh_makeshlibs. - - Enable Upstart RA: - + debian/cluster-glue.install: Install upstart RA. - + debian/control: Build-depends on libdbus-glib-1-dev and libdbus-1-dev. - + debian/patches/raexecupstart.patch: Fix deadlock - - debian/rules: clean the dependency_libs out of .la files at build - time, per Policy 10.2 - * Dropped changes: - - debian/control: Tighten Replaces/Conflicts to Ubuntu version - no - reason to not use the same version number here. + * debian/control: Add proper Replaces: and Conflicts: for libstonithd0-dev + for libstonithd1-dev to avoid conflicting files (Closes: #639272) + * debian/rules: Install the logd.cf configuration file for logd as it was + missing up to this point (thanks to Andreas Kurz for pointing this out) - -- Steve Langasek Sat, 21 May 2011 00:31:47 +0000 + -- Martin Loschwitz Fri, 26 Aug 2011 06:09:24 +0000 -cluster-glue (1.0.7-3.1) unstable; urgency=high +cluster-glue (1.0.7+hg2618-1) unstable; urgency=low + + * New upstream Mercurial Checkout + * Acknowledging previous NMUs; thank you very much! + + -- Martin Loschwitz Wed, 24 Aug 2011 09:00:46 +0000 + +cluster-glue (1.0.7-3.3) unstable; urgency=low * Non-maintainer upload. - * High urgency for RC bug fix. - * Add missing dependency on libltdl-dev to libpils2-dev, closes: #621078. + * Also empty dependency_libs for plugins. - -- Julien Cristau Sun, 08 May 2011 17:29:13 +0200 + -- Luk Claes Sun, 03 Jul 2011 09:39:39 +0200 -cluster-glue (1.0.7-3ubuntu2) natty; urgency=low +cluster-glue (1.0.7-3.2) unstable; urgency=low - * debian/rules: clean the dependency_libs out of .la files at build - time, per Policy 10.2 + * Non-maintainer upload. + * Remove references to other libraries from dependency_libs field + closes: #619551. - -- Steve Langasek Thu, 24 Mar 2011 16:09:31 -0700 + -- Luk Claes Sun, 29 May 2011 19:06:36 +0200 -cluster-glue (1.0.7-3ubuntu1) natty; urgency=low +cluster-glue (1.0.7-3.1) unstable; urgency=high - * Merge from debian unstable (LP: #700161). Remaining changes: - - debian/control: Tighten Replaces/Conflicts to Ubuntu version. - - debian/rules: Add -V argument to dh_makeshlibs. - - Enable Upstart RA: - + debian/cluster-glue.install: Install upstart RA. - + debian/control: Build-depends on libdbus-glib-1-dev and libdbus-1-dev. - + debian/patches/raexecupstart.patch: Fix deadlock + * Non-maintainer upload. + * High urgency for RC bug fix. + * Add missing dependency on libltdl-dev to libpils2-dev, closes: #621078. - -- Andres Rodriguez Fri, 07 Jan 2011 18:45:39 -0500 + -- Julien Cristau Sun, 08 May 2011 17:29:13 +0200 cluster-glue (1.0.7-3) unstable; urgency=low @@ -82,21 +70,6 @@ -- Simon Horman Thu, 16 Dec 2010 21:34:47 +0900 -cluster-glue (1.0.6+hg2461-1ubuntu1) natty; urgency=low - - * Resync from debian experimental. - * debian/control: - - Remove ${shlibs:depends} from some library -dev packages. - - Add missing Section for library packages. - - Tighten Replaces/Conflicts to Ubuntu version. - * debian/rules: Add -V argument to dh_makeshlibs. - * Enable Upstart RA: - - debian/cluster-glue.install: Install upstart RA. - - debian/control: Build-depends on libdbus-glib-1-dev and libdbus-1-dev. - - debian/patches/raexecupstart.patch: Fix deadlock - - -- Andres Rodriguez Mon, 06 Dec 2010 17:38:41 -0500 - cluster-glue (1.0.6+hg2461-1) experimental; urgency=low * Upload to experimental @@ -246,4 +219,3 @@ * Initial release of packages for the cluster-glue-framework -- Martin Loschwitz Tue, 15 Sep 2009 09:56:16 +0000 - diff -ruN 1.0.7/ubuntu-orig/cluster-glue-1.0.7/debian/cluster-glue.install 1.0.8/cluster-glue-1.0.8/debian/cluster-glue.install --- 1.0.7/ubuntu-orig/cluster-glue-1.0.7/debian/cluster-glue.install 2011-06-04 00:41:47.000000000 +0000 +++ 1.0.8/cluster-glue-1.0.8/debian/cluster-glue.install 2011-10-20 09:10:21.000000000 +0000 @@ -55,6 +55,8 @@ usr/share/doc/cluster-glue/stonith/README.dracmc usr/share/doc/cluster-glue/stonith/README.wti_mpc usr/share/doc/cluster-glue/stonith/README.ibmrsa-telnet +usr/share/doc/cluster-glue/stonith/README.vcenter +usr/share/doc/cluster-glue/stonith/README.rackpdu usr/share/cluster-glue/lrmtest/testcases/BSC usr/share/cluster-glue/lrmtest/testcases/metadata usr/share/cluster-glue/lrmtest/testcases/metadata.exp @@ -90,3 +92,5 @@ usr/share/man/man8/hb_report.8 usr/share/man/man8/ha_logd.8 usr/share/man/man8/stonith.8 +usr/share/man/man8/lrmadmin.8 +usr/sbin/cibsecret diff -ruN 1.0.7/ubuntu-orig/cluster-glue-1.0.7/debian/control 1.0.8/cluster-glue-1.0.8/debian/control --- 1.0.7/ubuntu-orig/cluster-glue-1.0.7/debian/control 2011-06-04 00:41:47.000000000 +0000 +++ 1.0.8/cluster-glue-1.0.8/debian/control 2011-10-20 08:52:32.000000000 +0000 @@ -1,8 +1,7 @@ Source: cluster-glue Section: admin Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian HA Maintainers +Maintainer: Debian HA Maintainers Uploaders: Martin Loschwitz , Anibal Monsalve Salazar , Simon Horman , Frederik Schüler 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, xsltproc, docbook-xsl, chrpath, docbook-xml, libdbus-glib-1-dev, libdbus-1-dev Standards-Version: 3.9.1 @@ -63,8 +62,8 @@ Package: libstonith1 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: libcluster-glue (<= 1.0.6-1) -Conflicts: libcluster-glue (<= 1.0.6-1) +Replaces: libcluster-glue (<= 1.0.6-1), libstonith0 +Conflicts: libcluster-glue (<= 1.0.6-1), libstonith0 Description: Reusable cluster libraries -- libstonith1 This package contains the stonith library from cluster-glue, the reusable cluster components package. Install it if you want to @@ -118,8 +117,8 @@ Section: libdevel Architecture: any Depends: ${misc:Depends}, libstonith1 (= ${binary:Version}) -Replaces: libcluster-glue-dev (<= 1.0.6-1) -Conflicts: libcluster-glue-dev (<= 1.0.6-1) +Replaces: libcluster-glue-dev (<= 1.0.6-1), libstonith0-dev +Conflicts: libcluster-glue-dev (<= 1.0.6-1), 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 diff -ruN 1.0.7/ubuntu-orig/cluster-glue-1.0.7/debian/patches/raexecupstart.patch 1.0.8/cluster-glue-1.0.8/debian/patches/raexecupstart.patch --- 1.0.7/ubuntu-orig/cluster-glue-1.0.7/debian/patches/raexecupstart.patch 2011-03-24 23:05:26.000000000 +0000 +++ 1.0.8/cluster-glue-1.0.8/debian/patches/raexecupstart.patch 2011-10-20 09:28:08.921392733 +0000 @@ -1,8 +1,7 @@ -Index: cluster-glue-1.0.7/lrm/lrmd/lrmd.c -=================================================================== ---- cluster-glue-1.0.7.orig/lrm/lrmd/lrmd.c 2011-01-07 18:11:02.144936280 -0500 -+++ cluster-glue-1.0.7/lrm/lrmd/lrmd.c 2011-01-07 18:11:07.504936281 -0500 -@@ -1522,6 +1522,28 @@ +diff -ruN Reusable-Cluster-Components-glue--5ea7e344a633.old/lrm/lrmd/lrmd.c Reusable-Cluster-Components-glue--5ea7e344a633/lrm/lrmd/lrmd.c +--- Reusable-Cluster-Components-glue--5ea7e344a633.old/lrm/lrmd/lrmd.c 2011-10-19 15:18:06.000000000 +0000 ++++ Reusable-Cluster-Components-glue--5ea7e344a633/lrm/lrmd/lrmd.c 2011-10-20 09:26:43.385459974 +0000 +@@ -1533,6 +1533,28 @@ lrmd_client_t* client = (lrmd_client_t*) user_data; CHECK_ALLOCATED(client, "client", ); @@ -31,7 +30,7 @@ if (client->g_src != NULL) { G_main_del_IPC_Channel(client->g_src); } -@@ -1606,7 +1628,7 @@ +@@ -1617,7 +1639,7 @@ exist = lookup_client(client->pid); if (NULL != exist) { g_hash_table_remove(clients, (gpointer)&client->pid); diff -ruN 1.0.7/ubuntu-orig/cluster-glue-1.0.7/debian/rules 1.0.8/cluster-glue-1.0.8/debian/rules --- 1.0.7/ubuntu-orig/cluster-glue-1.0.7/debian/rules 2011-06-04 00:41:47.000000000 +0000 +++ 1.0.8/cluster-glue-1.0.8/debian/rules 2011-10-20 09:03:26.000000000 +0000 @@ -67,12 +67,16 @@ dh_testroot dh_prep -s $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp - for file in debian/tmp/usr/lib/*.la; do \ + 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 + chrpath -r "" debian/tmp/usr/lib/stonith/plugins/stonith2/ipmilan.so || true dh_install --sourcedir=$(CURDIR)/debian/tmp --list-missing + # install logd.cf configuration file + mkdir -p $(CURDIR)/debian/cluster-glue/etc/ + cp -ax $(CURDIR)/logd/logd.cf $(CURDIR)/debian/cluster-glue/etc/ + binary-common: dh_testdir dh_testroot