update to qemu 2.5.1.1, bump version to 2.5-16

diff --git a/Makefile b/Makefile
index 66c523db415d356883ab1efca5a2a4ba62090f6a..67b30dd0fdd23e511ebbea98b165069c3a0eabb5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=4.2
 
 # also update debian/changelog
 KVMVER=2.5
-KVMPKGREL=15
+KVMPKGREL=16
 
 KVMPACKAGE=pve-qemu-kvm
 KVMDIR=qemu-kvm
@@ -24,7 +24,7 @@ download:
        #git clone git://git.qemu-project.org/qemu.git -b stable-2.4 ${KVMDIR} 
        git clone git://git.qemu-project.org/qemu.git ${KVMDIR}
        # see https://bugs.launchpad.net/qemu/+bug/1488363?comments=all
-       cd ${KVMDIR}; git checkout v2.5.1; git revert --no-edit b8eb5512fd8a115f164edbbe897cdf8884920ccb
+       cd ${KVMDIR}; git checkout v2.5.1.1; git revert --no-edit b8eb5512fd8a115f164edbbe897cdf8884920ccb
        tar czf ${KVMSRC} --exclude CVS --exclude .git --exclude .svn ${KVMDIR}
 
 ${DEBS} kvm: ${KVMSRC}

diff --git a/debian/changelog b/debian/changelog
index 0ad8dfdfc5cf3265a6fbaef992858d20bceb5aa3..9fd65fb52122f71c3f867888c76d86cb22ff1f0f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pve-qemu-kvm (2.5-16) unstable; urgency=medium
+
+  * update to qemu 2.5.1.1
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 10 May 2016 09:53:30 +0200
+
 pve-qemu-kvm (2.5-15) unstable; urgency=medium
 
   * Fix #932: passing BDRV_O_PROTOCOL breaks qcow2 on gluster

diff --git a/qemu-kvm-src.tar.gz b/qemu-kvm-src.tar.gz
index 1360250d71b5491c3fd63204d6bf65c207961628..f20b269e298291cdb1355d119c441aa4723d488a 100644 (file)
Binary files a/qemu-kvm-src.tar.gz and b/qemu-kvm-src.tar.gz differ