Merge lp:~serge-hallyn/ubuntu/oneiric/ipxe/link-kvm into lp:ubuntu/oneiric/ipxe

[Serge Hallyn]

Move links into place for use by qemu-kvm.

[lp:~serge-hallyn/ubuntu/oneiric/ipxe/link-kvm]

6. By Serge Hallyn on 2011-08-18

Qemu-kvm 0.15.0 switches from *.bin to *.rom.

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-31 20:57:02 +0000
+++ debian/changelog	2011-08-18 18:37:25 +0000
@@ -1,3 +1,16 @@
+ipxe (1.0.0+git-2.149b50-1ubuntu2) oneiric; urgency=low
+
+  * Qemu-kvm 0.15.0 switches from *.bin to *.rom.
+
+ -- Serge Hallyn <[e-mail]>  Thu, 18 Aug 2011 13:34:38 -0500
+
+ipxe (1.0.0+git-2.149b50-1ubuntu1) oneiric; urgency=low
+
+  * Copy roms into /usr/share/qemu for consumption by
+    qemu-kvm.
+
+ -- Serge Hallyn <[e-mail]>  Thu, 18 Aug 2011 08:22:38 -0500
+
 ipxe (1.0.0+git-2.149b50-1) unstable; urgency=low
 
   * New snapshot.
 
=== modified file 'debian/control'
--- debian/control	2011-07-31 20:57:02 +0000
+++ debian/control	2011-08-18 18:37:25 +0000
@@ -1,7 +1,8 @@
 Source: ipxe
 Section: admin
 Priority: optional
-Maintainer: Bastian Blank <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Bastian Blank <[e-mail]>
 Build-Depends: debhelper (>= 7.0.50~),
  genisoimage, syslinux
 Standards-Version: 3.9.1
 
=== added file 'debian/ipxe.dirs'
--- debian/ipxe.dirs	1970-01-01 00:00:00 +0000
+++ debian/ipxe.dirs	2011-08-18 18:37:25 +0000
@@ -0,0 +1,1 @@
+usr/share/qemu
 
=== added file 'debian/ipxe.links'
--- debian/ipxe.links	1970-01-01 00:00:00 +0000
+++ debian/ipxe.links	2011-08-18 18:37:25 +0000
@@ -0,0 +1,5 @@
+usr/lib/ipxe/virtio-net.rom usr/share/qemu/pxe-virtio.rom
+usr/lib/ipxe/rtl8139.rom usr/share/qemu/pxe-rtl8139.rom
+usr/lib/ipxe/pcnet32.rom usr/share/qemu/pxe-pcnet32.rom
+usr/lib/ipxe/ne2k_isa.rom usr/share/qemu/pxe-ne2k_isa.rom
+usr/lib/ipxe/e1000_82540.rom usr/share/qemu/pxe-e1000.rom