[Debian-ha-svn-commits] [SCM] corosync Debian packaging branch, master, updated. debian/1.0.0-7

[Guido Günther]

The following commit has been merged in the master branch:
commit a30099394e9ba35dae5639414241f79301d2602c
Author: Guido Günther <agx at sigxcpu.org>
Date:   Mon Oct 5 17:50:07 2009 +0200

    Conflict on openais
    
    Closes: #549634

diff --git a/debian/control b/debian/control
index 24d4a9f..609fa22 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Package: corosync
 Section: admin
 Architecture: any
 Depends: ${shlibs:Depends}, lsb-base (>= 3.0-6), libcorosync4 (>= ${binary:Verson}), adduser
-Conflicts: openais (<< 0.85)
+Conflicts: openais (<< 0.85), openais-legacy (<< 1.0.0)
 Description: Standards-based cluster framework (daemon and modules)
  The corosync project is a project to implement a production quality
  "Revised BSD" licensed implementation of all core functionalities

-- 
corosync Debian packaging