From b668c1fd695ef0bcb59fc0a15c29c97cd2bbdb94 Mon Sep 17 00:00:00 2001
From: Dimitris Aragiorgis <dimara@grnet.gr>
Date: Tue, 5 Jun 2012 17:04:09 +0300
Subject: [PATCH] Modify debian files

Bump 2.6.0~beta1 version in changelog
Add ganeti-htools in Provides, Conflicts, Replaces in control file

Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>
---
 debian/changelog | 2 +-
 debian/control   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 439f69ebd..9011e6b33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-snf-ganeti (2.5.0+ippool+private+rapi-1) stable; urgency=low
+snf-ganeti (2.6.0~beta1+ippool-1) stable; urgency=low
 
   GRNET-specific package against google's master branch
   The package contains google's current master branch +
diff --git a/debian/control b/debian/control
index 9bf4daf88..b8b5d931e 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,8 @@ Vcs-Browser: https://code.grnet.gr/git/snf-ganeti
 
 Package: snf-ganeti
 Architecture: all
-Conflicts: ganeti, ganeti2
-Replaces: ganeti2
+Conflicts: ganeti, ganeti2, ganeti-htools
+Replaces: ganeti2, ganeti-htools
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, lvm2,
  openssh-client, openssh-server, bridge-utils, iproute, iputils-arping,
  openssl, python-simplejson, python-pyparsing, python-openssl,
@@ -24,7 +24,7 @@ Recommends: drbd8-utils (>= 8.0.7), qemu-kvm |
  ganeti-instance-debootstrap, ndisc6, ceph-common
 #Breaks: ganeti-htools (<< 0.3)
 Suggests: drbd8-module-source (>= 8.0.7)
-Provides: ${python:Provides}, ganeti2
+Provides: ${python:Provides}, ganeti2, ganeti-htools
 Description: Cluster-based virtualization management software
  Ganeti is a virtual server cluster management software tool built on top
  of the Xen virtual machine monitor and other Open Source software. After
-- 
GitLab