[Debian-ha-commits] [cluster-glue] 35/73: Imported Debian patch 1.0.9+hg2665-1

[Richard Winters]

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 25d168806e78cf459f398bbf74a4bd88a4b2169d
Author: Martin Loschwitz <madkiss at debian.org>
Date:   Wed Feb 29 15:33:34 2012 +0000

    Imported Debian patch 1.0.9+hg2665-1
---
 debian/changelog            | 12 ------------
 debian/cluster-glue.install |  1 +
 debian/patches/series       |  0
 debian/rules                |  2 +-
 4 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9fb57aa..6ea296f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,3 @@
-cluster-glue (1.0.9+hg2665-1~bpo60+2) squeeze-backports; urgency=low
-
-  * Disable upstart for this backport 
-
- -- Martin Loschwitz <madkiss at debian.org>  Tue, 13 Mar 2012 21:19:45 +0000
-
-cluster-glue (1.0.9+hg2665-1~bpo60+1) squeeze-backports; urgency=low
-
-  * Rebuild for squeeze-backports.
-
- -- Martin Loschwitz <madkiss at debian.org>  Mon, 12 Mar 2012 07:25:25 +0000
-
 cluster-glue (1.0.9+hg2665-1) unstable; urgency=low
 
   * Update to latest upstream mercurial tip; includes a fix for the IPMI
diff --git a/debian/cluster-glue.install b/debian/cluster-glue.install
index 5cde163..62160ed 100644
--- a/debian/cluster-glue.install
+++ b/debian/cluster-glue.install
@@ -7,6 +7,7 @@ usr/lib/heartbeat/plugins/InterfaceMgr/generic.so
 usr/lib/heartbeat/plugins/RAExec/lsb.so
 usr/lib/heartbeat/plugins/RAExec/ocf.so
 usr/lib/heartbeat/plugins/RAExec/heartbeat.so
+usr/lib/heartbeat/plugins/RAExec/upstart.so
 usr/lib/heartbeat/plugins/test/test.so
 usr/lib/heartbeat/lrmd
 usr/lib/heartbeat/ha_logd
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e69de29
diff --git a/debian/rules b/debian/rules
index fcd1b37..e9cb990 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@ configure-stamp:
 	./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-upstart --disable-fatal-warnings
+		    --enable-upstart --disable-fatal-warnings
 	touch configure-stamp
 
 build: build-arch build-indep

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/cluster-glue.git