[Debian-ha-commits] [cluster-glue] 05/73: Imported Debian patch 1.0.3+hg2366-3

[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 67d8e27e3e38bb904da98f437492fc630f1e1b9b
Author: Martin Loschwitz <madkiss at debian.org>
Date:   Tue Mar 30 11:03:34 2010 +0000

    Imported Debian patch 1.0.3+hg2366-3
---
 debian/changelog            | 12 ++++++++++++
 debian/cluster-glue.install |  5 +++++
 debian/control              |  4 ++--
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2d8001c..ba2d08f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+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.
diff --git a/debian/cluster-glue.install b/debian/cluster-glue.install
index 18bdbfd..4cae17f 100644
--- a/debian/cluster-glue.install
+++ b/debian/cluster-glue.install
@@ -84,3 +84,8 @@ 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
+usr/share/man/man1/ha_logger.1 
+usr/share/man/man8/meatclient.8 
+usr/share/man/man8/hb_report.8
+usr/share/man/man8/ha_logd.8
+usr/share/man/man8/stonith.8
diff --git a/debian/control b/debian/control
index 85b1f96..0ca315e 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,8 @@ XS-Python-Version: current
 Package: libcluster-glue
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: cluster-glue (<= 1.0.3-2)
-Conflicts: cluster-glue (<= 1.0.3-2)
+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

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