fix cpu types

debian/changelog.Debian

+pve-manager (2.2-32) unstable; urgency=low
+
+  * add new cpu types:  Haswell and Opteron_G5
+  
+  * remove rhel specific cpu types: cpu64-rhel6 and cpu64-rhel5
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 27 Nov 2012 06:46:35 +0100
+
 pve-manager (2.2-31) unstable; urgency=low
 
   * Brazilian Transtalion (done by Maila Networks)

defines.mk

@@ -2,7 +2,7 @@ RELEASE=2.2
 
 VERSION=2.2
 PACKAGE=pve-manager
-PACKAGERELEASE=31
+PACKAGERELEASE=32
 
 BINDIR=${DESTDIR}/usr/bin
 PERLLIBDIR=${DESTDIR}/usr/share/perl5

www/manager/form/CPUModelSelector.js

@@ -19,17 +19,17 @@ Ext.define('PVE.form.CPUModelSelector', {
 	    ['phenom', 'phenom'],
 	    ['qemu32', 'qemu32'],
 	    ['qemu64', 'qemu64'],
-	    ['cpu64-rhel6', 'cpu64-rhel6'],
-	    ['cpu64-rhel5', 'cpu64-rhel5'],
 	    ['Conroe', 'Conroe'],
 	    ['Penryn', 'Penryn'],
 	    ['Nehalem', 'Nehalem'],
 	    ['Westmere', 'Westmere'],
 	    ['SandyBridge', 'SandyBridge'],
+	    ['Haswell', 'Haswell'],
 	    ['Opteron_G1', 'Opteron_G1'],
 	    ['Opteron_G2', 'Opteron_G2'],
 	    ['Opteron_G3', 'Opteron_G3'],
 	    ['Opteron_G4', 'Opteron_G4'],
+	    ['Opteron_G5', 'Opteron_G5'],
 	    ['host', 'host']
 	];