[Debian-ha-maintainers] Bug#649068: rgmanager and resource-agents: error when trying to install together

[Ivo De Decker]

Control: tag -1 patch

Hi,

On Fri, Sep 14, 2012 at 02:29:57PM +0200, Ralf Treinen wrote:
> I have unarchived this bug since it still applies to the version of
> rgmanager in testing:

I attached a patch for a possible testing-proposed-updates upload, which
removes the conflicting files from rgmanager (just like in the version in
unstable).

With this patch, both packages can be installed together. I did not test the
functionality.

Cheers,

Ivo

-------------- next part --------------
diff -u redhat-cluster-3.0.12/debian/rgmanager.install redhat-cluster-3.0.12/debian/rgmanager.install
--- redhat-cluster-3.0.12/debian/rgmanager.install
+++ redhat-cluster-3.0.12/debian/rgmanager.install
@@ -7,7 +7,8 @@
 usr/sbin/clusvcadm
 usr/sbin/rgmanager
 usr/sbin/rg_test
-usr/share/cluster/*
+usr/share/cluster/follow-service.sl
+usr/share/cluster/default_event_script.sl
 usr/share/man/man8/clubufflush.8
 usr/share/man/man8/clufindhostname.8
 usr/share/man/man8/clulog.8
diff -u redhat-cluster-3.0.12/debian/changelog redhat-cluster-3.0.12/debian/changelog
--- redhat-cluster-3.0.12/debian/changelog
+++ redhat-cluster-3.0.12/debian/changelog
@@ -1,3 +1,11 @@
+redhat-cluster (3.0.12-3.3) testing-proposed-updates; urgency=low
+
+  * Non-maintainer upload.
+  * Upload to testing for wheezy.
+  * Don't install files already in resource-agents. (Closes: #649068)
+
+ -- Ivo De Decker <ivo.dedecker at ugent.be>  Sun, 02 Dec 2012 12:32:10 +0100
+
 redhat-cluster (3.0.12-3.2) unstable; urgency=low
 
   * Non-maintainer upload.