[Debian-ha-commits] [cluster-glue] 24/73: Imported Debian patch 1.0.7+hg2618-2~bpo60+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 39017391a3084822f5e195368f263c34e762084c
Author: Martin Loschwitz <madkiss at debian.org>
Date:   Fri Aug 26 08:01:06 2011 +0000

    Imported Debian patch 1.0.7+hg2618-2~bpo60+1
---
 debian/changelog | 15 +++++++++++++++
 debian/control   |  8 ++++----
 debian/rules     |  4 ++++
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bb420c8..a586dc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+cluster-glue (1.0.7+hg2618-2~bpo60+1) squeeze-backports; urgency=low
+
+  * Rebuild for squeeze-backports.
+
+ -- Martin Loschwitz <madkiss at debian.org>  Fri, 26 Aug 2011 08:01:06 +0000
+
+cluster-glue (1.0.7+hg2618-2) unstable; urgency=low
+
+  * 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)
+
+ -- Martin Loschwitz <madkiss at debian.org>  Fri, 26 Aug 2011 06:09:24 +0000
+
 cluster-glue (1.0.7+hg2618-1) unstable; urgency=low
 
   * New upstream Mercurial Checkout
diff --git a/debian/control b/debian/control
index dbf4995..649eefb 100644
--- a/debian/control
+++ b/debian/control
@@ -62,8 +62,8 @@ Description: Reusable cluster libraries -- libplumbgpl2
 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 
@@ -117,8 +117,8 @@ Package: libstonith1-dev
 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 --git a/debian/rules b/debian/rules
index 37e4a68..fab2898 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,6 +72,10 @@ install-arch:
 	done
 	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

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