[Pkg-ganeti-devel] [SCM] Ganeti packaging branch, master, updated. debian/2.6.2-2-1-g825709f

[Guido Trotter]

The following commit has been merged in the master branch:
commit 825709f6e3fbb34fb43246c912ffc13c42ad8821
Author: Guido Trotter <ultrotter at google.com>
Date:   Mon Apr 22 14:24:26 2013 +0200

    ganeti (2.6.2-3) experimental; urgency=low
    
      * Add dependency on fping: this is needed now by the master-ip-setup
        script (Closes: #705005)
      * Update Xen recommends to be version-independent (Closes: #696133)
    
     -- Guido Trotter <ultrotter at debian.org>  Mon, 22 Apr 2013 14:22:04 +0200
    
    Signed-off-by: Guido Trotter <ultrotter at google.com>

diff --git a/debian/changelog b/debian/changelog
index db377a1..0b2acd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ganeti (2.6.2-3) experimental; urgency=low
+
+  * Add dependency on fping: this is needed now by the master-ip-setup
+    script (Closes: #705005)
+  * Update Xen recommends to be version-independent (Closes: #696133)
+
+ -- Guido Trotter <ultrotter at debian.org>  Mon, 22 Apr 2013 14:22:04 +0200
+
 ganeti (2.6.2-2) experimental; urgency=low
 
   * Fix dependencies for Template Haskell: according to DHG, need to
diff --git a/debian/control b/debian/control
index 9b06126..2732c8e 100644
--- a/debian/control
+++ b/debian/control
@@ -23,10 +23,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, lvm2,
  openssh-client, openssh-server, bridge-utils, iproute, iputils-arping,
  openssl, python-simplejson, python-pyparsing, python-openssl,
  python-pyinotify, python-pycurl, python-paramiko,
- socat, libjs-jquery
+ socat, libjs-jquery, fping
 Recommends: drbd8-utils (>= 8.0.7), qemu-kvm |
- xen-linux-system-2.6.32-5-xen-amd64 | xen-linux-system-2.6.32-5-xen-686,
- ganeti-instance-debootstrap, ndisc6
+ xen-linux-system-amd64 | xen-linux-system-686 |
+ xen-linux-system-686-pae, ganeti-instance-debootstrap,
+ ndisc6
 Breaks: ganeti-htools (<< 0.3)
 Suggests: drbd8-module-source (>= 8.0.7)
 Provides: ${python:Provides}

-- 
Ganeti packaging