[Pkg-ganeti-devel] [SCM] Ganeti packaging branch, master, updated. debian/2.7.0-1-35-gc8c6125

[Apollon Oikonomopoulos]

The following commit has been merged in the master branch:
commit c8c6125b43f3f13f8c5bd89323e66d926e421723
Author: Apollon Oikonomopoulos <apoikos at gmail.com>
Date:   Thu Jul 18 13:09:30 2013 +0300

    ganeti-haskell replaces & breaks ganeti2 << 2.7.0
    
    This solves the /usr/sbin/ganeti-confd conflict and closes #717242.
    
    We replace and break << 2.7.0-2 because apart from ganeti-confd, we have also
    moved the mon-collector manpage from ganeti2 2.7.0-1 to ganeti-haskell.

diff --git a/debian/changelog b/debian/changelog
index e03d45f..9ea45aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ganeti (2.7.0-2) unstable; urgency=low
   [ Apollon Oikonomopoulos ]
   * Rename ganeti2 to ganeti
   * Add missing dependencies on python-bitarray and python-ipaddr
+  * ganeti-haskell Replaces & Breaks older ganeti2 packages (Closes: #717242)
   * Build system refactoring
     - Use the dh sequencer and cleanup debian/rules
     - Switch from dh_pysupport to dh_python2
diff --git a/debian/control b/debian/control
index 6806e55..c97e3ca 100644
--- a/debian/control
+++ b/debian/control
@@ -60,6 +60,8 @@ Description: transitional dummy package
 Package: ganeti-haskell
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: ganeti2 (<< 2.7.0-2)
+Breaks: ganeti2 (<< 2.7.0-2)
 Description: Cluster-based virtualization management software - Haskell components
  Ganeti is a virtual server cluster management software tool built on top
  of the Xen virtual machine monitor and other Open Source software. After

-- 
Ganeti packaging