-
Committer:
Package Import Robot
-
Author(s):
Serge Hallyn
-
Date:
2013-01-14 23:22:51 UTC
-
mfrom:
(1.6.7)
(11.1.12 experimental)
-
Revision ID:
package-import@ubuntu.com-20130114232251-zuuixzxdshv9uu7s
Tags: 1.3.0+dfsg-1~exp3ubuntu1
* Merge 1.3.0+dfsg-1~exp3. Remaining ubuntu delta:
- debian/control:
* update maintainer
* remove vde2 recommends
* build-deps: remove libusbredir, libvdeplug2-dev,
libspice-server-dev, libspice-protocol-dev, libiscsi-dev,
and libxen-dev.
* qemu-keymaps: break/replace qemu-common
* qemu-system:
- break/replace qemu-common
- depend on udev
- remove openbios-ppc, openbios-sparc, and openhackware from
Depends. (Intend to add them back once we can build them.)
- provides: qemu-kvm
* qemu-utils: break/replace qemu-kvm
* set up transitional packages for qemu-kvm, qemu-common, and kvm.
- qemu-kvm.upstart:
- add qemu-system.qemu-kvm.upstart
- debian/rules: add dh_installinit to get qemu-system.upstart installed.
- take the defaults from the old qemu-kvm.defaults, and move them into
the upstart job
- debian/patches:
- apply gridcentric patches from lp:~amscanne/+junk/gridcentric-qemu-patches
- apply arm patches from git://git.linaro.org/qemu/qemu-linaro.git
- ifup/down:
- copy Debian qemu-kvm's kvm-ifup/down into debian/
- fix dh_install for kvm-ifup/down in debian/rules
- add links for qemu-ifup/down in qemu-system.links
- remove (debian's original) qemu-ifup from qemu-system.install
- debian/qemu-system.postinst
- udevadm trigger to fix up /dev/kvm perms
- make the 'qemu' symlink point to qemu-system-x86_64, not -i386.
- debian/qemu-system.links:
- point 'kvm' to qemu-system-x86_64
- remove pxe-virtio, pxe-e1000 and pxe-rtl8139 links (which conflict
with ones from kvm-ipxe). We may want to move the links from kvm-ipxe
back to qemu-system at some point.
* Add note about kvm to qemu-system.README.debian.
* Copy kvm-ifup and kvm-ifdown from debian's qemu-kvm
* Remove TAPBR from qemu-kvm.conf.
* Make sure /dev/kvm gets its acls cleared:
- Add acl to qemu-system.depends
- update qemu-system.udev to run setfacl to set g::rw acl
* qemu-system.qemu-kvm.conf: don't rmmod at stop
* Remove vnc-jpeg, libiscsi-dev, and vde from debian/configure-opts
* Remove hugepages sysctl file - qemu now supports transparent hugepages.