update to latest upstream (v2.4.0-rc2 + a few patches)

diff --git a/Makefile b/Makefile
index d23358ff24025f162d87de7868641f67c6e7348b..18e3f122233afed4ee8519ba0e3f532fbb848d8c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=4.0
 
 # also update debian/changelog
 KVMVER=2.3
-KVMPKGREL=6
+KVMPKGREL=7
 
 KVMPACKAGE=pve-qemu-kvm
 KVMDIR=qemu-kvm
@@ -23,7 +23,7 @@ download:
        rm -rf ${KVMDIR} ${KVMSRC}
        #git clone git://git.qemu-project.org/qemu.git -b stable-2.2 ${KVMDIR} 
        git clone git://git.qemu-project.org/qemu.git ${KVMDIR} 
-       cd ${KVMDIR}; git checkout v2.3.0
+       #cd ${KVMDIR}; git checkout v2.4.0
        tar czf ${KVMSRC} --exclude CVS --exclude .git --exclude .svn ${KVMDIR}
 
 ${DEBS} kvm: ${KVMSRC}

diff --git a/debian/changelog b/debian/changelog
index 7feca256234b51305bbb81eb1f72ac143b4c4b62..baf77d024fade655c89fe9f4b03ea1648c6e66cb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pve-qemu-kvm (2.3-7) unstable; urgency=medium
+
+  * update to latest upstream (v2.4.0-rc2 + a few patches)
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 27 Jul 2015 09:59:07 +0200
+
 pve-qemu-kvm (2.3-6) unstable; urgency=medium
 
   * qemu : add drive-mirror sleep patches

diff --git a/qemu-kvm-src.tar.gz b/qemu-kvm-src.tar.gz
index 645a183369c71254c4fe810e5721dca932e30cec..07de1821dc0402429d8b67234d3c06ddaccb51d0 100644 (file)
Binary files a/qemu-kvm-src.tar.gz and b/qemu-kvm-src.tar.gz differ