[Debian-ha-commits] [pcs] 02/05: Conflict with python-pcs.

[Christoph Berg]

This is an automated email from the git hooks/post-receive script.

myon pushed a commit to branch master
in repository pcs.

commit e7b0aa0745e946583ced6c409791ec5e24154e40
Author: Christoph Berg <myon at debian.org>
Date:   Thu Mar 10 20:05:00 2016 +0100

    Conflict with python-pcs.
    
    This (unrelated) python module installs files to the same location as we do.
    (Closes: #814516) Installing our files to a different location would still risk
    this module getting loaded when we wanted our own files. The real solution
    would be renaming our (private) module, but this seems infeasible for now.
---
 debian/changelog | 9 +++++++--
 debian/control   | 3 +++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 69c3750..fa5c089 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
-pcs (0.9.148-2) UNRELEASED; urgency=medium
+pcs (0.9.148-2) unstable; urgency=medium
 
   * Use non-multi-arch settings.py/rb on all architectures.
     (Closes: #814450)
+  * Conflict with python-pcs. This (unrelated) python module installs files to
+    the same location as we do. (Closes: #814516)
+    Installing our files to a different location would still risk this module
+    getting loaded when we wanted our own files. The real solution would be
+    renaming our (private) module, but this seems infeasible for now.
 
- -- Christoph Berg <myon at debian.org>  Mon, 07 Mar 2016 21:38:05 +0100
+ -- Christoph Berg <myon at debian.org>  Thu, 10 Mar 2016 20:04:36 +0100
 
 pcs (0.9.148-1.1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 1fad54f..6b96ae4 100644
--- a/debian/control
+++ b/debian/control
@@ -41,6 +41,9 @@ Depends: ${shlibs:Depends},
 Recommends: pacemaker (>= 1.1.12)
 Replaces: pacemaker (<< 1.1.12)
 Breaks: pacemaker (<< 1.1.12)
+# unrelated python module that installs files in the same location;
+# conflict with it so it isn't loaded accidentally
+Conflicts: python-pcs
 Description: Pacemaker Configuration System
  pcs is a corosync and pacemaker configuration tool.  It permits 
  users to easily view, modify and create pacemaker based clusters.

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