[arch-commits] Commit in qemu/repos (3 files)

[Tobias Powalowski]

    Date: Friday, April 10, 2009 @ 04:19:02
  Author: tpowa
Revision: 34578

Merged revisions 34565 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/qemu/trunk

........
  r34565 | tpowa | 2009-04-10 07:18:29 +0000 (Fr, 10 Apr 2009) | 1 line
  
  upgpkg: qemu 0.10.2-2
........

Modified:
  qemu/repos/extra-i686/	(properties)
  qemu/repos/extra-i686/PKGBUILD
Deleted:
  qemu/repos/extra-i686/kvm-bios.diff

---------------+
 PKGBUILD      |    7 +++++--
 kvm-bios.diff |   17 -----------------
 2 files changed, 5 insertions(+), 19 deletions(-)


Property changes on: qemu/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /qemu/trunk:1-34248
   + /qemu/trunk:1-34576

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-10 08:18:41 UTC (rev 34577)
+++ extra-i686/PKGBUILD	2009-04-10 08:19:02 UTC (rev 34578)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=qemu
 pkgver=0.10.2
-pkgrel=1
+pkgrel=2
 pkgdesc="QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=(i686 x86_64)
 license=('GPL2' 'LGPL2')
@@ -10,6 +10,7 @@
 depends=('sdl' 'alsa-lib' 'esound' 'zlib' 'e2fsprogs' 'gnutls>=2.4.1' 'bluez')
 install=qemu.install
 source=(http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        65-kvm.rules
         70-kqemu.rules)
 
 build()
@@ -22,7 +23,9 @@
   make DESTDIR=${startdir}/pkg install || return 1
   install -D -m644 ${srcdir}/70-kqemu.rules \
                    ${pkgdir}/lib/udev/rules.d/70-kqemu.rules
-
+  install -D -m644 ${srcdir}/65-kvm.rules \
+                   ${pkgdir}/lib/udev/rules.d/65-kqemu.rules
 }
 md5sums=('85a323cdf620687f39c5328f450a547d'
+         'cead7ba387159d360f892281499975df'
          'ec06591830b8fcf53913f05f3d66f7e5')

Deleted: extra-i686/kvm-bios.diff
===================================================================
--- extra-i686/kvm-bios.diff	2009-04-10 08:18:41 UTC (rev 34577)
+++ extra-i686/kvm-bios.diff	2009-04-10 08:19:02 UTC (rev 34578)
@@ -1,17 +0,0 @@
---- kvm-72/qemu/hw/pc.c.orig	2008-05-06 20:48:35.468799015 +0200
-+++ kvm-72/qemu/hw/pc.c	2008-05-06 20:50:00.392123267 +0200
-@@ -37,10 +37,10 @@
- /* output Bochs bios info messages */
- //#define DEBUG_BIOS
- 
--#define BIOS_FILENAME "bios.bin"
--#define VGABIOS_FILENAME "vgabios.bin"
--#define VGABIOS_CIRRUS_FILENAME "vgabios-cirrus.bin"
--#define EXTBOOT_FILENAME "extboot.bin"
-+#define BIOS_FILENAME "bios-kvm.bin"
-+#define VGABIOS_FILENAME "vgabios-kvm.bin"
-+#define VGABIOS_CIRRUS_FILENAME "vgabios-cirrus-kvm.bin"
-+#define EXTBOOT_FILENAME "extboot-kvm.bin"
- 
- #define PC_MAX_BIOS_SIZE (4 * 1024 * 1024)
-