update to 1.2.0-rc1

diff --git a/Makefile b/Makefile
index b2ab518f8bf1eebc9b29400943737a3d4139bf8f..51aaf9c8a8f108874f53d8377c0503eda76fea66 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 RELEASE=2.1
 
 # also update debian/changelog
-KVMVER=1.1
-KVMPKGREL=8
+KVMVER=1.2
+KVMPKGREL=1
 
 KVMPACKAGE=pve-qemu-kvm
 KVMDIR=qemu-kvm
@@ -17,9 +17,8 @@ all: ${KVM_DEB} ${KVMSRC}
 .PHONY: download
 download:
        rm -rf ${KVMDIR} ${KVMSRC}
-       git clone git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git -b stable-1.1 ${KVMDIR} 
-       # fixme checkout correct version
-       # cd ${KVMDIR}; git checkout -b local qemu-kvm-${KVMVER}
+       git clone git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git -b master ${KVMDIR} 
+       #git clone git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git -b stable-1.1 ${KVMDIR} 
        tar czf ${KVMSRC} --exclude CVS --exclude .git --exclude .svn ${KVMDIR}
 
 ${KVM_DEB} kvm: ${KVMSRC}

diff --git a/debian/changelog b/debian/changelog
index fb64a61127e29b8bb9ce55e727668e767031afba..9f12e9f9a7e1c954a6b53308a2f33c9e28844aeb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pve-qemu-kvm (1.2-1) unstable; urgency=low
+
+  * update to 1.2.0-rc1
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 27 Aug 2012 14:12:22 +0200
+
 pve-qemu-kvm (1.1-8) unstable; urgency=low
 
   * fix bug 241: compile it with alsa support instead of oss

diff --git a/qemu-kvm-src.tar.gz b/qemu-kvm-src.tar.gz
index 3fa972166d6ed47b793e58fb522a5cb204aec0b1..e4105abb063b95700506c39757d59967d83b77e2 100644 (file)
Binary files a/qemu-kvm-src.tar.gz and b/qemu-kvm-src.tar.gz differ