diff -ur tmp/debian/changelog xen-4.3.0/debian/changelog --- tmp/debian/changelog 2013-10-18 00:17:13.000000000 +0200 +++ xen-4.3.0/debian/changelog 2013-12-08 21:00:20.351864217 +0100 @@ -1,3 +1,9 @@ +xen (4.3.0-3.1) UNRELEASED; urgency=low + + * Reenabled building of qemu-dm + + -- Volker Klasen Sun, 08 Dec 2013 20:59:43 +0100 + xen (4.3.0-3) unstable; urgency=low * Revive hypervisor on i386. diff -ur tmp/debian/control xen-4.3.0/debian/control --- tmp/debian/control 2013-10-18 00:18:21.000000000 +0200 +++ xen-4.3.0/debian/control 2013-12-08 21:45:27.679351497 +0100 @@ -4,7 +4,7 @@ Maintainer: Debian Xen Team Uploaders: Guido Trotter , Bastian Blank Standards-Version: 3.9.4 -Build-Depends: debhelper (>> 7), dpkg-dev (>= 1.16.0~), lsb-release, python-dev, bcc, gcc-multilib, e2fslibs-dev, iasl, ipxe-qemu, seabios, libaio-dev, libglib2.0-dev, libgnutls-dev, liblzma-dev, libncurses5-dev, libpci-dev, libyajl-dev, libssl-dev, pkg-config, uuid-dev, zlib1g-dev, ocaml-nox, dh-ocaml, ocaml-findlib +Build-Depends: git, libpixman-1-dev, debhelper (>> 7), dpkg-dev (>= 1.16.0~), lsb-release, python-dev, bcc, gcc-multilib, e2fslibs-dev, iasl, ipxe-qemu, seabios, libaio-dev, libglib2.0-dev, libgnutls-dev, liblzma-dev, libncurses5-dev, libpci-dev, libyajl-dev, libssl-dev, pkg-config, uuid-dev, zlib1g-dev, ocaml-nox, dh-ocaml, ocaml-findlib XS-Python-Version: current Package: libxen-4.3 diff -ur tmp/debian/control.md5sum xen-4.3.0/debian/control.md5sum --- tmp/debian/control.md5sum 2013-10-18 00:18:21.000000000 +0200 +++ xen-4.3.0/debian/control.md5sum 2013-12-08 21:45:27.687351525 +0100 @@ -1,8 +1,8 @@ -22a892a035f25617633bbf1244a2110c debian/changelog +3b58984e01ba094c4a73b8d52425b0ac debian/changelog c379f09bde66561f34d361dd9f89e345 debian/bin/gencontrol.py a4fad0ec66d977759a362165bf8aa31d debian/templates/control.hypervisor.in e9166b8a1e6e9ac9e2fba6050a59fbdb debian/templates/control.main.in -d9d85cc5f2ddd8c23cc860bb4b1b3fe5 debian/templates/control.source.in +3c1b594d48ffc8552ddafa8b64c23803 debian/templates/control.source.in fe9f3e8a9c9b716f7b4c5b7d7aec3128 debian/templates/control.system.latest.in 7f13b99c446eb6cf64d21a2de26b9460 debian/templates/control.utils.in a15fa64ce6deead28d33c1581b14dba7 debian/templates/xen-hypervisor.postinst.in diff -ur tmp/debian/patches/tools-disable.diff xen-4.3.0/debian/patches/tools-disable.diff --- tmp/debian/patches/tools-disable.diff 2013-07-28 13:24:02.000000000 +0200 +++ xen-4.3.0/debian/patches/tools-disable.diff 2013-12-08 22:19:40.867179983 +0100 @@ -1,55 +0,0 @@ ---- a/tools/Makefile -+++ b/tools/Makefile -@@ -1,10 +1,6 @@ - XEN_ROOT = $(CURDIR)/.. - include $(XEN_ROOT)/tools/Rules.mk - --ifneq ($(CONFIG_SYSTEM_LIBAIO),y) --SUBDIRS-libaio := libaio --endif -- - SUBDIRS-y := - SUBDIRS-y += include - SUBDIRS-y += libxc -@@ -19,14 +15,7 @@ - SUBDIRS-y += console - SUBDIRS-y += xenmon - SUBDIRS-y += xenstat --SUBDIRS-$(CONFIG_Linux) += $(SUBDIRS-libaio) - SUBDIRS-$(CONFIG_Linux) += memshr --ifeq ($(CONFIG_X86),y) --SUBDIRS-$(CONFIG_Linux) += blktap --endif --SUBDIRS-$(CONFIG_Linux) += blktap2 --SUBDIRS-$(CONFIG_NetBSD) += $(SUBDIRS-libaio) --SUBDIRS-$(CONFIG_NetBSD) += blktap2 - SUBDIRS-$(CONFIG_NetBSD) += xenbackendd - SUBDIRS-y += libfsimage - SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen -@@ -34,9 +23,12 @@ - - # do not recurse in to a dir we are about to delete - ifneq "$(MAKECMDGOALS)" "distclean" -+CONFIG_QEMU = $(CURDIR)/../qemu -+ifneq ($(wildcard $(CONFIG_QEMU)),) - SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-traditional-dir - SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-dir - endif -+endif - - SUBDIRS-y += xenpmd - SUBDIRS-y += libxl ---- a/tools/Rules.mk -+++ b/tools/Rules.mk -@@ -41,11 +41,7 @@ - LDLIBS_libxenvchan = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) -L$(XEN_LIBVCHAN) -lxenvchan - SHLIB_libxenvchan = -Wl,-rpath-link=$(XEN_LIBVCHAN) - --ifeq ($(CONFIG_Linux),y) --LIBXL_BLKTAP ?= y --else - LIBXL_BLKTAP ?= n --endif - - ifeq ($(LIBXL_BLKTAP),y) - CFLAGS_libblktapctl = -I$(XEN_BLKTAP2)/control -I$(XEN_BLKTAP2)/include $(CFLAGS_xeninclude) diff -ur tmp/debian/rules.defs xen-4.3.0/debian/rules.defs --- tmp/debian/rules.defs 2013-10-05 17:04:53.000000000 +0200 +++ xen-4.3.0/debian/rules.defs 2013-12-08 21:09:09.734142489 +0100 @@ -1,4 +1,4 @@ -KERNELVERSION := 3.10-3 +KERNELVERSION := 3.11-2 BUILD_DIR = debian/build STAMPS_DIR = debian/stamps TEMPLATES_DIR = debian/templates diff -ur tmp/debian/rules.real xen-4.3.0/debian/rules.real --- tmp/debian/rules.real 2013-09-07 13:30:51.000000000 +0200 +++ xen-4.3.0/debian/rules.real 2013-12-09 20:03:35.336119779 +0100 @@ -118,6 +118,7 @@ touch $@ install-base: + sleep 1d dh_installchangelogs -XChangelog dh_installdirs dh_installdocs diff -ur tmp/debian/templates/control.source.in xen-4.3.0/debian/templates/control.source.in --- tmp/debian/templates/control.source.in 2013-08-11 22:30:59.000000000 +0200 +++ xen-4.3.0/debian/templates/control.source.in 2013-12-08 21:45:15.039307221 +0100 @@ -3,6 +3,8 @@ Maintainer: Debian Xen Team Uploaders: Guido Trotter , Bastian Blank Build-Depends: + git, + libpixman-1-dev, debhelper (>> 7), dpkg-dev (>= 1.16.0~), lsb-release,