Merge ~libvirt-maintainers/ubuntu/+source/libvirt:ubuntu/cosmic-4.6 into ubuntu/+source/libvirt:debian/sid

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

Hi,
being one of the usual more complex merges this needs a few more words than usual.

This is managed in git predating git-ubuntu and benefits from Debian and Ubuntu repos being very close.
Repos involved:
- LP: git+ssh://git.launchpad.net/~libvirt-maintainers/ubuntu/+source/libvirt
- Salsa: https://salsa.debian.org/libvirt-team/libvirt.git

As a mapping guide:
Tag from Salsa: debian/4.6.0-1 == new/debian
Old Branch LP: ubuntu/cosmic-4.0 == old/ubuntu
New Branch LP: ubuntu/cosmic-4.6 == the merge branch

The old branch was based on debian/4.0.0-1 and we will rebase following our process using Debians tags directly as that gives us full Debian+Ubuntu+upstream history in git.

OTOH the MP here is trying to follow our process to ease review, but instead of doing so against usd-import-team with the repos mentioned above you should get the best data for a review.

In addition to the above I have created a logical tag which does the usual squashing and changelog drop ubuntu/logical/4.0.0-1ubuntu12

It also will eventually be no real merge, it will be the new cosmic-4.6 branch based on Debians debian/4.6.0-1 - as we keep a branch per release. But we have fake-merges enough, it is reviewable with the changes against old/ubuntu and new/debian that way and this is what we need.

Overall the list of Dropped/Added changes in the changelog explains the reasoning for each.

## Merge Notes ##
This is about things that are hard to track on review, like old logical split being imperfect or multiple changes in old changelog as one entry.

Note 1: Due to quilt layering the old change "- 4.0 needs a reversed rule for openGraphicsFD (LP: #1747442)" had changes to other patches - but those only modified the context of the patches. Therefore those bits could be dropped.

Note 2: on the changes related to network autostart, the condition #2+#3 in the comment in debian/libvirt-daemon-system.postinst can no more occur due to upgrades going through 18.04 - therefore simplify the postinst code and Drop the preinst-code. The base change + the cleanups + the later strip of the no more needed parts became clear on the merge so they were squashed on the merge.

## In flight changes ##
I was waiting for a few changes to be fully accepted upstream and/or in Debian. But OTOH I don't want to stall this more thna needed (late enough and migration can be hard sometimes as we know).
If nothing comes back on these until Friday I'll upload them as-is, worst case there will be minor uploads to cosmic which should be ok after Feature Freeze - they should only be clenaups and not massively change it.
In flight are:
=> https://www.redhat.com/archives/libvir-list/2018-August/msg00780.html (old and new apparmor changes)
=> https://salsa.debian.org/libvirt-team/libvirt/merge_requests/5 (LP: #1786179)
=> https://salsa.debian.org/libvirt-team/libvirt/merge_requests/6 (LP: #1786019)

## Tests ##
This already passed a set of tests:
- automated migration, upgrade and device tests on s390x, x86, ppc64el
- autopkgtests (and dependent tests) on LP infra
- manual tests around the new local apparmor include
- manual tests around the service dependency issue that was found
- tests in regard to Del...

[Christian Ehrhardt  (paelzer)]

When merges get complex the LP view gets crazy, please follow the git repos and branches outlined in the former message.

[Christian Ehrhardt  (paelzer)]

FYI: updated link after fixing the Debian smoke-lxc issue
autopkgtests: https://bileto.ubuntu.com/excuses/3349/cosmic.html

[Christian Ehrhardt  (paelzer)]

Updated 4 patches to the state I got it upstreamed.
This includes dropping the fix for qemu-smb as it was too mcuh of a security concern.

[Andreas Hasenack (ahasenack)]

Let's see how much I can get done

[Andreas Hasenack (ahasenack)]

You seem to be missing cosmic's current upload which is 4.0.0-1ubuntu13, not 1ubuntu12. Both in your d/changelog, and in the logical tag. 1ubuntu13 was uploaded in June, quite a long time ago.

review: Needs Fixing

[Andreas Hasenack (ahasenack)]

Thanks for adding the missing 1ubuntu13 upload.

[Andreas Hasenack (ahasenack)]

There is no way I'm gonna finish this in time, so I'll just paste my observations as I get them. You are the maintainer of this package.

a) While running this command:
git log libvirt-maintainers/debian/4.6.0-1..libvirt-maintainers/ubuntu/cosmic-4.6 -p --reverse

I noticed that it has d/p/ubuntu/storage-disable-gluster-test being added (5fec7b909cef07f4625155a00b9ed1a7e23fefff) and removed (0c5b72f07c04e359945b8e3796d41fe1d128a2fe).

I suppose that could have been squashed. It is mentioned in d/changelog under " * Dropped Changes (In Debian or no more important):".

[Andreas Hasenack (ahasenack)]

I suppose you could have squashed these together:
commit 0aa9d1efe84b6e3f0b19080922f3de564200b207
Author: Christian Ehrhardt <email address hidden>
Date: Thu Aug 10 12:05:34 2017 +0200

    apparmor: fix newer virt-manager 1.4.0
...
commit 90022a87813380807d0e147b266f52ea5e60446d
Author: Christian Ehrhardt <email address hidden>
Date: Mon Jan 29 11:36:26 2018 +0100

    extend ubuntu-aa/0025-apparmor-fix-newer-virt-manager-1.4.0.patch for libvirt 4.0 behavior (LP: #1741617)

As that patch is already a delta, and the bug #1741617 that the "extend" commit is fixing is not mentioned in the changelog.

[Andreas Hasenack (ahasenack)]

7a18714b735d40247d45c0ca795f27e58ecbc9bd (4.0 needs a reversed rule for openGraphicsFD (LP: #1747442)) could perhaps also be squashed into the commit that is adding 0025-apparmor-fix-newer-virt-manager-1.4.0.patch, as that bug was fixed in 4.0.0-1ubuntu2

[Andreas Hasenack (ahasenack)]

The bug number mentioned in this commit:
565a936d3c4563e2227b3cf2c8798babbf269fa6
UBUNTU-only: apparmor: for kvm.powerpc (LP: #1680384)

which introduces 0033-UBUNTU-only-apparmor-for-kvm.powerpc-LP-1680384.patch

is different from the bug number mentioned in the corresponding d/changelog message:
0033-UBUNTU-only-apparmor-for-kvm.powerpc-LP-1680384.patch: allow
commands executed by ubuntu only kvm wrapper on ppc64el (LP 1686621).

[Andreas Hasenack (ahasenack)]

I couldn't find this existing delta being mentioned as a "remaining changes" entry in d/changelog:
commit 3c9701402620f52d8917a3a223c6c2b07fb2415e
Author: Christian Ehrhardt <email address hidden>
Date: Fri Dec 15 09:19:17 2017 +0100

        - d/libvirt-daemon-system.postrm: Remove the default.xml network link set up by postinst

    Note: this would be upstream default (to enable the network), but Debian
    opted out of it. In turn Ubuntu opted-in it plus some check for
    colliding network. TL;DR this removal is Ubuntu only as is the add.

    Signed-off-by: Christian Ehrhardt <email address hidden>

[Andreas Hasenack (ahasenack)]

This was an "added changes" in 4.0.0-1ubuntu1:
commit f26d95409d5a12012dff419cd342131424b6840e
Author: Christian Ehrhardt <email address hidden>
Date: Tue Dec 19 12:12:14 2017 +0100

        - d/libvirt-daemon-system.maintscript: remove the now dropped conffile /etc/cron.daily/libvirt-daemon-system

This was the d/changelog entry in 4.0.0-1ubuntu1:
+ - d/libvirt-daemon-system.maintscript: remove the now dropped conffile
+ /etc/cron.daily/libvirt-daemon-system

It's not part of the new delta, so I was expecting to find it mentioned in d/changelog under some "Dropped" header.

Maybe it's part of "- fix conffile upgrade handling to avoid obsolete files".

[Andreas Hasenack (ahasenack)]

This delta was kept:
commit fa96756f0d28fbac454fdd685693fd7959c40f90
Author: Christian Ehrhardt <email address hidden>
Date: Fri Jan 26 09:37:29 2018 +0100

      - d/rules: install virtlockd correctly with defaults file (LP: #1729516)

But I couldn't find it in d/changelog under "remaining changes".

[Andreas Hasenack (ahasenack)]

This is what I could review in time. Nothing blocking, and I suppose some of these are kind of expected given the complicated nature of these branches and remotes and how this package is maintained.

review: Approve

[Christian Ehrhardt  (paelzer)]

Pulled in latest Debian on top as it fixed something important that I saw coming from upstream.
With that a round of tests looked good again, pushing - thanks for the review.

diff --git a/debian/changelog b/debian/changelog
index ac5981d..12bfa0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,257 @@
+<<<<<<< debian/changelog
+=======
+libvirt (4.6.0-2ubuntu1) cosmic; urgency=medium
+
+  * Merged with Debian unstable (LP: #1786957).
+    Among many other new features and fixes this includes fixes
+    for (LP: #1754871), Remaining changes:
+    - Disable libssh2 support (universe dependency)
+    - Disable firewalld support (universe dependency)
+    - Set qemu-group to kvm (for compat with older ubuntu)
+    - Additional apport package-hook
+    - Autostart default bridged network (As upstream does, but not Debian).
+      In addition to just enabling it our solution provides:
+      + do not autostart if subnet is already taken (e.g. in guests).
+      + iterate some alternative subnets before giving up
+    - d/p/ubuntu/Allow-libvirt-group-to-access-the-socket.patch: This is
+      the group based access to libvirt functions as it was used in Ubuntu
+      for quite long.
+      + d/p/ubuntu/daemon-augeas-fix-expected.patch fix some related tests
+        due to the group access change.
+      + d/libvirt-daemon-system.postinst: add users in sudo to the libvirt
+        group.
+    - ubuntu/parallel-shutdown.patch: set parallel shutdown by default.
+    - d/p/ubuntu/enable-kvm-spice.patch: compat with older Ubuntu qemu/kvm
+      which provided a separate kvm-spice.
+    - Xen related
+      - d/p/ubuntu/ubuntu-libxl-qemu-path.patch: this change was split. The
+        section that adapts the path of the emulator to the Debian/Ubuntu
+        packaging is kept.
+      - d/p/ubuntu/ubuntu-libxl-Fix-up-VRAM-to-minimum-requirements.patch: auto
+        set VRAM to minimum requirements
+      - d/p/ubuntu/xen-default-uri.patch: set default URI on xen hosts
+      - Add libxl log directory
+      - libvirt-uri.sh: Automatically switch default libvirt URI for users on
+        Xen dom0 via user profile (was missing on changelogs before)
+    - d/p/ubuntu/apibuild-skip-libvirt-common.h: drop libvirt-common.h from
+      included_files to avoid build failures due to duplicate definitions.
+    - Update README.Debian with Ubuntu changes
+    - Convert libvirt0, libnss_libvirt and libvirt-dev to multi-arch.
+    - Enable some additional features on ppc64el and s390x (for arch parity)
+      + systemtap, zfs, numa and numad on s390x.
+      + systemtap on ppc64el.
+    - d/t/control, d/t/smoke-qemu-session: fixup smoke-qemu-session by making
+      vmlinuz available and accessible (Debian bug 848314)
+    - d/t/control, d/t/smoke-lxc: fix up lxc smoke test isolation
+    - Add dnsmasq configuration to work with system wide dnsmasq (drop >18.04,
+      no more UCA onto Xenial then which has global dnsmasq by default).
+    - d/p/ubuntu/ubuntu_machine_type.patch: accept ubuntu types as pci440fx
+    - Further upstreamed apparmor Delta, especially any new one
+      Our former delta is split into logical pieces and is either Ubuntu only
+      or is part of a continuous upstreaming effort.
+      Listing related remaining changes in debian/patches/ubuntu-aa/:
+      + 0001-apparmor-Allow-pygrub-to-run-on-Debian-Ubuntu.patch: apparmor:
+        Allow pygrub to run on Debian/Ubuntu
+      + 0003-apparmor-libvirt-qemu-Allow-read-access-to-overcommi.patch:
+        apparmor, libvirt-qemu: Allow read access to overcommit_memory
+      + 0007-apparmor-libvirt-qemu-Allow-owner-read-access-to-PRO.patch:
+        apparmor, libvirt-qemu: Allow owner read access to @{PROC}/*/auxv
+      + 0017-apparmor-virt-aa-helper-Allow-access-to-tmp-director.patch:
+        apparmor, virt-aa-helper: Allow access to tmp directories
+      + ubuntu-aa/0020-virt-aa-helper-ubuntu-storage-paths.patch:
+        apparmor, virt-aa-helper: Allow various storage pools and image
+        locations
+      + 0021-apparmor-virt-aa-helper-Add-openvswitch-support.patch:
+        apparmor, virt-aa-helper: Add openvswitch support
+      + 0025-apparmor-fix-newer-virt-manager-1.4.0.patch: Add Apparmor
+        permissions so virt-manager 1.4.0 viewing works (LP 1668681 1747442).
+        Can be dropped >=libvirt 4.7
+      + 0029-appmor-libvirt-qemu-Add-9p-support.patch: appmor,
+        libvirt-qemu: Add 9p support
+      + 0030-virt-aa-helper-Complete-9p-support.patch: virt-aa-helper:
+        add l to 9p file options.
+      + 0031-virt-aa-helper-Ask-for-no-deny-rule-for-readonly-dis.patch:
+        virt-aa-helper: Ask for no deny rule for readonly disk (renamed and
+        reworded, was virt-aa-helper-no-explicity-deny-for-basefiles.patch)
+      + 0032-apparmor-libvirt-qemu-Allow-reading-charm-specific-c.patch:
+        apparmor, libvirt-qemu: Allow reading charm-specific ceph config
+      + 0033-UBUNTU-only-apparmor-for-kvm.powerpc-LP-1680384.patch: allow
+        commands executed by ubuntu only kvm wrapper on ppc64el
+        (LP 1686621 & LP 1680384).
+      + 0034-apparmor-virt-aa-helper-access-for-snapped-nova.patch:
+        apparmor, virt-aa-helper: access for snapped nova
+      + 0040-apparmor-add-mediation-rules-for-unconfined.patch:
+        apparmor: add mediation rules for unconfined guests
+        Can be dropped >=libvirt 4.7
+    - d/rules: enable build time self tests on all architectures
+    - run dnsmasq as libvirt-dnsmasq (LP: 1743718)
+      + d/libvirt-daemon-system.postinst: add libvirt-dnsmasq user and group
+      + d/libvirt-daemon-system.postrm: remove libvirt-dnsmasq user and group on
+        purge
+      + d/p/ubuntu/dnsmasq-as-priv-user: write dnsmas config with user
+        libvirt-dnsmasq and adapt the self tests to expect that config
+      + d/libvirt-daemon-system.postinst: fix old libvirt-dnsmasq users
+    - debian/rules: disable the netcf backend. (LP: 1764314)
+    - debian/control: drop libnetcf from Build-Depends.
+    - ddebian/patches/ubuntu/ovmf_paths.patch: adjust paths to secboot.fd UEFI
+      Secure Boot enabled variants of the OVMF firmware and variable store for
+      the paths where we ship these files in Ubuntu.
+    - d/rules: install virtlockd correctly with defaults file (LP: 1729516)
+  * Added Changes
+    - 0032-apparmor-libvirt-qemu-Allow-reading-charm-specific-c.patch:
+      updated to take care of no more silencing and thereby hiding denials
+      (LP 1719579 is an example)
+    - 0032-apparmor-libvirt-qemu-Allow-reading-charm-specific-c.patch:
+      updated to also allow the optionally placed ceph asok file (LP: #1779674)
+    - 0033-UBUNTU-only-apparmor-for-kvm.powerpc-LP-1680384.patch: prepare
+      profile for usrmerge (LP: #1784023)
+    - Finalize the libvirt-bin -> libvirt-* transition in the apport
+      package-hook.
+    - d/p/ubuntu-aa/0050-local-include-for-libvirt-qemu.patch,
+      d/libvirt-daemon-system.postinst: provide a local apparmor include
+      for abstraction/libvirt-qemu (LP: #1786019)
+    - d/p/ubuntu-aa/0051-allow-user-tmp.patch: some features need tmp, but we
+      don't want blanket access. We only allow enumerating the base dir and
+      reading owned files. Further features needing /tmp have to add local
+      overrides, examples are qemu-smb and some modes of local snapshots.
+      (LP: #1365261) Can be dropped >=libvirt 4.7
+    - d/p/ubuntu-aa/0052-allow-to-preserve-dev-mountpoints.patch: Allow to
+      preserve /dev mountpoints in qemu namespaces (LP: #1786168)
+      Can be dropped >=libvirt 4.7
+    - avoid service dependency issues on upgrade (LP: #1786179)
+      This will in the long term be resolved in dh_* tools, but to let an
+      upgrade work for now we need to drop the sysV scripts (which we don't
+      use anyway) and slightly modify the systemd service to work with todays
+      dh_systemd_start properly. Can be dropped once Debian bug 905772 is
+      resolved in dh_* tools and libvirt uses those new code.
+      - d/libvirt-daemon-system.virtlogd.init: removed sysV init file
+      - d/libvirt-daemon-system.libvirtd.init: removed sysV init file
+      - debian/libvirt-daemon-system.maintscript: rm_conffile for virtlogd
+        and lbivirtd sysV init file
+      - d/p/ubuntu/avoid-restarting-virtlog-socket.patch: drop Also references
+        to virtlogd/virtlockd sockets as they would imply a restart of
+        virtlogd breaking it.
+      - d/t/smoke-lxc: use systemd instead of sysV to restart the service
+  * Dropped Changes (upstream)
+    - d/p/ubuntu/virt-aa-helper-Set-the-supported-features.patch: allow parsing
+      of memory slots and other extended features without breaking
+      virt-aa-helper (LP: 1746431).
+    - d/p/stable/0001-Revert-qemu-monitor-do-not-report-error-on-shutdown.patch
+    - d/p/stable/0002-nodedev-Fix-failing-to-parse-PCI-address-for-non-PCI.patch
+    - d/p/stable/0003-qemu-assign-correct-type-of-PCI-address-for-vhost-sc.patch
+    - d/p/stable/0004-qemu-Refresh-caps-cache-after-booting-a-different-ke.patch
+    - d/p/stable/0005-qemu-auto-add-generic-xhci-rather-than-NEC-xhci-to-Q.patch
+    - d/p/stable/0006-libvirtd-Explicit-dependency-on-systemd-machined.patch
+    - d/p/stable/0007-rpc-fix-race-sending-and-encoding-sasl-data.patch
+    - d/p/stable/0008-vhost-user-add-support-reconnect-for-vhost-user-port.patch
+    - d/p/stable/0009-qemu-Fix-memory-leak-in-processGuestPanicEvent.patch
+    - d/p/stable/0010-storage-util-Properly-ignore-errors-when-backing-vol.patch
+    - d/p/stable/0011-conf-Use-correct-attribute-name-in-error-message.patch
+    - d/p/stable/0012-util-json-Add-helper-to-return-string-or-number-prop.patch
+    - d/p/stable/0013-util-storage-Parse-lun-for-iSCSI-protocol-from-JSON-.patch
+    - d/p/stable/0014-virsh-Offer-only-persistent-domains-for-autostart.patch
+    - d/p/stable/0015-blockjob-Fix-a-error-checking-of-blockjob-status-in-.patch
+    - d/p/stable/0016-qemu-Expose-rx-tx_queue_size-in-qemu.conf-too.patch
+    - d/p/stable/0017-qemu-migration-Refresh-device-information-after-tran.patch
+    - d/p/stable/0018-qemuDomainRemoveMemoryDevice-unlink-memory-backing-f.patch
+    - d/p/stable/0019-vbox-fix-SEGV-during-dumpxml-of-a-serial-port.patch
+    - d/p/stable/0020-qemu-Initialize-priv-in-qemuDomainCoreDumpWithFormat.patch
+    - d/p/stable/0021-fix-regex-to-check-CN-from-server-certificate.patch
+    - d/p/stable/0022-storage-Fix-formatting-and-parsing-of-qemu-type-Unix.patch
+    - d/p/stable/0023-util-storage-Remove-detected-authentication-data-for.patch
+    - d/p/stable/0024-qemu-blockcopy-Add-check-for-bandwidth.patch
+    - d/p/stable/0025-conf-move-generated-member-from-virMacAddr-to-virDom.patch
+    - d/p/stable/0026-lxc-Drop-useless-check-in-live-device-update.patch
+    - d/p/stable/0027-Pass-oldDev-to-virDomainDefCompatibleDevice-on-devic.patch
+    - d/p/stable/0028-qemu-Fix-updating-device-with-boot-order.patch
+    - d/p/stable/0030-daemon-fix-rpc-event-leak-on-error-path-in-remoteDis.patch
+    - d/p/stable/0029-lxc-fix-rpc-event-leak-on-error-path-in-virLXCContro.patch
+    - d/p/stable/0031-qemu-fix-memory-leak-of-vporttype-during-migration.patch
+    - d/p/stable/0032-virsh-fixing-segfault-by-pool-autocompleter-function.patch
+    - d/p/stable/0033-qemu-Fix-comparison-assignment-in-qemuDomainUpdateDe.patch
+    - d/p/stable/0034-qemu-Fix-memory-leak-in-qemuConnectGetAllDomainStats.patch
+    - d/p/stable/0035-libvirtd-fix-potential-deadlock-when-reloading.patch
+    - d/p/stable/0036-qemu-Use-correct-bus-type-for-input-devices.patch
+    - d/p/stable/0037-qemu-hostdev-Fix-the-error-on-VM-start-with-an-mdev-.patch
+    - d/p/stable/0038-conf-Fix-crash-in-virDomainDefCompatibleDevice.patch
+    - d/p/ubuntu/lp1688508-tools-avoid-text-spilling-into-variables.patch:
+      avoid hanging on shutdown (LP: 1688508)
+    - d/p/ubuntu-aa/0041-apparmor-add-ro-rule-for-sasl-GSSAPI-
+      plugin-on-etc-g.patch fix issues if sasl is configured (LP: 1696471)
+    - d/p/ubuntu-aa/0042-virt-aa-helper-resolve-yet-to-be-created-paths.patch
+      ensure symlinks are resolved to get valid rules if interim parts of a path
+      are a symlink (LP: 1752361)
+    - d/p/ubuntu/lp1688508-tools-fix-variable-scope-in-in-check_guests_shutdown:
+      avoid issues shutting down more guests than configured for parallel
+      shutdown (LP: 1688508)
+    - d/p/ubuntu-aa/lp1756394-virt-aa-helper-resolve-file-symlinks.patch: fix
+      using devices that are symlinks (LP: 1756394)
+    - Fix nvdimm memory and passthrough input devices for hotplug via
+      domain security callbacks backporting upstream commits (LP: 1755153).
+      + d/p/ubuntu-aa/lp1755153-apparmor-add-Set-Restore-InputLabel.patch
+      + d/p/ubuntu-aa/lp1755153-apparmor-add-Set-Restore-MemoryLabel.patch
+    - Fix nvdimm memory and passthrough input devices in initial guest
+      description via virt-aa-helper (LP: 1757085).
+      + d/p/ubuntu-aa/lp1757085-virt-aa-helper-nvdimm-memory.patch
+      + d/p/ubuntu-aa/lp1757085-virt-aa-helper-passthrough-input.patch
+    - Fix clean shut down of guests on system shutdown (LP: 1764668)
+      + d/p/ubuntu/lp-1764668-do-not-report-unknown-guests.patch
+      + d/p/ubuntu/lp-1764668-fix-check_guests_shutdown-loop.patch
+    - SECURITY UPDATE: QEMU monitor DoS
+      + debian/patches/CVE-2018-1064.patch: add size limit to
+        src/qemu/qemu_agent.c.
+      + CVE-2018-1064
+    - SECURITY UPDATE: Speculative Store Bypass
+      + debian/patches/CVE-2018-3639-1.patch: define the 'ssbd' CPUID feature
+        bit in src/cpu/cpu_map.xml.
+      + debian/patches/CVE-2018-3639-2.patch: define the 'virt-ssbd' CPUID
+        feature bit in src/cpu/cpu_map.xml.
+      + CVE-2018-3639
+    - d/p/ubuntu-aa/lp1775777-vfio-usage-without-initial-hostdev.patch: fix
+      hotplug use cases where the initial guest had no hostdev at all and
+      therefore vrit-aa-helper did not allow /dev/vfio/vfio (LP: 1775777)
+    - debian/patches/ubuntu/lp-1758037-nwfilter-increase-pcap-buffer-size.patch:
+      Fix nwfilters that set CTRL_IP_LEARNING set to dhcp failing with "An error
+      occurred, but the cause is unknown" due to a buffer being too small
+      for pcap with TPACKET_V3 enabled (LP: 1758037)
+    - SECURITY UPDATE: code injection via libnss_dns.so
+      + debian/patches/CVE-2018-6764-1.patch: determine the hostname on
+        startup in src/util/virlog.c.
+      + debian/patches/CVE-2018-6764-2.patch: fix syntax-check in
+        src/util/virlog.c.
+      + debian/patches/CVE-2018-6764-3.patch: fix deadlock obtaining hostname
+        in cfg.mk, src/util/virlog.c.
+      + CVE-2018-6764
+  * Dropped Changes (no upgrade path left that needs those)
+    - Backwards compatible handling of group rename (can be dropped >18.04).
+    - Modifications to adapt for our delayed switch away from libvirt-bin (can
+      be dropped >18.04).
+      + d/p/ubuntu/libvirtd-service-add-bin-alias.patch: systemd: define alias
+        to old service name so that old references work
+      + d/p/ubuntu/libvirtd-init-add-bin-alias.patch: sysv init: define alias
+        to old service name so that old references work
+      + d/control: transitional package with the old name and maintainer
+        scripts to handle the transition
+    - fix conffile upgrade handling to avoid obsolete files
+      and inactive duplicates (LP 1694159)
+    - conffile handling of files dropped in 3.5 (can be dropped >18.04)
+      + /etc/init.d/virtlockd was sysv init only
+      + /etc/apparmor.d/local/usr.sbin.libvirtd and
+        /etc/apparmor.d/local/usr.lib.libvirt.virt-aa-helper are now generated
+        by dh_apparmor as needed
+    - d/libvirt-daemon-system.maintscript: remove the now dropped conffile
+      /etc/cron.daily/libvirt-daemon-system
+  * Dropped Changes (cleanups)
+    - d/test/smoke-lxc workaround for debbug 848317/867379 (systemd has fixed
+      one issue and the other is solved in libvirt by ensuring to move to the
+      right cgroups.)
+    - remove no more used libvirt-dnsmasq user (this was redundant since
+      4.0.0-1ubuntu5 reintroduced a libvirt-dnsmasq user)
+    - Disable selinux (now in main)
+
+ -- Christian Ehrhardt <[e-mail]>  Sat, 18 Aug 2018 14:40:58 +0200
+
+>>>>>>> debian/changelog
 libvirt (4.6.0-2) unstable; urgency=medium
 
   * [c33faee] Drop dwarves dependency.
@@ -115,6 +369,402 @@ libvirt (4.0.0-2) unstable; urgency=medium
 
  -- Guido Günther <[e-mail]>  Thu, 08 Feb 2018 19:29:59 +0100
 
+<<<<<<< debian/changelog
+=======
+libvirt (4.0.0-1ubuntu13) cosmic; urgency=medium
+
+  * ddebian/patches/ubuntu/ovmf_paths.patch: adjust paths to secboot.fd UEFI
+    Secure Boot enabled variants of the OVMF firmware and variable store for
+    the paths where we ship these files in Ubuntu.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Wed, 27 Jun 2018 11:16:23 -0400
+
+libvirt (4.0.0-1ubuntu12) cosmic; urgency=medium
+
+  * d/p/ubuntu-aa/lp1775777-vfio-usage-without-initial-hostdev.patch: fix
+    hotplug use cases where the initial guest had no hostdev at all and
+    therefore vrit-aa-helper did not allow /dev/vfio/vfio (LP: #1775777)
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 12 Jun 2018 16:24:01 +0200
+
+libvirt (4.0.0-1ubuntu11) cosmic; urgency=medium
+
+  * SECURITY UPDATE: QEMU monitor DoS
+    - debian/patches/CVE-2018-1064.patch: add size limit to
+      src/qemu/qemu_agent.c.
+    - CVE-2018-1064
+  * SECURITY UPDATE: Speculative Store Bypass
+    - debian/patches/CVE-2018-3639-1.patch: define the 'ssbd' CPUID feature
+      bit in src/cpu/cpu_map.xml.
+    - debian/patches/CVE-2018-3639-2.patch: define the 'virt-ssbd' CPUID
+      feature bit in src/cpu/cpu_map.xml.
+    - CVE-2018-3639
+
+ -- Marc Deslauriers <[e-mail]>  Tue, 22 May 2018 10:55:56 -0400
+
+libvirt (4.0.0-1ubuntu10) cosmic; urgency=medium
+
+  * Fix nwfilters that set CTRL_IP_LEARNING set to dhcp failing with "An error
+    occurred, but the cause is unknown" due to a buffer being too small
+    for pcap with TPACKET_V3 enabled (LP: #1758037)
+    - debian/patches/ubuntu/lp-1758037-nwfilter-increase-pcap-buffer-size.patch
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 09 May 2018 17:07:59 +0200
+
+libvirt (4.0.0-1ubuntu9) cosmic; urgency=medium
+
+  * debian/rules: disable the netcf backend. (LP: #1764314)
+  * debian/control: drop libnetcf from Build-Depends.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Wed, 09 May 2018 10:06:15 -0400
+
+libvirt (4.0.0-1ubuntu8) bionic; urgency=medium
+
+  * Fix clean shut down of guests on system shutdown (LP: #1764668)
+    - d/p/ubuntu/lp-1764668-do-not-report-unknown-guests.patch
+    - d/p/ubuntu/lp-1764668-fix-check_guests_shutdown-loop.patch
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 24 Apr 2018 11:09:48 +0200
+
+libvirt (4.0.0-1ubuntu7) bionic; urgency=medium
+
+  * Fix nvdimm memory and passthrough input devices for hotplug via
+    domain security callbacks backporting upstream commits (LP: #1755153).
+    - d/p/ubuntu-aa/lp1755153-apparmor-add-Set-Restore-InputLabel.patch
+    - d/p/ubuntu-aa/lp1755153-apparmor-add-Set-Restore-MemoryLabel.patch
+  * Fix nvdimm memory and passthrough input devices in initial guest
+    description via virt-aa-helper (LP: #1757085).
+    - d/p/ubuntu-aa/lp1757085-virt-aa-helper-nvdimm-memory.patch
+    - d/p/ubuntu-aa/lp1757085-virt-aa-helper-passthrough-input.patch
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 21 Mar 2018 08:30:47 +0100
+
+libvirt (4.0.0-1ubuntu6) bionic; urgency=medium
+
+  * Backport from recent upstream to stabilize libvirt (LP: #1756915)
+    - d/p/stable/0033-qemu-Fix-comparison-assignment-in-qemuDomainUpdateDe.patch
+    - d/p/stable/0034-qemu-Fix-memory-leak-in-qemuConnectGetAllDomainStats.patch
+    - d/p/stable/0035-libvirtd-fix-potential-deadlock-when-reloading.patch
+    - d/p/stable/0036-qemu-Use-correct-bus-type-for-input-devices.patch
+    - d/p/stable/0037-qemu-hostdev-Fix-the-error-on-VM-start-with-an-mdev-.patch
+    - d/p/stable/0038-conf-Fix-crash-in-virDomainDefCompatibleDevice.patch
+  * d/p/ubuntu/lp1688508-tools-fix-variable-scope-in-in-check_guests_shutdown:
+    avoid issues shutting down more guests than configured for parallel
+    shutdown (LP: #1688508)
+  * d/p/ubuntu-aa/lp1756394-virt-aa-helper-resolve-file-symlinks.patch: fix
+    using devices that are symlinks (LP: #1756394)
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 19 Mar 2018 14:57:08 +0100
+
+libvirt (4.0.0-1ubuntu5) bionic; urgency=medium
+
+  * run dnsmasq as libvirt-dnsmasq (LP: #1743718)
+    - d/libvirt-daemon-system.postinst: add libvirt-dnsmasq user and group
+    - d/libvirt-daemon-system.postrm: remove libvirt-dnsmasq user and group on
+      purge
+    - d/p/ubuntu/dnsmasq-as-priv-user: write dnsmas config with user
+      libvirt-dnsmasq and adapt the self tests to expect that config
+    - d/libvirt-daemon-system.postinst: fix old libvirt-dnsmasq users
+  * Backport from recent upstream to stabilize libvirt (LP: #1754352)
+    - d/p/stable/0024-qemu-blockcopy-Add-check-for-bandwidth.patch
+    - d/p/stable/0025-conf-move-generated-member-from-virMacAddr-to-virDom.patch
+    - d/p/stable/0026-lxc-Drop-useless-check-in-live-device-update.patch
+    - d/p/stable/0027-Pass-oldDev-to-virDomainDefCompatibleDevice-on-devic.patch
+    - d/p/stable/0028-qemu-Fix-updating-device-with-boot-order.patch
+    - d/p/stable/0030-daemon-fix-rpc-event-leak-on-error-path-in-remoteDis.patch
+    - d/p/stable/0029-lxc-fix-rpc-event-leak-on-error-path-in-virLXCContro.patch
+    - d/p/stable/0031-qemu-fix-memory-leak-of-vporttype-during-migration.patch
+    - d/p/stable/0032-virsh-fixing-segfault-by-pool-autocompleter-function.patch
+  * d/p/ubuntu-aa/0041-apparmor-add-ro-rule-for-sasl-GSSAPI-
+    plugin-on-etc-g.patch fix issues if sasl is configured (LP: #1696471)
+  * d/p/ubuntu-aa/0042-virt-aa-helper-resolve-yet-to-be-created-paths.patch
+    ensure symlinks are resolved to get valid rules if interim parts of a path
+    are a symlink (LP: #1752361)
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 27 Feb 2018 12:04:02 +0100
+
+libvirt (4.0.0-1ubuntu4) bionic; urgency=medium
+
+  * d/p/ubuntu/lp1688508-tools-avoid-text-spilling-into-variables.patch:
+    avoid hanging on shutdown (LP: #1688508)
+
+ -- Christian Ehrhardt <[e-mail]>  Fri, 23 Feb 2018 16:43:19 +0100
+
+libvirt (4.0.0-1ubuntu3) bionic; urgency=medium
+
+  [ Christian Ehrhardt ]
+  * Backport of 23 bug fixes from recent upstream to stabilize libvirt on 18.04
+    - d/p/stable/0001-Revert-qemu-monitor-do-not-report-error-on-shutdown.patch
+    - d/p/stable/0002-nodedev-Fix-failing-to-parse-PCI-address-for-non-PCI.patch
+    - d/p/stable/0003-qemu-assign-correct-type-of-PCI-address-for-vhost-sc.patch
+    - d/p/stable/0004-qemu-Refresh-caps-cache-after-booting-a-different-ke.patch
+    - d/p/stable/0005-qemu-auto-add-generic-xhci-rather-than-NEC-xhci-to-Q.patch
+    - d/p/stable/0006-libvirtd-Explicit-dependency-on-systemd-machined.patch
+    - d/p/stable/0007-rpc-fix-race-sending-and-encoding-sasl-data.patch
+    - d/p/stable/0008-vhost-user-add-support-reconnect-for-vhost-user-port.patch
+    - d/p/stable/0009-qemu-Fix-memory-leak-in-processGuestPanicEvent.patch
+    - d/p/stable/0010-storage-util-Properly-ignore-errors-when-backing-vol.patch
+    - d/p/stable/0011-conf-Use-correct-attribute-name-in-error-message.patch
+    - d/p/stable/0012-util-json-Add-helper-to-return-string-or-number-prop.patch
+    - d/p/stable/0013-util-storage-Parse-lun-for-iSCSI-protocol-from-JSON-.patch
+    - d/p/stable/0014-virsh-Offer-only-persistent-domains-for-autostart.patch
+    - d/p/stable/0015-blockjob-Fix-a-error-checking-of-blockjob-status-in-.patch
+    - d/p/stable/0016-qemu-Expose-rx-tx_queue_size-in-qemu.conf-too.patch
+    - d/p/stable/0017-qemu-migration-Refresh-device-information-after-tran.patch
+    - d/p/stable/0018-qemuDomainRemoveMemoryDevice-unlink-memory-backing-f.patch
+    - d/p/stable/0019-vbox-fix-SEGV-during-dumpxml-of-a-serial-port.patch
+    - d/p/stable/0020-qemu-Initialize-priv-in-qemuDomainCoreDumpWithFormat.patch
+    - d/p/stable/0021-fix-regex-to-check-CN-from-server-certificate.patch
+    - d/p/stable/0022-storage-Fix-formatting-and-parsing-of-qemu-type-Unix.patch
+    - d/p/stable/0023-util-storage-Remove-detected-authentication-data-for.patch
+  * d/rules: enable build time self tests on all architectures
+
+  [ Marc Deslauriers ]
+  * SECURITY UPDATE: code injection via libnss_dns.so
+    - debian/patches/CVE-2018-6764-1.patch: determine the hostname on
+      startup in src/util/virlog.c.
+    - debian/patches/CVE-2018-6764-2.patch: fix syntax-check in
+      src/util/virlog.c.
+    - debian/patches/CVE-2018-6764-3.patch: fix deadlock obtaining hostname
+      in cfg.mk, src/util/virlog.c.
+    - CVE-2018-6764
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 19 Feb 2018 14:18:44 +0100
+
+libvirt (4.0.0-1ubuntu2) bionic; urgency=medium
+
+  * d/p/ubuntu-aa/0025-apparmor-fix-newer-virt-manager-1.4.0.patch: refreshed
+    as libvirt 4.0 needs a reversed rule for openGraphicsFD (LP: #1747442)
+    - refreshed 0032 and 0040 to match the new context.
+  * d/p/ubuntu/virt-aa-helper-Set-the-supported-features.patch: allow parsing
+    of memory slots and other extended features without breaking
+    virt-aa-helper (LP: #1746431).
+
+ -- Christian Ehrhardt <[e-mail]>  Fri, 02 Feb 2018 07:31:17 +0100
+
+libvirt (4.0.0-1ubuntu1) bionic; urgency=medium
+
+  * Merged with Debian unstable (4.0)
+    This closes several bugs:
+    - Error generating apparmor profile when hostname contains spaces
+      (LP: #799997)
+    - qemu 2.10 locks files, libvirt shared now sets share-rw=on (LP: #1716028)
+    - libvirt usb passthrough throws apparmor denials related to
+      /run/udev/data/+usb (LP: #1727311)
+    - AppArmor denies access to /sys/block/*/queue/max_segments (LP: #1729626)
+    - iohelper improvements to let bypass-cache work without opening up the
+      apparmor isolation (LP: #1719579)
+    - nodeinfo on s390x to contain more CPU info (LP: #1733688)
+    - Upgrade libvirt >= 4.0 (LP: #1745934)
+  * Remaining changes:
+    - Disable libssh2 support (universe dependency)
+    - Disable firewalld support (universe dependency)
+    - Disable selinux
+    - Set qemu-group to kvm (for compat with older ubuntu)
+    - Additional apport package-hook
+    - Modifications to adapt for our delayed switch away from libvirt-bin (can
+      be dropped >18.04).
+      + d/p/ubuntu/libvirtd-service-add-bin-alias.patch: systemd: define alias
+        to old service name so that old references work
+      + d/p/ubuntu/libvirtd-init-add-bin-alias.patch: sysv init: define alias
+        to old service name so that old references work
+      + d/control: transitional package with the old name and maintainer
+        scripts to handle the transition
+    - Backwards compatible handling of group rename (can be dropped >18.04).
+    - config details and autostart of default bridged network. Creating that is
+      now the default in general, yet our solution provides the following on
+      top as of today:
+      + autostart the default network by default
+      + do not autostart if subnet is already taken (e.g. in guests).
+    - d/p/ubuntu/Allow-libvirt-group-to-access-the-socket.patch: This is
+      the group based access to libvirt functions as it was used in Ubuntu
+      for quite long.
+      + d/p/ubuntu/daemon-augeas-fix-expected.patch fix some related tests
+        due to the group access change.
+    - ubuntu/parallel-shutdown.patch: set parallel shutdown by default.
+    - d/p/ubuntu/enable-kvm-spice.patch: compat with older Ubuntu qemu/kvm
+      which provided a separate kvm-spice.
+    - d/p/ubuntu/ubuntu-libxl-qemu-path.patch: this change was split. The
+      section that adapts the path of the emulator to the Debian/Ubuntu
+      packaging is kept.
+    - d/p/ubuntu/ubuntu-libxl-Fix-up-VRAM-to-minimum-requirements.patch: auto
+      set VRAM to minimum requirements
+    - d/p/ubuntu/xen-default-uri.patch: set default URI on xen hosts
+    - Add libxl log directory
+    - libvirt-uri.sh: Automatically switch default libvirt URI for users on
+      Xen dom0 via user profile (was missing on changelogs before)
+    - d/p/ubuntu/apibuild-skip-libvirt-common.h: drop libvirt-common.h from
+      included_files to avoid build failures due to duplicate definitions.
+    - Update README.Debian with Ubuntu changes
+    - Convert libvirt0, libnss_libvirt and libvirt-dev to multi-arch.
+    - Enable some additional features on ppc64el and s390x (for arch parity)
+      + systemtap, zfs, numa and numad on s390x.
+      + systemtap on ppc64el.
+    - fix conffile upgrade handling to avoid obsolete files
+      and inactive duplicates (LP 1694159)
+    - d/t/control, d/t/smoke-qemu-session: fixup smoke-qemu-session by making
+      vmlinuz available and accessible (Debian bug 848314)
+    - d/test/smoke-lxc workaround for debbug 848317/867379
+    - d/t/control, d/t/smoke-lxc: fix up lxc smoke test (Debian bug 848317)
+    - Add dnsmasq configuration to work with system wide dnsmasq (drop >18.04,
+      no more UCA onto Xenial then which has global dnsmasq by default).
+    - d/p/ubuntu/ubuntu_machine_type.patch: accept ubuntu types as pci440fx
+    - conffile handling of files dropped in 3.5 (can be dropped >18.04)
+      + /etc/init.d/virtlockd was sysv init only
+      + /etc/apparmor.d/local/usr.sbin.libvirtd and
+        /etc/apparmor.d/local/usr.lib.libvirt.virt-aa-helper are now generated
+        by dh_apparmor as needed
+    - Reworked apparmor Delta, especially the more complex delta is dropped
+      now, also our former delta is now split into logical pieces, has
+      improved comments and is part of a continuous upstreaming effort.
+      Listing related remaining changes:
+      + d/p/0001-apparmor-Allow-pygrub-to-run-on-Debian-Ubuntu.patch: apparmor:
+        Allow pygrub to run on Debian/Ubuntu
+      + d/p/0003-apparmor-libvirt-qemu-Allow-read-access-to-overcommi.patch:
+        apparmor, libvirt-qemu: Allow read access to overcommit_memory
+      + d/p/0007-apparmor-libvirt-qemu-Allow-owner-read-access-to-PRO.patch:
+        apparmor, libvirt-qemu: Allow owner read access to @{PROC}/*/auxv
+      + d/p/0017-apparmor-virt-aa-helper-Allow-access-to-tmp-director.patch:
+        apparmor, virt-aa-helper: Allow access to tmp directories
+      + d/p/ubuntu-aa/0020-virt-aa-helper-ubuntu-storage-paths.patch:
+        apparmor, virt-aa-helper: Allow various storage pools and image
+        locations
+      + d/p/0021-apparmor-virt-aa-helper-Add-openvswitch-support.patch:
+        apparmor, virt-aa-helper: Add openvswitch support
+      + d/p/0025-apparmor-fix-newer-virt-manager-1.4.0.patch: Add Apparmor
+        permissions so virt-manager 1.4.0 viewing works (LP 1668681).
+      + d/p/0029-appmor-libvirt-qemu-Add-9p-support.patch: appmor,
+        libvirt-qemu: Add 9p support
+      + d/p/0030-virt-aa-helper-Complete-9p-support.patch: virt-aa-helper:
+        add l to 9p file options.
+      + d/p/0031-virt-aa-helper-Ask-for-no-deny-rule-for-readonly-dis.patch:
+        virt-aa-helper: Ask for no deny rule for readonly disk (renamed and
+        reworded, was virt-aa-helper-no-explicity-deny-for-basefiles.patch)
+      + d/p/0032-apparmor-libvirt-qemu-Allow-reading-charm-specific-c.patch:
+        apparmor, libvirt-qemu: Allow reading charm-specific ceph config
+      + d/p/0033-UBUNTU-only-apparmor-for-kvm.powerpc-LP-1680384.patch: allow
+        commands executed by ubuntu only kvm wrapper on ppc64el (LP 1686621).
+      + d/p/0034-apparmor-virt-aa-helper-access-for-snapped-nova.patch:
+        apparmor, virt-aa-helper: access for snapped nova
+  * Dropped Changes (Upstream):
+    - d/p/0005-apparmor-libvirt-qemu-Allow-use-of-sgabios.patch: apparmor,
+      libvirt-qemu: Allow use of sgabios
+    - d/p/0006-apparmor-libvirt-qemu-Silence-lttng-related-deny-mes.patch:
+      apparmor, libvirt-qemu: Silence lttng related deny messages
+    - d/p/0008-apparmor-libvirt-qemu-Allow-read-access-to-sysfs-sys.patch:
+      apparmor, libvirt-qemu: Allow read access to sysfs system info
+    - d/p/0009-apparmor-libvirt-qemu-Allow-read-access-to-max_mem_r.patch:
+      apparmor, libvirt-qemu: Allow read access to max_mem_regions
+    - d/p/0010-apparmor-libvirt-qemu-Allow-qemu-block-extra-librari.patch:
+      apparmor, libvirt-qemu: Allow qemu-block-extra libraries
+    - d/p/0012-apparmor-libvirtd-Allow-access-to-netlink-sockets.patch:
+      apparmor, libvirtd: Allow access to netlink sockets
+    - d/p/0013-apparmor-Add-rules-for-mediation-support.patch:
+      apparmor: Add rules for mediation support
+    - d/p/0015-apparmor-virt-aa-helper-Allow-access-to-ecryptfs-fil.patch:
+      apparmor, virt-aa-helper: Allow access to ecryptfs files
+    - d/p/0016-apparmor-libvirtd-Allow-ixr-to-var-lib-libvirt-virtd.patch:
+      apparmor, libvirtd: Allow ixr to /var/lib/libvirt/virtd*
+    - d/p/0018-apparmor-virt-aa-helper-Add-ipv6-network-policy.patch:
+      apparmor, virt-aa-helper: Add ipv6 network policy
+    - d/p/0019-apparmor-virt-aa-helper-Allow-access-to-sys-bus-usb-.patch:
+      apparmor, virt-aa-helper: Allow access to /sys/bus/usb/devices
+    - d/p/0023-apparmor-qemu-won-t-call-qemu-nbd.patch: apparmor: qemu
+      won't call qemu-nbd
+    - d/p/0027-apparmor-allow-reading-cmdline-of-shutdown-signal.patch:
+      apparmor: allow to parse cmdline of the pid that send the shutdown
+      signal (LP 1680384).
+    - d/p/0028-apparmor-add-default-pki-path-of-lbvirt-spice.patch:
+      apparmor: add default pki path of lbvirt-spice (LP 1690140)
+    - d/p/ubuntu-aa/0035-virt-aa-helper-locking-disk-files-for-qemu-2.10.patch:
+      for compatibility with the behavior of qemu 2.10 this adds locking
+      permission to rules generated for disk files (LP 1709818)
+    - d/p/ubuntu-aa/0036-virt-aa-helper-locking-loader-nvram-for-qemu-2.10.patch:
+      for compatibility with the behavior of qemu 2.10 this adds locking
+      permission to rules generated for loader/nvram (LP 1710960)
+    - d/p/ubuntu-aa/0037-virt-aa-helper...: grant locking permission on append
+      files (LP 1726804)
+    - d/p/ubuntu-aa/0038-virt-aa-helper-fix-paths-for-usb-hostdevs.patch:
+      fix path generation for USB host devices (LP 1552241)
+    - d/p/ubuntu-aa/0039-virt-aa-helper-fix-libusb-access-to-udev-usb-data.patch:
+      generate valid rules on usb passthrough (LP 1686324)
+    - d/p/avoid-double-locking.patch: fix a deadlock that could occur when
+      libvirtd interactions raced with dbus causing a deadlock (LP 1714254).
+    - d/p/u/gnulib-getopt-posix-Fix-build-failure-when-using-ac_cv_head.patch:
+      fix FTBFS with glibc 2.26 (LP 1718668)
+    - Extended handling of apparmor profiles - clear lost profiles via cron
+      (now cleared by virt-aa-helper on domain stop)
+    - nat only on some ports <port start='1024' end='65535'/> (upstream
+      default now if nothing is specified, actually dropped last cycle)
+  * Dropped Changes (In Debian or no more important):
+    - d/p/0002-apparmor-libvirt-qemu-Allow-macvtap-access.patch: apparmor,
+      libvirt-qemu: Allow macvtap access
+    - d/p/0004-apparmor-Explicit-deny-for-setpcap.patch: apparmor: Explicit
+      deny for setpcap (LP 522845).
+    - d/p/0014-apparmor-virt-aa-helper-Improve-comment-about-backin.patch:
+      apparmor, virt-aa-helper: Improve comment about backing store
+    - d/p/0022-apparmor-drop-references-to-qemu-kvm.patch: apparmor: drop
+      references to qemu-kvm
+    - d/p/0024-apparmor-virt-aa-helper-Allow-access-to-name-service.patch:
+      apparmor, virt-aa-helper: Allow access to name services
+    - d/p/0026-apparmor-add-generic-base-vfio-device.patch: apparmor: add
+      /dev/vfio for vf (hot) attach (LP 1680384) (added by virt-aa-helper per
+      guest if needed).
+    - d/p/0011-apparmor-libvirt-qemu-Allow-access-to-hugepage-mount.patch:
+      apparmor, libvirt-qemu: Allow access to hugepage mounts
+    - Disable sheepdog (was for universe dependency, but is now only a suggest)
+    - d/p/ubuntu/storage-disable-gluster-test: gluster not enabled, skip test
+  * Dropped Changes (In Debian/Upstream now based on interim 3.10 work) some of
+    these were never released, but important to mention for the bug references:
+    - libnss-libvirt once enabled causes apt to call getdents
+      avoid this being an issue by dropping a apt conf that allows
+      this in seccomp (LP: #1732030).
+    - d/libvirt-daemon-system.postrm: clean up more libvirt directories on
+      purge
+    - d/p/ubuntu-aa/0041-apparmor-allow-unix-stream-for-p2p-migrations.patch:
+      apparmor: allow unix stream for p2p migrations
+    - d/p/ubuntu-aa/0043-security-apparmor-implement-domainSetPathLabel.patch:
+      this replaces the hugepage rules and fixes many more formerly missing
+    - d/p/ubuntu-aa/0044-security-full-path-option-for-DomainSetPathLabel.patch:
+      allowing to have path wildcards on labels set by domain callbacks
+    - d/p/ubuntu-aa/0045-security-apparmor-add-Set-Restore-ChardevLabel.patch:
+      apparmor implementation of security callback
+    - d/p/ubuntu-aa/0046-apparmor-virt-aa-helper-drop-static-channel-rule.patch:
+      this is now covered by chardev label callbacks
+  * Added Changes:
+    - Revert Debian change "Drop libvirt-bin upgrade handling"
+      This is needed in Ubuntu one last time (drop >18.04)
+    - Revert Debian change "Drop maintscript helpers for versions predating
+      jessie and wheezy-backports". This is needed in Ubuntu one last
+      time (drop >18.04)
+    - Refreshed d/p/* to match new version (only fuzz, no semantic change)
+    - d/libvirt-daemon-system.postrm: change order of libvirt-qemu removal
+      to avoid error messages on purge
+    - remove no more used libvirt-dnsmasq user (drop >18.04)
+    - d/p/ubuntu-aa/0040-apparmor-add-mediation-rules-for-unconfined.patch:
+      apparmor: add mediation rules for unconfined guests
+    - d/p/ubuntu-aa/0042-security-introduce-virSecurityManager-Set-Restore-Ch
+      .patch: backport upstream cahnge to expose already used chardev calls.
+    - d/libvirt-daemon-system.postrm: Remove the default.xml network link
+      set up by postinst.
+    - d/libvirt-daemon-system.maintscript: remove the now dropped conffile
+      /etc/cron.daily/libvirt-daemon-system
+    - d/libvirt-daemon-system.postinst: fixups for autostart default network
+      - use modern shell syntax
+      - try more default networks before giving up to enable by default
+    - d/p/ubuntu-aa/0020-virt-aa-helper-ubuntu-storage-paths.patch:
+      add multipass image path and mark as ubuntu only change.
+    - d/rules: install virtlockd correctly with defaults file (LP: #1729516)
+    - extended d/p/0025-apparmor-fix-newer-virt-manager-1.4.0.patch to cover
+      the slightly changed behavior of libvirt 4.0 (LP: #1741617)
+    - d/control: make libvirt-daemon-driver-storage-rbd a recommend instead of
+      just a suggest to have 3rd party relying on rbd out of the box working.
+      This is deprecated and users of rbd backend should start depending on
+      this package for it will be dropped to a suggest in future releases.
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 14 Dec 2017 14:15:55 +0100
+
+>>>>>>> debian/changelog
 libvirt (4.0.0-1) unstable; urgency=medium
 
   * [5936904] New upstream version 4.0.0
@@ -272,6 +922,209 @@ libvirt (3.7.0-1) unstable; urgency=medium
 
  -- Guido Günther <[e-mail]>  Fri, 08 Sep 2017 14:52:38 +0200
 
+<<<<<<< debian/changelog
+=======
+libvirt (3.6.0-1ubuntu6) artful; urgency=medium
+
+  * d/p/ubuntu-aa/0037-virt-aa-helper...: grant locking permission on append
+    files (LP: #1726804)
+  * d/p/ubuntu-aa/0038-virt-aa-helper-fix-paths-for-usb-hostdevs.patch:
+    fix path generation for USB host devices (LP: #1552241)
+  * d/p/ubuntu-aa/0039-virt-aa-helper-fix-libusb-access-to-udev-usb-data.patch:
+    generate valid rules on usb passthrough (LP: #1686324)
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 24 Oct 2017 14:30:34 +0200
+
+libvirt (3.6.0-1ubuntu5) artful; urgency=medium
+
+  * d/p/u/gnulib-getopt-posix-Fix-build-failure-when-using-ac_cv_head.patch:
+    fix FTBFS with glibc 2.26 (LP: #1718668)
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 28 Sep 2017 08:18:10 -0400
+
+libvirt (3.6.0-1ubuntu4) artful; urgency=medium
+
+  * d/p/avoid-double-locking.patch: fix a deadlock that could occur when
+    libvirtd interactions raced with dbus causing a deadlock (LP: #1714254).
+
+ -- Christian Ehrhardt <[e-mail]>  Fri, 01 Sep 2017 10:29:35 +0200
+
+libvirt (3.6.0-1ubuntu3) artful; urgency=medium
+
+  * No change rebuild for Qemu 2.10 and Xen 4.9
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 21 Aug 2017 10:34:13 +0200
+
+libvirt (3.6.0-1ubuntu2) artful; urgency=medium
+
+  * d/p/ubuntu-aa/0036-virt-aa-helper-locking-loader-nvram-for-qemu-2.10.patch:
+    for compatibility with the behavior of qemu 2.10 this adds locking
+    permission to rules generated for loader/nvram (LP: #1710960)
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 17 Aug 2017 10:00:19 +0200
+
+libvirt (3.6.0-1ubuntu1) artful; urgency=medium
+
+  * Merged with Debian unstable (3.6)
+    This closes several bugs:
+    - aarch64: improved chardev handling (LP: #1697610)
+    - Forbid locking memory without memtune (LP: #1708305)
+  * Remaining changes:
+    - Disable sheepdog (universe dependency)
+    - Disable libssh2 support (universe dependency)
+    - Disable firewalld support (universe dependency)
+    - Disable selinux
+    - Set qemu-group to kvm (for compat with older ubuntu)
+    - Regularly clear AppArmor profiles for vms that no longer exist
+    - Additional apport package-hook
+    - Modifications to adapt for our delayed switch away from libvirt-bin (can
+      be dropped >18.04).
+      + d/p/ubuntu/libvirtd-service-add-bin-alias.patch: systemd: define alias
+        to old service name so that old references work
+      + d/p/ubuntu/libvirtd-init-add-bin-alias.patch: sysv init: define alias
+        to old service name so that old references work
+      + d/control: transitional package with the old name and maintainer
+        scripts to handle the transition
+    - Backwards compatible handling of group rename (can be dropped >18.04).
+    - config details and autostart of default bridged network. Creating that is
+      now the default in general, yet our solution provides the following on
+      top as of today:
+      + nat only on some ports <port start='1024' end='65535'/>
+      + autostart the default network by default
+      + do not autostart if 192.168.122.0 is already taken (e.g. in containers)
+    - d/p/ubuntu/Allow-libvirt-group-to-access-the-socket.patch: This is
+      the group based access to libvirt functions as it was used in Ubuntu
+      for quite long.
+      + d/p/ubuntu/daemon-augeas-fix-expected.patch fix some related tests
+        due to the group access change.
+    - ubuntu/parallel-shutdown.patch: set parallel shutdown by default.
+    - d/p/ubuntu/enable-kvm-spice.patch: compat with older Ubuntu qemu/kvm
+      which provided a separate kvm-spice.
+    - d/p/ubuntu/storage-disable-gluster-test: gluster not enabled, skip test
+    - d/p/ubuntu/ubuntu-libxl-qemu-path.patch: this change was split. The
+      section that adapts the path of the emulator to the Debian/Ubuntu
+      packaging is kept.
+    - d/p/ubuntu/ubuntu-libxl-Fix-up-VRAM-to-minimum-requirements.patch: auto
+      set VRAM to minimum requirements
+    - d/p/ubuntu/xen-default-uri.patch: set default URI on xen hosts
+    - Add libxl log directory
+    - libvirt-uri.sh: Automatically switch default libvirt URI for users on
+      Xen dom0 via user profile (was missing on changelogs before)
+    - d/p/ubuntu/apibuild-skip-libvirt-common.h: drop libvirt-common.h from
+      included_files to avoid build failures due to duplicate definitions.
+    - Update README.Debian with Ubuntu changes
+    - Convert libvirt0, libnss_libvirt and libvirt-dev to multi-arch.
+    - Enable some additional features on ppc64el and s390x (for arch parity)
+      + systemtap, zfs, numa and numad on s390x.
+      + systemtap on ppc64el.
+    - fix conffile upgrade handling to avoid obsolete files
+      and inactive duplicates (LP 1694159)
+    - d/t/control, d/t/smoke-qemu-session: fixup smoke-qemu-session by making
+      vmlinuz available and accessible (Debian bug 848314)
+    - d/test/smoke-lxc workaround for debbug 848317/867379
+    - d/t/control, d/t/smoke-lxc: fix up lxc smoke test (Debian bug 848317)
+    - Extended handling of apparmor profiles - clear lost profiles via cron
+    - Add dnsmasq configuration to work with system wide dnsmasq (drop >18.04,
+      no more UCA onto Xenial then which has global dnsmasq by default).
+    - d/p/ubuntu/ubuntu_machine_type.patch: accept ubuntu types as pci440fx
+    - conffile handling of files dropped in 3.5 (can be dropped >18.04)
+      + /etc/init.d/virtlockd was sysv init only
+      + /etc/apparmor.d/local/usr.sbin.libvirtd and
+        /etc/apparmor.d/local/usr.lib.libvirt.virt-aa-helper are now generated
+        by dh_apparmor as needed
+    - Reworked apparmor Delta, especially the more complex delta is dropped
+      now, also our former delta is now split into logical pieces, has
+      improved comments and is part of a continuous upstreaming effort.
+      Listing related remaining changes:
+      + d/p/0001-apparmor-Allow-pygrub-to-run-on-Debian-Ubuntu.patch: apparmor:
+        Allow pygrub to run on Debian/Ubuntu
+      + d/p/0002-apparmor-libvirt-qemu-Allow-macvtap-access.patch: apparmor,
+        libvirt-qemu: Allow macvtap access
+      + d/p/0003-apparmor-libvirt-qemu-Allow-read-access-to-overcommi.patch:
+        apparmor, libvirt-qemu: Allow read access to overcommit_memory
+      + d/p/0004-apparmor-Explicit-deny-for-setpcap.patch: apparmor: Explicit
+        deny for setpcap
+      + d/p/0005-apparmor-libvirt-qemu-Allow-use-of-sgabios.patch: apparmor,
+        libvirt-qemu: Allow use of sgabios
+      + d/p/0006-apparmor-libvirt-qemu-Silence-lttng-related-deny-mes.patch:
+        apparmor, libvirt-qemu: Silence lttng related deny messages
+      + d/p/0007-apparmor-libvirt-qemu-Allow-owner-read-access-to-PRO.patch:
+        apparmor, libvirt-qemu: Allow owner read access to @{PROC}/*/auxv
+      + d/p/0008-apparmor-libvirt-qemu-Allow-read-access-to-sysfs-sys.patch:
+        apparmor, libvirt-qemu: Allow read access to sysfs system info
+      + d/p/0009-apparmor-libvirt-qemu-Allow-read-access-to-max_mem_r.patch:
+        apparmor, libvirt-qemu: Allow read access to max_mem_regions
+      + d/p/0010-apparmor-libvirt-qemu-Allow-qemu-block-extra-librari.patch:
+        apparmor, libvirt-qemu: Allow qemu-block-extra libraries
+      + d/p/0011-apparmor-libvirt-qemu-Allow-access-to-hugepage-mount.patch:
+        apparmor, libvirt-qemu: Allow access to hugepage mounts
+      + d/p/0012-apparmor-libvirtd-Allow-access-to-netlink-sockets.patch:
+        apparmor, libvirtd: Allow access to netlink sockets
+      + d/p/0013-apparmor-Add-rules-for-mediation-support.patch:
+        apparmor: Add rules for mediation support
+      + d/p/0014-apparmor-virt-aa-helper-Improve-comment-about-backin.patch:
+        apparmor, virt-aa-helper: Improve comment about backing store
+      + d/p/0015-apparmor-virt-aa-helper-Allow-access-to-ecryptfs-fil.patch:
+        apparmor, virt-aa-helper: Allow access to ecryptfs files
+      + d/p/0016-apparmor-libvirtd-Allow-ixr-to-var-lib-libvirt-virtd.patch:
+        apparmor, libvirtd: Allow ixr to /var/lib/libvirt/virtd*
+      + d/p/0017-apparmor-virt-aa-helper-Allow-access-to-tmp-director.patch:
+        apparmor, virt-aa-helper: Allow access to tmp directories
+      + d/p/0018-apparmor-virt-aa-helper-Add-ipv6-network-policy.patch:
+        apparmor, virt-aa-helper: Add ipv6 network policy
+      + d/p/0019-apparmor-virt-aa-helper-Allow-access-to-sys-bus-usb-.patch:
+        apparmor, virt-aa-helper: Allow access to /sys/bus/usb/devices
+      + d/p/0020-apparmor-virt-aa-helper-Allow-various-storage-pools-.patch:
+        apparmor, virt-aa-helper: Allow various storage pools and image
+        locations
+      + d/p/0021-apparmor-virt-aa-helper-Add-openvswitch-support.patch:
+        apparmor, virt-aa-helper: Add openvswitch support
+      + d/p/0022-apparmor-drop-references-to-qemu-kvm.patch: apparmor: drop
+        references to qemu-kvm
+      + d/p/0023-apparmor-qemu-won-t-call-qemu-nbd.patch: apparmor: qemu
+        won't call qemu-nbd
+      + d/p/0024-apparmor-virt-aa-helper-Allow-access-to-name-service.patch:
+        apparmor, virt-aa-helper: Allow access to name services
+      + d/p/0025-apparmor-fix-newer-virt-manager-1.4.0.patch: Add Apparmor
+        permissions so virt-manager 1.4.0 viewing works (LP 1668681).
+      + d/p/0026-apparmor-add-generic-base-vfio-device.patch: apparmor: add
+        /dev/vfio for vf (hot) attach (LP 1680384).
+      + d/p/0027-apparmor-allow-reading-cmdline-of-shutdown-signal.patch:
+        apparmor: allow to parse cmdline of the pid that send the shutdown
+        signal (LP 1680384).
+      + d/p/0028-apparmor-add-default-pki-path-of-lbvirt-spice.patch:
+        apparmor: add default pki path of lbvirt-spice (LP 1690140)
+      + d/p/0029-appmor-libvirt-qemu-Add-9p-support.patch: appmor,
+        libvirt-qemu: Add 9p support
+      + d/p/0030-virt-aa-helper-Complete-9p-support.patch: virt-aa-helper:
+        add l to 9p file options.
+      + d/p/0031-virt-aa-helper-Ask-for-no-deny-rule-for-readonly-dis.patch:
+        virt-aa-helper: Ask for no deny rule for readonly disk (renamed and
+        reworded, was virt-aa-helper-no-explicity-deny-for-basefiles.patch)
+      + d/p/0032-apparmor-libvirt-qemu-Allow-reading-charm-specific-c.patch:
+        apparmor, libvirt-qemu: Allow reading charm-specific ceph config
+      + d/p/0033-UBUNTU-only-apparmor-for-kvm.powerpc-LP-1680384.patch: allow
+        commands executed by ubuntu only kvm wrapper on ppc64el (LP 1686621).
+      + d/p/0034-apparmor-virt-aa-helper-access-for-snapped-nova.patch:
+        apparmor, virt-aa-helper: access for snapped nova
+  * Dropped Changes (Upstream):
+    - d/p/ubuntu/fix-libxl-default-driver-name.patch: avoid an issue with
+      default driver entries missing name='qemu'.
+    - d/p/u/aa-helper-Properly-link-with-storage-driver.patch (LP 1704782)
+      Fix to be able to follow BackinStorage chains when creating per
+      guest apparmor rules.
+  * Dropped Changes (In Debian):
+    - Enable esx support
+      + Add build-dep to libcurl4-gnutls-dev (required for esx)
+  * Added Changes:
+    - d/p/ubuntu-aa/0035-virt-aa-helper-locking-disk-files-for-qemu-2.10.patch:
+      for compatibility with the behavior of qemu 2.10 this adds locking
+      permission to rules generated for disk files (LP: #1709818)
+
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 10 Aug 2017 12:44:47 +0200
+
+>>>>>>> debian/changelog
 libvirt (3.6.0-1) unstable; urgency=medium
 
   * [ece8d56] New upstream version 3.6.0 (Closes: #870626)
@@ -288,6 +1141,267 @@ libvirt (3.6.0-1) unstable; urgency=medium
 
  -- Guido Günther <[e-mail]>  Fri, 04 Aug 2017 00:05:47 -0300
 
+<<<<<<< debian/changelog
+=======
+libvirt (3.5.0-1ubuntu3) artful; urgency=medium
+
+  * Refresh changes to match they way they were accepted upstream
+    - d/p/u/aa-helper-Properly-link-with-storage-driver.patch add commit
+      reference now that it is in git.
+    - d/p/u/fix-libxl-default-driver-name.patch: instead of addin the
+      name this is now fixed by relaxing the schema.
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 19 Jul 2017 12:48:39 +0200
+
+libvirt (3.5.0-1ubuntu2) artful; urgency=medium
+
+  * d/p/u/aa-helper-Properly-link-with-storage-driver.patch (LP: #1704782)
+    Fix to be able to follow BackinStorage chains when creating per
+    guest apparmor rules.
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 18 Jul 2017 16:34:57 +0200
+
+libvirt (3.5.0-1ubuntu1) artful; urgency=medium
+
+  * Merged with Debian unstable (3.5)
+    This closes several bugs:
+    - improved handling of host-model since libvirt 3.2 (LP: #1673467)
+    - Adding POWER9 cpu model to cpu_map.xml (LP: #1690209)
+  * Remaining changes:
+    - Disable sheepdog (universe dependency)
+    - Disable libssh2 support (universe dependency)
+    - Disable firewalld support (universe dependency)
+    - Disable selinux
+    - Enable esx support
+      + Add build-dep to libcurl4-gnutls-dev (required for esx)
+    - Set qemu-group to kvm (for compat with older ubuntu)
+    - Regularly clear AppArmor profiles for vms that no longer exist
+    - Additional apport package-hook
+    - Modifications to adapt for our delayed switch away from libvirt-bin (can
+      be dropped >18.04).
+      + d/p/ubuntu/libvirtd-service-add-bin-alias.patch: systemd: define alias
+        to old service name so that old references work
+      + d/p/ubuntu/libvirtd-init-add-bin-alias.patch: sysv init: define alias
+        to old service name so that old references work
+      + d/control: transitional package with the old name and maintainer
+        scripts to handle the transition
+    - Backwards compatible handling of group rename (can be dropped >18.04).
+    - config details and autostart of default bridged network. Creating that is
+      now the default in general, yet our solution provides the following on
+      top as of today:
+      + nat only on some ports <port start='1024' end='65535'/>
+      + autostart the default network by default
+      + do not autostart if 192.168.122.0 is already taken (e.g. in containers)
+    - d/p/ubuntu/Allow-libvirt-group-to-access-the-socket.patch: This is
+      the group based access to libvirt functions as it was used in Ubuntu
+      for quite long.
+      + d/p/ubuntu/daemon-augeas-fix-expected.patch fix some related tests
+        due to the group access change.
+    - ubuntu/parallel-shutdown.patch: set parallel shutdown by default.
+    - d/p/ubuntu/enable-kvm-spice.patch: compat with older Ubuntu qemu/kvm
+      which provided a separate kvm-spice.
+    - d/p/ubuntu/storage-disable-gluster-test: gluster not enabled, skip test
+    - d/p/ubuntu/ubuntu-libxl-qemu-path.patch: this change was split. The
+      section that adapts the path of the emulator to the Debian/Ubuntu
+      packaging is kept.
+    - d/p/ubuntu/ubuntu-libxl-Fix-up-VRAM-to-minimum-requirements.patch: auto
+      set VRAM to minimum requirements
+    - d/p/ubuntu/xen-default-uri.patch: set default URI on xen hosts
+    - Add libxl log directory
+    - libvirt-uri.sh: Automatically switch default libvirt URI for users on
+      Xen dom0 via user profile (was missing on changelogs before)
+    - d/p/ubuntu/apibuild-skip-libvirt-common.h: drop libvirt-common.h from
+      included_files to avoid build failures due to duplicate definitions.
+    - Update README.Debian with Ubuntu changes
+    - Convert libvirt0, libnss_libvirt and libvirt-dev to multi-arch.
+    - Enable some additional features on ppc64el and s390x (for arch parity)
+      + systemtap, zfs, numa and numad on s390x.
+      + systemtap on ppc64el.
+    - fix conffile upgrade handling to avoid obsolete files
+      and inactive duplicates (LP 1694159)
+    - d/t/control, d/t/smoke-qemu-session: fixup smoke-qemu-session by making
+      vmlinuz available and accessible (Debian bug 848314)
+    - d/t/control, d/t/smoke-lxc: fix up lxc smoke test (Debian bug 848317)
+    - Extended handling of apparmor profiles - clear lost profiles via cron
+    - Add dnsmasq configuration to work with system wide dnsmasq (drop >18.04,
+      no more UCA onto Xenial then which has global dnsmasq by default).
+    - Reworked apparmor Delta, especially the more complex delta is dropped
+      now, also our former delta is now split into logical pieces, has
+      improved comments and is part of a continuous upstreaming effort.
+      Listing related remaining changes:
+      + d/p/0001-apparmor-Allow-pygrub-to-run-on-Debian-Ubuntu.patch: apparmor:
+        Allow pygrub to run on Debian/Ubuntu
+      + d/p/0002-apparmor-libvirt-qemu-Allow-macvtap-access.patch: apparmor,
+        libvirt-qemu: Allow macvtap access
+      + d/p/0003-apparmor-libvirt-qemu-Allow-read-access-to-overcommi.patch:
+        apparmor, libvirt-qemu: Allow read access to overcommit_memory
+      + d/p/0004-apparmor-Explicit-deny-for-setpcap.patch: apparmor: Explicit
+        deny for setpcap
+      + d/p/0005-apparmor-libvirt-qemu-Allow-use-of-sgabios.patch: apparmor,
+        libvirt-qemu: Allow use of sgabios
+      + d/p/0006-apparmor-libvirt-qemu-Silence-lttng-related-deny-mes.patch:
+        apparmor, libvirt-qemu: Silence lttng related deny messages
+      + d/p/0007-apparmor-libvirt-qemu-Allow-owner-read-access-to-PRO.patch:
+        apparmor, libvirt-qemu: Allow owner read access to @{PROC}/*/auxv
+      + d/p/0008-apparmor-libvirt-qemu-Allow-read-access-to-sysfs-sys.patch:
+        apparmor, libvirt-qemu: Allow read access to sysfs system info
+      + d/p/0009-apparmor-libvirt-qemu-Allow-read-access-to-max_mem_r.patch:
+        apparmor, libvirt-qemu: Allow read access to max_mem_regions
+      + d/p/0010-apparmor-libvirt-qemu-Allow-qemu-block-extra-librari.patch:
+        apparmor, libvirt-qemu: Allow qemu-block-extra libraries
+      + d/p/0011-apparmor-libvirt-qemu-Allow-access-to-hugepage-mount.patch:
+        apparmor, libvirt-qemu: Allow access to hugepage mounts
+      + d/p/0012-apparmor-libvirtd-Allow-access-to-netlink-sockets.patch:
+        apparmor, libvirtd: Allow access to netlink sockets
+      + d/p/0013-apparmor-Add-rules-for-mediation-support.patch:
+        apparmor: Add rules for mediation support
+      + d/p/0014-apparmor-virt-aa-helper-Improve-comment-about-backin.patch:
+        apparmor, virt-aa-helper: Improve comment about backing store
+      + d/p/0015-apparmor-virt-aa-helper-Allow-access-to-ecryptfs-fil.patch:
+        apparmor, virt-aa-helper: Allow access to ecryptfs files
+      + d/p/0016-apparmor-libvirtd-Allow-ixr-to-var-lib-libvirt-virtd.patch:
+        apparmor, libvirtd: Allow ixr to /var/lib/libvirt/virtd*
+      + d/p/0017-apparmor-virt-aa-helper-Allow-access-to-tmp-director.patch:
+        apparmor, virt-aa-helper: Allow access to tmp directories
+      + d/p/0018-apparmor-virt-aa-helper-Add-ipv6-network-policy.patch:
+        apparmor, virt-aa-helper: Add ipv6 network policy
+      + d/p/0019-apparmor-virt-aa-helper-Allow-access-to-sys-bus-usb-.patch:
+        apparmor, virt-aa-helper: Allow access to /sys/bus/usb/devices
+      + d/p/0020-apparmor-virt-aa-helper-Allow-various-storage-pools-.patch:
+        apparmor, virt-aa-helper: Allow various storage pools and image
+        locations
+      + d/p/0021-apparmor-virt-aa-helper-Add-openvswitch-support.patch:
+        apparmor, virt-aa-helper: Add openvswitch support
+      + d/p/0022-apparmor-drop-references-to-qemu-kvm.patch: apparmor: drop
+        references to qemu-kvm
+      + d/p/0023-apparmor-qemu-won-t-call-qemu-nbd.patch: apparmor: qemu
+        won't call qemu-nbd
+      + d/p/0024-apparmor-virt-aa-helper-Allow-access-to-name-service.patch:
+        apparmor, virt-aa-helper: Allow access to name services
+      + d/p/0025-apparmor-fix-newer-virt-manager-1.4.0.patch: Add Apparmor
+        permissions so virt-manager 1.4.0 viewing works (LP 1668681).
+      + d/p/0026-apparmor-add-generic-base-vfio-device.patch: apparmor: add
+        /dev/vfio for vf (hot) attach (LP 1680384).
+      + d/p/0027-apparmor-allow-reading-cmdline-of-shutdown-signal.patch:
+        apparmor: allow to parse cmdline of the pid that send the shutdown
+        signal (LP 1680384).
+      + (28 is a new patch, listed in added changes)
+      + d/p/0029-appmor-libvirt-qemu-Add-9p-support.patch: appmor,
+        libvirt-qemu: Add 9p support
+      + d/p/0030-virt-aa-helper-Complete-9p-support.patch: virt-aa-helper:
+        add l to 9p file options.
+      + d/p/0031-virt-aa-helper-Ask-for-no-deny-rule-for-readonly-dis.patch:
+        virt-aa-helper: Ask for no deny rule for readonly disk (renamed and
+        reworded, was virt-aa-helper-no-explicity-deny-for-basefiles.patch)
+      + d/p/0032-apparmor-libvirt-qemu-Allow-reading-charm-specific-c.patch:
+        apparmor, libvirt-qemu: Allow reading charm-specific ceph config
+      + d/p/0033-UBUNTU-only-apparmor-for-kvm.powerpc-LP-1680384.patch: allow
+        commands executed by ubuntu only kvm wrapper on ppc64el (LP 1686621).
+      + d/p/0034-apparmor-virt-aa-helper-access-for-snapped-nova.patch:
+        apparmor, virt-aa-helper: access for snapped nova
+    - remaining but updated to match the latest release
+      + d/p/Disable-use-of-namespaces-by-default.patch (Debian change)
+      + d/p/Reduce-udevadm-settle-timeout-to-10-seconds.patch (Debian change)
+      + d/p/debian/apparmor_profiles_local_include.patch Include local
+        apparmor profile (Debian change)
+      + d/p/ubuntu/ubuntu_machine_type.patch: accept ubuntu types as pci440fx
+      + d/test/smoke-lxc workaround for debbug 848317/867379
+  * Dropped Changes (Upstream):
+    - Add missing apparmor rule for debug-threads feature (LP 1615550).
+    - Add new block device types to virt-aa-helpers profile (LP 1641618)
+    - d/p/ubuntu/storage-default-permission-mode-to-0711: safer default perms
+      for storage dirs like /var/lib/libvirt/images.
+    - d/p/ubuntu/libvirtd-service-nolimit.patch: remove proc/file/task limits
+      to support huge systems.
+    - d/p/ubuntu/libvirtd-service-set-notifyaccess.patch: set NotifyAccess=all
+      in libvirtd.service (-d not allowed to be specified, everything else
+      upstream so drop delta; LP 1574566).
+    - d/p/ubuntu/qemu_process-spice-don-t-release-used-port.patch: qemu_process
+      spice: don't release used port (LP 1697729).
+    - d/p/ubuntu/virsh-maxvcpu-fall-back-to-old-command.patch: virsh: maxvcpus:
+      Always fall back to the old command if domain caps fail (LP 1674298)
+    - d/p/ubuntu/qemu-Allow-empty-script-path-to-interface.patch: in the past
+      it was possible to have <script path=''/> which now fails - fix to match
+      the old behavior (LP 1665698)
+    - Reworked apparmor Delta and started upstreaming, listing related
+      changes dropped:
+      + Apparmor feature parsing to depend on new apparmor features which
+        appear in different versions across distributions (no more needed
+        >=Xenial, allows to now separate changes and upstream more easily).
+      + d/p/ubuntu/Ensure-disk-names-follow-the-disk-name-regex.patch:
+        guarantee disk spec is following the defined regex (LP 1665410).
+      + d/p/ubuntu/virt-aa-helper-add-guest-agent-rule.patch: add
+        virt-aa-helper rule allowing all private channel access.
+      + d/p/ubuntu/virt-aa-helper-apparmor-allow-usr-share-AAVMF-too.patch:
+        virt-aa-helper to allow access to aarch64 UEFI images.
+      + d/rules, apparmor: include and install local apparmor profiles (This
+        is now done by dh_apparmor automatically)
+      + add local apparmor override templates (provided by dh_apparmor now)
+      + Fix name resolution calls from virt-aa-helper profile (LP 1546674).
+      + virt-aa-helper, apparmor: allow /usr/share/OVMF/ too
+      + virt-aa-helper: Generalize test for firmware paths
+      + apparmor, virt-aa-helper: Allow aarch64 UEFI.
+      + apparmor, libvirt-qemu: Add ppc64el related changes
+      + apparmor, libvirtd: Allow libxl-save-helper to run on Debian/Ubuntu
+      + apparmor, libvirt-qemu: Allow access to ceph config
+      + apparmor, libvirt-qemu: Allow access to certificates used by libvirt-vnc
+      + apparmor, virt-aa-helper: Explicit denies for host devices
+      + apparmor, virt-aa-helper: Allow access to libnl-3 config files
+      + apparmor, libvirt-qemu: allow access to pt_chown for pty consoles
+  * Dropped Changes (In Debian):
+    - d/rules: debhelper start virtlogd.socket
+    - d/p/ubuntu/Debianize-virtlogd-service.patch: Adapt config file location
+      for Debian based systems.
+    - Additional debian/bug-presubj
+    - Extended handling of apparmor profiles - reload and remove in maintainer
+      scripts (dh_apparmor* now generate these snippets)
+  * Dropped Changes (no SysV anymore):
+    - Add sysvinit script for virtlockd
+    - Wait on socket in sysvinit script
+    - d/rules: dh_installinit virtlockd (was part of "Cleanup systemd
+      debhelper"
+    - d/p/ubuntu/Debianize-virtlockd-init.patch: Fix default config path in
+      virtlockd.init for Debian based systems.
+  * Dropped Changes (other reasons):
+    - d/p/ubuntu/dnsmasq-as-priv-user: configuration to run as extra user
+      This used group libvirt instead of nobody which makes it worse; Needs
+      to be fixed upstream (LP: #1690729).
+      + d/p/ubuntu/disable-network-test.patch: disable test failing due to
+        dnsmasq changes.
+    - Add .gitignore for .pc
+    - we keep lxc support as Debian does, but stop adding delta. It feels
+      somewhat less maintained than e.g. libvirt for qemu. Also for secure
+      and comfortable container management lxd is clearly preferred. The
+      delta caused more issues than it solved so deliver libvirt-lxc as-is
+      and drop the related delta.
+      + d/p/ubuntu/9031-enable-lxc-apparmor: enable apparmor confinement of
+        containers by default.
+      + d/p/ubuntu/9032-lxc-allow-no-security-driver: allow empty sec driver
+        for libvirt-lxc.
+    - The following xen changes are no more required with current versions
+      + d/p/ubuntu/ubuntu-libxl-hvmloader-path.patch: Fallback for libxl
+        xen paths (LP 1459603)
+      + d/p/ubuntu/ubuntu-libxl-qemu-path.patch: this change was split. The
+        section about compat to the very old qemu-dm name is no more needed.
+      + d/p/ubuntu/libxl-fix-test-data.patch and
+        d/p/ubuntu/fix-xen-xml-in-tests.patch: updated and unified into the
+        former one + also updated the maintainer notes to ease updating.
+      + d/p/ubuntu/libxl-no-dm-check.patch: Stop calling emulator to identify
+        device-model
+  * Added Changes:
+    - d/p/0028-apparmor-add-default-pki-path-of-lbvirt-spice.patch:
+      apparmor: add default pki path of lbvirt-spice (LP: #1690140)
+    - conffile handling of files dropped in 3.5 (can be dropped >18.04)
+      + /etc/init.d/virtlockd was sysv init only
+      + /etc/apparmor.d/local/usr.sbin.libvirtd and
+        /etc/apparmor.d/local/usr.lib.libvirt.virt-aa-helper are now generated
+        by dh_apparmor as needed
+    - d/p/ubuntu/fix-libxl-default-driver-name.patch: avoid an issue with
+      default driver entries missing name='qemu'.
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 06 Jul 2017 15:43:17 +0200
+
+>>>>>>> debian/changelog
 libvirt (3.5.0-1) unstable; urgency=medium
 
   [ Guido Günther ]
@@ -381,6 +1495,236 @@ libvirt (3.0.0-1) experimental; urgency=medium
 
  -- Guido Günther <[e-mail]>  Thu, 19 Jan 2017 18:51:18 +0100
 
+<<<<<<< debian/changelog
+=======
+libvirt (2.5.0-3ubuntu10) artful; urgency=medium
+
+  * d/p/ubuntu/0004-apparmor-apply-ubuntu-delta.patch: Allow access to base
+    images and snapshots stored in nova-hypervisor snap's $SNAP_COMMON
+    directory, enabling use of the libvirt deb from the nova-hypervisor
+    snap (LP: #1644507).
+
+ -- Corey Bryant <[e-mail]>  Thu, 22 Jun 2017 14:29:39 -0400
+
+libvirt (2.5.0-3ubuntu9) artful; urgency=medium
+
+  * d/p/ubuntu/qemu_process-spice-don-t-release-used-port.patch: qemu_process
+    spice: don't release used port (LP: #1697729) - upstream in libvirt 3.1.
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 14 Jun 2017 14:49:16 +0200
+
+libvirt (2.5.0-3ubuntu8) artful; urgency=medium
+
+  * fix conffile upgrade handling to avoid obsolete files
+    and inactive duplicates (LP: #1694159)
+    - d/libvirt-daemon-system.maintscript: revert to Debian content
+    - d/libvirt-bin.maintscript: add missing rm_conffile related to
+      dropping upstart.
+    - d/libvirt-bin.maintscript: add missing rm of conffiles due
+      to re-aligning with debian package names since yakkety.
+    - d/libvirt-bin.maintscript: for LTS->LTS upgraders try to move and retain
+      custom changes.
+    - d/libvirt-bin.maintscript: for upgraders from yakkety or later remove
+      the (now duplicate) conffiles, but retain custom changes in backups if
+      they exist
+    - d/libvirt-bin.preinst: drop manual mv of conffiles which lacked
+      retaining changes and upgrade-abort handling.
+    - d/libvirt-bin.preinst: handle upgrades up to the latest predecessor
+      possible before yakkety.
+    - d/libvirt-bin.preinst: fixup the combination of rm+mv conffile in case
+      the package is upgrading from pre yakkety.
+    - d/libvirt-daemon-system.postinst: clean up old dnsmasq enablement symlink
+      if unmodified.
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 31 May 2017 14:29:51 +0200
+
+libvirt (2.5.0-3ubuntu7) artful; urgency=medium
+
+  * debian/patches/ubuntu/apparmor-ppcwrapper.patch: update to add missing
+    colon (LP: #1686621).
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 27 Apr 2017 13:16:05 +0200
+
+libvirt (2.5.0-3ubuntu6) artful; urgency=medium
+
+  * Add missing apparmor profile entries (LP: #1680384)
+    - debian/patches/ubuntu/apparmor-vfio.patch: apparmor: add /dev/vfio
+      for vf (hot) attach
+    - debian/patches/ubuntu/apparmor-ppcwrapper.patch: apparmor: allow
+      extra tools executed by kvm.powerpc
+    - debian/patches/ubuntu/apparmor-shutdown.patch: apparmor: allow to
+      parse cmdline of the pid that send the shutdown signal
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 25 Apr 2017 14:10:06 +0200
+
+libvirt (2.5.0-3ubuntu5) zesty; urgency=medium
+
+  * d/p/ubuntu/virsh-maxvcpu-fall-back-to-old-command.patch: virsh: maxvcpus:
+    Always fall back to the old command if domain caps fail (LP: #1674298)
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 21 Mar 2017 08:02:37 +0100
+
+libvirt (2.5.0-3ubuntu4) zesty; urgency=medium
+
+  * d/p/ubuntu/qemu-Allow-empty-script-path-to-interface.patch: in the past
+    it was possible to have <script path=''/> which now fails - fix to match
+    the old behavior (LP: #1665698)
+
+ -- Christian Ehrhardt <[e-mail]>  Fri, 10 Mar 2017 08:57:18 +0100
+
+libvirt (2.5.0-3ubuntu3) zesty; urgency=medium
+
+  [ Christian Ehrhardt ]
+  * d/p/ubuntu/Ensure-disk-names-follow-the-disk-name-regex.patch:
+    guarantee disk spec is following the defined regex (LP: #1665410).
+
+  [ Bryan Quigley ]
+  * d/p/ubuntu/0007-apparmor-fix-for-new-virt-manager.patch: Add Apparmor
+    permissions so virt-manager 1.4.0 viewing works (LP: #1668681).
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 06 Mar 2017 08:24:06 +0100
+
+libvirt (2.5.0-3ubuntu2) zesty; urgency=medium
+
+  * No-change rebuild to build against Xen-4.8 libs.
+
+ -- Stefan Bader <[e-mail]>  Thu, 26 Jan 2017 14:19:03 +0100
+
+libvirt (2.5.0-3ubuntu1) zesty; urgency=medium
+
+  * Merged with Debian unstable
+    - this picks up a fix for migrations using NFS mounts (LP: #1637601).
+  * Remaining changes:
+    - Disable sheepdog (universe dependency)
+    - Disable libssh2 support (universe dependency)
+    - Disable firewalld support (universe dependency)
+    - Disable selinux
+    - Enable esx support
+      - Add build-dep to libcurl4-gnutls-dev (required for esx)
+    - Set qemu-group to kvm (for compat with older ubuntu)
+    - Added changes to use the upstream apparmor profiles with added
+      delta (configurable via apparmor profiles version).
+      * d/p/u/000[1-6]-apparmor-*
+    - Regularly clear AppArmor profiles for vms that no longer exist
+    - Fix name resolution calls from virt-aa-helper profile (LP 1546674).
+    - Add missing apparmor rule for debug-threads feature (LP 1615550).
+    - Add new block device types to virt-aa-helpers profile (LP 1641618)
+    - Additional apport package-hook
+    - d/rules: debhelper start virtlogd.socket
+    - Add sysvinit script for virtlockd
+    - Additional debian/bug-presubj
+    - Modifications to adapt for our delayed switch away from libvirt-bin (can
+      be dropped after 18.04).
+      - d/p/ubuntu/libvirtd-service-add-bin-alias.patch: alias to old
+        libvirt-bin name.
+      - d/p/ubuntu/libvirtd-init-add-bin-alias.patch: provides for the old
+        libvirt-bin name.
+    - Wait on socket in sysvinit script
+    - Backwards compatible handling of groups (can be dropped after 18.04).
+    - config details and autostart of default bridged network. Creating that is
+      now the default in general, yet our solution provides the following on
+      top as of today:
+      - nat only on some ports <port start='1024' end='65535'/>
+      - autostart the default network by default
+      - do not autostart if 192.168.122.0 is already taken (e.g. in containers)
+    - d/p/ubuntu/Allow-libvirt-group-to-access-the-socket.patch: This is
+      the group based access to libvirt functions as it was used in Ubuntu
+      for quite long.
+      - d/p/ubuntu/daemon-augeas-fix-expected.patch fix some related tests
+        due to the group access change.
+    - d/p/ubuntu/dnsmasq-as-priv-user: configuration to run as extra user
+      - d/p/ubuntu/disable-network-test.patch: disable test failing due to
+        dnsmasq changes.
+    - ubuntu/parallel-shutdown.patch: set parallel shutdown by default.
+    - d/p/ubuntu/enable-kvm-spice.patch: compat with older Ubuntu qemu/kvm
+      which provided a separate kvm-spice.
+    - d/p/ubuntu/storage-default-permission-mode-to-0711: safer default perms
+      for storage dirs like /var/lib/libvirt/images.
+    - d/p/ubuntu/storage-disable-gluster-test: gluster not enabled, skip test
+    - d/p/ubuntu/9031-enable-lxc-apparmor: enable apparmor confinement of
+      containers by default.
+    - d/p/ubuntu/9032-lxc-allow-no-security-driver: allow empty sec driver for
+      libvirt-lxc.
+    - d/p/ubuntu/ubuntu_machine_type.patch: accept ubuntu types as pci440fx
+    - d/p/ubuntu/ubuntu-libxl-qemu-path.patch: Set common qemu path to match
+      Debian/Ubuntu Xen packaging.
+    - d/p/ubuntu/ubuntu-libxl-hvmloader-path.patch: Fallback for libxl
+      xen paths (LP 1459603)
+    - d/p/ubuntu/ubuntu-libxl-Fix-up-VRAM-to-minimum-requirements.patch: auto
+      set VRAM to minimum requirements
+    - d/p/ubuntu/libxl-no-dm-check.patch: Stop calling emulator to identify
+      device-model
+    - d/p/ubuntu/xen-default-uri.patch: set default URI on xen hosts
+    - fixup tests to match packaging of Xen (mostly different paths)
+      - d/p/ubuntu/libxl-fix-test-data.patch
+      - d/p/ubuntu/fix-xen-xml-in-tests.patch
+    - d/p/ubuntu/Debianize-virtlogd-service.patch: Adapt config file location
+      for Debian based systems.
+    - d/p/ubuntu/Debianize-virtlockd-init.patch: Fix default config path in
+      virtlockd.init for Debian based systems.
+    - d/p/ubuntu/9034-complete-9p-support: virt-aa-helper: add l to 9p file
+      options.
+    - d/p/ubuntu/parallel-shutdown.patch: shut guests down in parallel
+    - d/p/ubuntu/virt-aa-helper-no-explicity-deny-for-basefiles.patch: ask for
+      no deny rule for readonly disk elements.
+    - d/p/ubuntu/virt-aa-helper-add-guest-agent-rule.patch: add virt-aa-helper
+      rule allowing all private channel access
+    - d/p/ubuntu/libvirtd-service-nolimit.patch: remove proc/file/task limits
+      to support huge systems.
+    - d/p/ubuntu/virt-aa-helper-apparmor-allow-usr-share-AAVMF-too.patch:
+      virt-aa-helper to allow access to aarch64 UEFI images.
+    - d/p/ubuntu/libvirtd-service-set-notifyaccess.patch: set NotifyAccess=all
+      in libvirtd.service (LP 1574566).
+    - d/p/ubuntu/apibuild-skip-libvirt-common.h: drop libvirt-common.h from
+      included_files to avoid build failures due to duplicate definitions.
+    - Update README.Debian with Ubuntu changes
+    - Convert libvirt0, libnss_libvirt and libvirt-dev to multi-arch.
+    - Add libxl log directory
+    - Enable some additional features on ppc64el and s390x (for arch parity)
+      - systemtap, zfs, numa and numad on s390x.
+      - systemtap on ppc64el.
+  * Dropped Changes:
+    - Build depend on gnutls >= 3.5.6-4ubuntu2 (no > 3.5.6 && < 3.5.6-4ubuntu2
+      in any release left)
+    - Fix parsing non apparmor labels LP:#1633207 (upstream in libvirt 2.5)
+    - Ignore newlines in guest list (upstream in libvirt 2.4)
+    - Avoid migration postcopy issues by ensuring valid commands (upstream in
+      libvirt 2.5)
+    - Enable numa for arm64 (in Debian)
+    - Fix libvirt start failure when security_driver set (upstream in libvirt
+      2.2)
+    - virt-aa-helper: Fix upstream implementation of no explicit deny rule
+      (upstream in libvirt 2.3)
+    - Some useless whitespace damage and no more applicable comments
+    - The following patches were part of the Delta but not the series file.
+      So they had no effect and can be dropped now:
+      - ubuntu/9036-util-prepare-uri-for-libxml2-2.9.2.patch
+      - ubuntu/Disable-failing-virnetsockettest.patch
+      - ubuntu/dont-include-non-migrateable-features-in-host-model
+      - ubuntu/upstream-libxl-Allow-libxl-to-find-pygrub-binary.patch
+    - See the 2.1.0-1ubuntu15 and 2.1.0-1ubuntu16 changelogs for related
+      pre-merge drops
+    - Add build-dep to libxml-libxml-perl (no more needed)
+    - apparmor double add /usr/bin/qemu-sparc64 rmix (no function anymore)
+    - apparmor /usr/{lib,lib64}/qemu/block-*.so (in Debian)
+    - apparmor moving /bin/bash rmix in profile (drop non functional delta)
+    - follow Debians style of block-*.so rules for block-extra (drop our
+      functionally equivalent adding/moving of rules)
+    - follow Debians style of lib/lib64 rules (drop a lot of our functional
+      functionally equivalent adding/moving of rules)
+    - accept Upstream style to handle libvirt_iohelper and libvirt_parthelper
+      (stop removing the two rules without an associated bug to reduce delta)
+    - Disabling dep8 smoke tests
+  * Added Changes:
+    - d/t/control, d/t/smoke-qemu-session: fixup smoke-qemu-session by making
+      vmlinuz available and accessible (in discussed with Debian in debbug
+      848314)
+    - d/t/control, d/t/smoke-lxc: fix up lxc smoke test (in discussed with
+      Debian in debbug 848317)
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 03 Jan 2017 13:58:30 +0100
+
+>>>>>>> debian/changelog
 libvirt (2.5.0-3) unstable; urgency=medium
 
   * [ba9fcb8] Invoke db_stop.
@@ -529,6 +1873,195 @@ libvirt (2.1.0-2) unstable; urgency=medium
 
  -- Guido Günther <[e-mail]>  Fri, 19 Aug 2016 10:22:22 +0200
 
+<<<<<<< debian/changelog
+=======
+libvirt (2.1.0-1ubuntu16) zesty; urgency=medium
+
+  * Ensure d/p/ubuntu/9002-default_uri_virsh_to_system.patch is
+    dropped as intended.
+  * Re-Add d/p/ubuntu/apibuild-skip-libvirt-common.h for an issue that
+    transiently occurs on LP builds (real trigger not yet identified, so it
+    can't be upstreamed).
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 14 Dec 2016 09:30:58 +0100
+
+libvirt (2.1.0-1ubuntu15) zesty; urgency=medium
+
+  * Cleanup Ubuntu Delta prior to next libvirt merge
+    - drop obsolte patches:
+      d/p/ubuntu/cgroups-ignore-systemd-failure,
+      d/p/ubuntu/ubuntu-skip-virstoragetest,
+      d/p/ubuntu/9021-fix-uint64_t.patch,
+      ubuntu/Disable-failing-virnetsockettest.patch (was only comment),
+      d/p/ubuntu/9002-default_uri_virsh_to_system.patch,
+      d/p/ubuntu/ubuntu-xend-probe.patch
+    - clarify dep3 headers to be more useful:
+      d/p/ubuntu/Allow-libvirt-group-to-access-the-socket.patch,
+      d/p/ubuntu/daemon-augeas-fix-expected.patch,
+      d/p/ubuntu/enable-kvm-spice.patch,
+      d/p/ubuntu/dnsmasq-as-priv-user,
+      d/p/ubuntu/disable-network-test.patch
+    - split patch containing unrelated changes into two patches, so parts of
+      d/p/ubuntu/storage-default-permission-mode-to-0711 moved into
+      d/p/ubuntu/storage-disable-gluster-test
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 12 Dec 2016 11:59:59 +0100
+
+libvirt (2.1.0-1ubuntu14) zesty; urgency=medium
+
+  * d/p/u/apparmor-fix-name-resolution.patch rework the fix to base
+    on the apparmor nameservice abstraction to be future proof (LP: #1546674).
+  * d/p/ubuntu/apparmor-fix-new-devicetypes.patch add new block device types to
+    virt-aa-helpers profile (LP: #1641618)
+  * d/p/u/apparmor-fix-other-seclabels.patch refresh to the now upstream
+    accepted solution (LP: #1633207).
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 24 Nov 2016 08:06:38 +0100
+
+libvirt (2.1.0-1ubuntu13) zesty; urgency=medium
+
+  * drop d/p/ubuntu/fix-ftbfs-for-gnutls-3-5-6.patch as the offending change
+    in gnutls has been reverted (LP: #1641615)
+  * Build depend on gnutls >= 3.5.6-4ubuntu2 to build after the gnutls fix
+    migrated
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 17 Nov 2016 08:43:10 +0100
+
+libvirt (2.1.0-1ubuntu12) zesty; urgency=medium
+
+  * d/p/ubuntu/fix-ftbfs-for-gnutls-3-5-6.patch fix FTBFS due to changes in
+    gnutls that affected the ordering on certificate DN entries (LP: #1641615)
+  * Revert "Fix FTBFS on zesty due to issues with concurrent make check" as it
+    was not the right solution.
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 16 Nov 2016 14:52:17 +0100
+
+libvirt (2.1.0-1ubuntu11) zesty; urgency=medium
+
+  * Fix FTBFS on zesty due to issues with concurrent make check (LP: #1641615)
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 15 Nov 2016 14:45:52 +0100
+
+libvirt (2.1.0-1ubuntu10) zesty; urgency=medium
+
+  [Simon Déziel]
+  * d/p/u/apparmor-fix-name-resolution.patch adds missing rules for name
+    resolution to virt-aa-helper Apparmor profile (LP: #1546674).
+  * d/p/u/apparmor-fix-debug-threads.patch adds missing rule for debug-threads
+    feature that is now default enabled to Apparmor profile (LP: #1615550).
+
+  [Christian Ehrhardt]
+  * d/p/u/apparmor-fix-other-seclabels.patch fixes an issue parsing non
+    apparmor security labels (LP: #1633207).
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 24 Oct 2016 14:21:36 +0200
+
+libvirt (2.1.0-1ubuntu9) yakkety; urgency=medium
+
+  * Fix libvirt-guest.sh to handle multiple guests (LP: #1591695).
+
+ -- Stefan Bader <[e-mail]>  Thu, 06 Oct 2016 12:14:05 +0200
+
+libvirt (2.1.0-1ubuntu8) yakkety; urgency=medium
+
+  [ Christian Ehrhardt ]
+
+  * avoid migration postcopy issues by ensuring valid commands (LP: #1620906)
+    - d/p/ubuntu/check-live-for-postcopy.patch Check for --live flag for
+      postcopy-after-precopy migration.
+    - d/p/ubuntu/make-postcopy-mandatory-for-postcopy-after-precopy.patch to
+
+  [ Stefan Bader ]
+
+  * Fix Xenial to Yakkety migration from libvirt-bin.service to
+    libvirtd.service (LP: #1627969).
+  * Update Vcs-Git and Vcs-Browser fields to point to launchpad
+    (LP: #1629210)
+
+  [ Dann Frazier ]
+
+  * Fix FTBS in Yakkety due to missing python dependency (LP: #1629041)
+
+ -- Stefan Bader <[e-mail]>  Fri, 30 Sep 2016 10:11:30 +0200
+
+libvirt (2.1.0-1ubuntu7) yakkety; urgency=medium
+
+  * Enable NUMA support in arm64 builds (LP: #1627926).
+
+ -- dann frazier <[e-mail]>  Mon, 26 Sep 2016 23:36:24 -0600
+
+libvirt (2.1.0-1ubuntu6) yakkety; urgency=medium
+
+  * No-change rebuild for readline soname change.
+
+ -- Matthias Klose <[e-mail]>  Sat, 17 Sep 2016 12:05:33 +0000
+
+libvirt (2.1.0-1ubuntu5) yakkety; urgency=medium
+
+  [ Jon Grimm ]
+
+  * Fix libvirt start failure when security_driver set (LP: #1618592)
+    - qemu: fix qemu.conf security_driver
+
+ -- Stefan Bader <[e-mail]>  Thu, 08 Sep 2016 14:11:47 +0200
+
+libvirt (2.1.0-1ubuntu4) yakkety; urgency=medium
+
+  * Enable systemtap, zfs, numa on s390x.
+  * Enable systemtap on ppc64el.
+
+ -- Dimitri John Ledkov <[e-mail]>  Wed, 24 Aug 2016 13:21:29 +0100
+
+libvirt (2.1.0-1ubuntu3) yakkety; urgency=low
+
+  * Really fix the ADT regression and not only the changelog due
+    to somehow ending up on the wrong git branch.
+
+ -- Stefan Bader <[e-mail]>  Wed, 17 Aug 2016 18:31:01 +0200
+
+libvirt (2.1.0-1ubuntu2) yakkety; urgency=low
+
+  * Fix ADT build-test regression(s)
+
+ -- Stefan Bader <[e-mail]>  Wed, 17 Aug 2016 15:18:38 +0200
+
+libvirt (2.1.0-1ubuntu1) yakkety; urgency=low
+
+  * Merged with Debian testing. Remaining changes:
+    - Added changes to use the upstream apparmor profiles with added
+      delta (configurable via apparmor profiles version).
+      * d/p/u/0001-apparmor-add-feature-parsing.patch
+      * d/p/u/0002-apparmor-apply-ubuntu-delta.patch
+      * d/p/u/0003-apparmor-debian-ubuntu-delta.patch
+      * d/p/u/0004-apparmor-ubuntu-delta.patch
+    - Avoiding dependency on sheepdog
+    - Additional apport package-hook
+    - Additional dnsmasq configuration
+    - Additional profile.d script to set default URI
+    - Additional debian/bug-presubj
+    - d/rules: debhelper start virtlogd.socket not virtlockd.service
+    - Modifications to adapt for our delayed switch away from libvirt-bin.
+    - Wait on socket in sysvinit script
+    - Backwards compatible handling of groups and default bridged network
+      creation.
+    - Extended handling of apparmor profiles
+    - Convert libvirt0 and libvirt-dev to multi-arch.
+    - Added a fix for the upstream version of adding better write denials
+      handling to virt-aa-helper.
+    - Convert libnss_libvirt to multi-arch and fix up source location that
+      changed when making libvirt0 multi-arch.
+    - Dropped
+      * upstart script for libvirtd
+      * d/p/lp1588841-000[123]-* (upstream)
+      * d/p/u/qemu-Add-virQEMUCapsSupportsGICVersion.patch (upstream)
+      * d/p/u/qemu-Automatically-choose-usable-GIC-version.patch (upstream)
+      * d/p/u/docs-remove-xpath.patch (xpath removed upstream)
+      * d/p/u/preup-virt-aa-helper-better-write-denials-handling.patch (upstr.)
+      * d/p/u/ubuntu/virt-aa-helper-helpfix.patch (upstream)
+
+ -- Stefan Bader <[e-mail]>  Wed, 13 Jul 2016 13:12:36 +0200
+
+>>>>>>> debian/changelog
 libvirt (2.1.0-1) unstable; urgency=medium
 
   * Upload to unstable
@@ -598,6 +2131,106 @@ libvirt (1.3.5~rc1-1) experimental; urgency=medium
 
  -- Guido Günther <[e-mail]>  Mon, 30 May 2016 22:00:33 +0200
 
+<<<<<<< debian/changelog
+=======
+libvirt (1.3.4-1ubuntu6) yakkety; urgency=low
+
+  * Fix libvirtd crashing on libxl domain restore (LP: #1588841).
+    Patches cherry-picked from upsream libvirt git tree.
+    - libxl: switch to using libxl_domain_create_restore from v4.4 API
+    - libxl: support Xen migration stream V2 in save/restore
+    - libxl: support migration stream V2 in migration
+
+ -- Stefan Bader <[e-mail]>  Wed, 08 Jun 2016 14:17:23 +0200
+
+libvirt (1.3.4-1ubuntu5) yakkety; urgency=low
+
+  * Update the correct apparmor profiles to allow AAVMF and qemu-efi
+    firmware for aarch64 (1538882)
+  * Clean up / refresh various patches to finalize switch from libvirt-bin
+    to libvirtd as service name.
+    Drop: d/p/ubuntu/libvirt-bin-service-libvirtd-alias.patch
+    Refresh+Rename: d/p/ubuntu/libvirt-bin-service-set-notifyaccess.patch ->
+                    d/p/ubuntu/libvirtd-service-nolimit.patch
+    Rename: d/p/ubuntu/libvirt-bin-service-set-notifyaccess.patch ->
+            d/p/ubuntu/libvirtd-service-set-notifyaccess.patch
+    Refresh: d/p/ubuntu/libvirtd-service-add-bin-alias.patch
+    Add: d/p/ubuntu/libvirtd-init-add-bin-alias.patch
+  * Change default profile used by libvirtd.service to /etc/default/libvirtd.
+    Drop: d/p/ubuntu/switch-service-files-to-libvirt-bin.patch
+  * Drop virtlockd.service from dh_systemd_start in debian/rules as
+    the service is socket activated (LP: #1588006).
+  * Fix failure to enable libvirtd.service due to lingering libvirt-bin
+    alias. This could happen when the upgrade from a version prior 1.3.3-2
+    happened before 1.3.4-1ubuntu3 (LP: #1588004).
+
+ -- Stefan Bader <[e-mail]>  Thu, 02 Jun 2016 14:50:27 +0200
+
+libvirt (1.3.4-1ubuntu4) yakkety; urgency=medium
+
+  * Re-enable the upstart job by renaming the file.
+  * Include patchby @guessi to continally wait for libvirtd to start when
+    using sysvinit or upstart.  (LP: #1571209)
+
+ -- Serge Hallyn <[e-mail]>  Mon, 23 May 2016 13:50:22 -0500
+
+libvirt (1.3.4-1ubuntu3) yakkety; urgency=medium
+
+  [ dann frazier ]
+  * d/p/u/qemu-Add-virQEMUCapsSupportsGICVersion.patch,
+    d/p/u/qemu-Automatically-choose-usable-GIC-version.patch: If no GIC
+    was specified for an ARM virt guest, choose a GIC version supported
+    by the host. (LP: #1566564)
+
+  [ Serge Hallyn ]
+  * libvirt-bin.preinst: on upgrades from prior to 1.3.3-2, also remove the
+    service file for the Alias - /etc/systemd/system/libvirtd.service.
+    (LP: #1579922)
+
+ -- dann frazier <[e-mail]>  Thu, 19 May 2016 08:57:33 -0600
+
+libvirt (1.3.4-1ubuntu2) yakkety; urgency=medium
+
+  * Include installing virtlogd.socket. (LP: #1583009)
+
+ -- Chris J Arges <[e-mail]>  Wed, 18 May 2016 13:56:08 -0500
+
+libvirt (1.3.4-1ubuntu1) yakkety; urgency=medium
+
+  * Merge 1.3.4-1 from Debian unstable
+  * Drop upstream-applied patches:
+    - conf-also-mark-implicit-video-as-primary.patch
+    - libvirt-socket-fix-group
+  * Remaining changes
+    - keep libvirt-bin transitional package - until 18.10 (for lts-to-lts
+      upgrades)
+    - keep (redundant) libvirtd group if it existed on upgrade - until 18.10
+      (for lts-to-lts upgrades)
+    - keep ubuntu-specific patches
+    - ship apport and dnsmasq files
+    - enable virbr0
+    - ship apparmor from debian/*.  We should push changes upstrema, but
+      cannot sync with debian as apparmor profiles must be processed in
+      debian/rules for cloud archive.
+    - debian/control
+      - enable zfs
+      - disable libssh2 and sheepdog
+      - add libxml-libxml-perl and libcurl4-gnutls-dev
+      - enable libnuma-dev on ppc64el (pushed to Debian)
+      - update release for conflicts/replaces on libvirt-bin to << 1.3.3-2
+    - debian/libvirt-daemon-system.preinst: stop libvirt-bin on certain
+      upgrades.
+      - Multi-arch-ify.
+    - debian/rules: disable selinux and firewalld;  use 'kvm' group; disable
+      ssh2, enable zfs and esx;  process apparmor files for older releases;
+      copy dnsmasq configuration.
+    - debian/tests/control: add extra depends
+  * d/p/ubuntu/apibuild-skip-libvirt-common.h: libvirt-common.h is being
+    included twice leading to build failures - drop it temporarily.
+
+ -- Serge Hallyn <[e-mail]>  Thu, 12 May 2016 12:50:02 -0500
+
+>>>>>>> debian/changelog
 libvirt (1.3.4-1) unstable; urgency=medium
 
   * Upload to unstable
@@ -627,6 +2260,68 @@ libvirt (1.3.4~rc1-1) experimental; urgency=medium
 
  -- Guido Günther <[e-mail]>  Wed, 27 Apr 2016 16:51:55 +0200
 
+<<<<<<< debian/changelog
+=======
+libvirt (1.3.3-2ubuntu2) yakkety; urgency=medium
+
+  * debian/rules: fix paths when removing files which should not end up
+    in libvirt-daemon package.
+
+ -- Serge Hallyn <[e-mail]>  Thu, 12 May 2016 13:14:17 -0500
+
+libvirt (1.3.3-2ubuntu1) yakkety; urgency=medium
+
+  * Merge 1.3.3-2 from Debian unstable
+  * Merge new packaging layout
+    - debian/control
+      * add libsanlock-dev, dtrace, systemtap-sdt-dev, librados-dev,
+        libfuse-dev, augeas-tools to Build-Depends.
+      * Drop libcgmanager-dev from Build-Depends.
+      * Add libvirt-clients, libvirt-daemon, and libvirt-daemon-system
+        packages which replace the now-virtual libvirt-bin package.
+      * Drop libvirt0-dbg (is this intential in Debian?)
+      * Add libvirt-sanlock package (this should be in universe)
+  * Switch to 'libvirt' group, keeping the same gid as 'libvirtd'
+    on upgrade.  Keep libvirtd group name on upgrade in case any
+    site scripts use it.
+  * Enable dtrace
+  * Add Debian policy-kit configuration
+  * drop ubuntu/9004-libvirtd-group-name.patch as we are switching to group
+    'libvirt'
+  * Drop obsolete migration scripts:
+    - libvirt-migrate-xend-managed-domains
+    - libvirt-migrate-qemu-disks
+    - libvirt-migrate-qemu-machinetype
+  * Remaining changes:
+    - keep libvirt-bin transitional package - until 18.10 (for lts-to-lts
+      upgrades)
+    - keep (redundant) libvirtd group if it existed on upgrade - until 18.10
+      (for lts-to-lts upgrades)
+    - keep ubuntu-specific patches
+    - ship apport and dnsmasq files
+    - enable virbr0
+    - ship apparmor from debian/*.  We should push changes upstrema, but
+      cannot sync with debian as apparmor profiles must be processed in
+      debian/rules for cloud archive.
+    - debian/control
+      - enable zfs
+      - disable libssh2 and sheepdog
+      - add libxml-libxml-perl and libcurl4-gnutls-dev
+      - enable libnuma-dev on ppc64el (pushed to Debian)
+      - update release for conflicts/replaces on libvirt-bin to << 1.3.3-2
+    - debian/libvirt-daemon-system.preinst: stop libvirt-bin on certain
+      upgrades.
+      - Multi-arch-ify.
+    - debian/rules: disable selinux and firewalld;  use 'kvm' group; disable
+      ssh2, enable zfs and esx;  process apparmor files for older releases;
+      copy dnsmasq configuration.
+    - debian/tests/control: add depends
+  * d/p/ubuntu/conf-also-mark-implicit-video-as-primary.patch: upstream patch
+    to fix failure to start vms with video not explicitly marked as 'primary'
+
+ -- Serge Hallyn <[e-mail]>  Fri, 29 Apr 2016 20:51:48 -0500
+
+>>>>>>> debian/changelog
 libvirt (1.3.3-2) unstable; urgency=medium
 
   * Upload to unstable
@@ -678,6 +2373,242 @@ libvirt (1.3.1-2) unstable; urgency=medium
 
  -- Guido Günther <[e-mail]>  Fri, 19 Feb 2016 17:29:27 +0100
 
+<<<<<<< debian/changelog
+=======
+libvirt (1.3.1-1ubuntu11) yakkety; urgency=medium
+
+  [ Stefan Bader ]
+  * Add alias for libvirtd.service into  libvirt-bin.service
+
+  [ Serge Hallyn ]
+  * d/p/u/libvirt-bin-service-set-notifyaccess.patch: Set NotifyAccess=all in
+    libvirt-bin systemd service file. (LP: #1574566)
+
+ -- Serge Hallyn <[e-mail]>  Mon, 18 Apr 2016 13:44:15 -0500
+
+libvirt (1.3.1-1ubuntu10) xenial; urgency=medium
+
+  * d/p/u/virt-aa-helper-apparmor-allow-usr-share-AAVMF-too.patch: Allow
+    access to /usr/share/AAVMF/** and /usr/share/qemu-efi/** for aarch64 UEFI.
+    (LP: #1538882)
+
+ -- William Grant <[e-mail]>  Fri, 15 Apr 2016 12:08:21 +1000
+
+libvirt (1.3.1-1ubuntu9) xenial; urgency=medium
+
+  * Remove the tasks limit on libvirt-bin service (LP: #1567381)
+    This should be un-done when it is properly fixed in the code so
+    that virtual machines are started in their own pids cgroup.
+
+ -- Serge Hallyn <[e-mail]>  Thu, 07 Apr 2016 10:05:01 -0500
+
+libvirt (1.3.1-1ubuntu8) xenial; urgency=medium
+
+  * d/p/u/virt-aa-helper-add-guest-agent-rule.patch: this actually solves
+    the qemu guest agent problem for rhel7 vms for me.  (LP: #1393842)
+    Also drop the mknod rule which isn't needed.
+  * d/apparmor/usr.lib.libvirt.virt-aa-helper: add permission to read under
+    /var/run.  This is needed for some openvswitch info. (LP: #1513367)
+
+ -- Serge Hallyn <[e-mail]>  Fri, 11 Mar 2016 15:01:25 -0800
+
+libvirt (1.3.1-1ubuntu7) xenial; urgency=medium
+
+  * zfs support (LP: #1553023)
+    - Cherrypick upstream patches to support zfs
+    - debian/rules: build with zfs support
+    - debian/control: add zfs as build-dep
+  * d/p/u/virt-aa-helper-no-explicity-deny-for-basefiles.patch: don't mark
+    readonly files with an explicity deny only because the xml marks it
+    as reasonly. (LP: #1554031)
+  * fix typo in virt-aa-helper helptext
+  * fix d/p/u/preup-virt-aa-helper-better-write-denials-handling.patch to
+    not overwrite const memory.
+
+ -- Serge Hallyn <[e-mail]>  Thu, 10 Mar 2016 19:25:54 -0800
+
+libvirt (1.3.1-1ubuntu6) xenial; urgency=medium
+
+  * d/apparmor/libvirt-qemu: generalize the qemu-block-extra libs line.
+    (LP: #1554761)
+  * d/p/ubuntu/virt-aa-helper-add-mknod-for-guest-agent.patch: add mknod
+    capability if there is a qemu guest agent. (LP: #1393842)
+
+ -- Serge Hallyn <[e-mail]>  Wed, 09 Mar 2016 18:45:08 -0800
+
+libvirt (1.3.1-1ubuntu5) xenial; urgency=low
+
+  * Added d/p/ubuntu/preup-virt-aa-helper-better-write-denials-handling.patch
+    and refreshed d/p/ubuntu/9034-complete-9p-support accordingly.
+  * Added d/p/ubuntu/additional-libvirt-guest-tweaks.patch to fix default
+    URI detection when running in a Xen control domain. Also change the
+    default config to do parallel shutdown requests (max. 10) and reduce the
+    timeout to 2 minutes.
+
+ -- Stefan Bader <[e-mail]>  Wed, 09 Mar 2016 09:13:09 +0100
+
+libvirt (1.3.1-1ubuntu4) xenial; urgency=low
+
+  * d/libvirt-bin.virtlockd.init: Replace by the version I had already
+    prepared and was tested (LP: #1547208).
+  * d/libvirt-bin.virtlogd.init: Fix up some left-over references to
+    libvirtd.
+  * d/control: Add provides libvirt-daemon for libvirt-bin (LP: #1551643)
+
+ -- Stefan Bader <[e-mail]>  Tue, 01 Mar 2016 10:58:23 +0100
+
+libvirt (1.3.1-1ubuntu3) xenial; urgency=medium
+
+  * d/libvirt-bin.virtlockd.init: Re-write based on virtlogd init script
+    as upstream provided version is not compatible with Ubuntu/Debian.
+
+ -- James Page <[e-mail]>  Mon, 29 Feb 2016 22:24:49 +0000
+
+libvirt (1.3.1-1ubuntu2) xenial; urgency=medium
+
+  * No-change rebuild for gnutls transition.
+
+ -- Matthias Klose <[e-mail]>  Wed, 17 Feb 2016 22:41:20 +0000
+
+libvirt (1.3.1-1ubuntu1) xenial; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/apparmor/{libvirt-lxc,libvirt-qemu,local-usr.sbin.libvirtd,
+      TEMPLATE.lxc,TEMPLATE.qemu,usr.lib.libvirt.virt-aa-helper,
+      usr.sbin.libvirtd} Add apparmor profiles.
+    - Add debian/libvirt-bin.virtlockd.init based on the upstream version
+      src/locking/virtlockd.init.in. This does not seem to get processed
+      by the build.
+    - debian/control:
+      * Add libcurl4-gnutls-dev, libxml-libxml-perl, libcgmanager-dev
+      * Add ppc64el to libnuma-dev arches
+      * Remove libsanlock-dev, libselinux1-dev, systemtap-sdt-dev
+      * Remove python, sheepdog, librados-dev, libfuse-dev
+      * Remove libssh2-1-dev, qemu-system-common, augeas-tools
+      * Don't build libvirt-clients, libvirt-daemon, libvirt-sanlock packages
+      * Keep multiarch changes.
+    - Keep debian/{libvirt-bin.apport,libvirt-bin.cron.daily}
+    - Keep change d/libvirt0.install and d/libvirt-dev.install that
+      adds multi-arch wildcard.
+    - d/libvirt-daemon-system.libvirtd.default ->
+      d/libvirt-bin.libvirt-bin.default
+    - d/libvirt-daemon-system.dirs -> d/libvirt-bin.dirs
+      * Add /etc/apparmor.d/{abstractions,disable,force-complain,local}
+      * Add /etc/cron.daily
+      * Add /usr/share/apport/package-hooks
+      * Add /var/log/libvirt/libxl
+      * Add /etc/dnsmasq.d-available
+      * Remove /usr/share/polkit-1/rules.d/
+      * Remove /var/lib/polkit-1/localauthority/10-vendor.d/
+    - Keep debian/libvirt-bin.dnsmasq
+    - d/libvirt-daemon-system.examples -> d/libvirt-bin.examples
+      * Remove debian/build/daemon/libvirtd.policy
+      * Drop debian/libvirt-suspendonreboot
+    - d/libvirt-daemon-system.libvirtd.init -> d/libvirt-bin.libvirt-bin.init
+      * Add provides libvirt-bin
+      * Change /etc/default/libvirtd into /etc/default/libvirt-bin
+      * Add wait_on_sockfile() and call it during start
+    - d/libvirt-daemon-system.install -> d/libvirt-bin.install
+      * Add usr/bin/*
+      * Add usr/sbin/*
+      * Add etc/apparmor.d/*
+      * Replace etc/libvirt/{libvirtd,virtlockd,virtlogd}.conf -> etc/libvirt/*
+        (since with the clients included there are many more config files)
+      * Add usr/share/polkit-1
+      * Add usr/lib/libvirt/*
+      * Add usr/share/augeas/*
+      * Add usr/share/libvirt/*
+      * Add usr/share/man/man8/*
+      * Add usr/share/apport/package-hooks/source_libvirt.py
+      * Add etc/dnsmasq.d-available/libvirt-bin
+      * Add etc/profile.d/libvirt-uri.sh
+      * Add usr/lib/libvirt
+    - d/libvirt-daemon-system.links -> d/libvirt-bin.links
+      * Replace libvirt-daemon-system with libvirt-bin for libvirt0
+      * Remove libvirt-daemon line
+    - Remove d/libvirt-bin.maintscript
+    - d/libvirt-clients.manpages -> d/libvirt-bin.manpages
+      * Add debian/libvirt-migrate-qemu-disks.1
+      * Add debian/libvirt-migrate-qemu-machinetype.1
+      * Add debian/libvirt-migrate-xend-managed-domains.1
+    - Combined d/libvirt-daemon-system.NEWS and d/libvirt-daemon.NEWS into
+      d/libvirt-bin.NEWS
+    - Keep d/libvirt-bin.{postinst,postrm,preinst} though they probably could
+      be freshly derived from libvirt-daemon counterparts.
+      * Added removal of qemu capability cache (found in Debian) to postinst
+      * Added reload of virtlogd in postinst (following example of virtlockd)
+    - Replace d/libvirt-bin.preinst
+    - Add d/libvirt-bin.upstart
+    - d/libvirt-daemon-system.virtlogd.init -> d/libvirt-bin.virtlogd.init
+    - Remove d/libvirt-clients.install
+    - Remove d/libvirt-clients.links
+    - Remove d/libvirt-daemon.install
+    - Remove d/libvirt-daemon.links
+    - d/libvirt-daemon.README.Debian -> d/libvirt-bin.README.Debian
+      * Replaced access control section
+      * Appended apparmor profile section
+      * Appended disk migration section
+      * Appended qemu/kvm machine type migration section
+    - Remove d/libvirt-daemon-system.{maintscript,postinst,postrm,preinst}
+    - Keep libvirt-migrate-qemu-disks (and manpage)
+    - Keep libvirt-migrate-qemu-machinetype (and manpage)
+    - Keep libvirt-migrate-xend-managed-domains (and manpage)
+    - Remove d/libvirt-sanlock.{cron.weekly,links,install}
+    - Drop d/libvirt-stop-guests
+    - Drop d/libvirt-suspendonreboot (replaced by upstream libvirt-guests)
+    - Keep d/libvirt-uri.sh
+    - Remove d/polkit/60-libvirt.pkla (and polkit directory)
+    - d/tests/control
+      - Add build-essential and pkg-config dependencies to build-test
+    - debian/rules:
+      * Add autoconf stuff (not sure what still really gets used).
+      * Use qemu-group kvm instead of libvirt-qemu
+      * Add SHEEPDOGCLI environment variable to dh_auto_configure
+        override (instead of an DEB_DH_... make variable which no
+        longer takes effect).
+      * Drop --with-secdriver-apparmor --with-apparmor-profiles from
+        WITH_APPARMOR config.
+      * Change WITH_FIREWALLD and WITH_SELINUX settings to disabled.
+      * Change WITH_DTRACE setting to disabled.
+      * Drop DEB_DH_SYSTEMD_START_ARGS_libvirt-bin as it is no longer
+        needed after dropping cdbs.
+      * Add to override_dh_install section
+        - Install apparmor files (and post-processing)
+        - Install apport hooks.
+        - Install migration tools.
+        - Install profile script to autoset URI.
+        - Replace package name libvirt-daemon-system with libvirt-bin.
+        - Debian now copies libvirt-guests.{init,default} and
+          virtlogd.default from upstream source. Copy virtlockd.default
+          as well.
+        - Rename libvirtd.{socket,service} to libvirt-bin.{socket,service}
+        - Change dh_systemd_start to use virtlo{g,ck}d.socket only (the
+          services are supposed to be started by using the sockets.
+        - Move libs and pkgconfig under multiarch directory.
+      * Modify override_dh_auto_clean
+        - Replace package name libvirt-daemon-system with libvirt-bin
+        - Delete upstream files which were copied into debian/.
+      * Add override_dh_gencontrol section which conditionally adds
+        conflicts on apparmor.
+      * Add override_dh_makeshlibs section to pass version info for
+        libvirt0.
+  * Dropped patches:
+    - ubuntu/virt-aa-helper-handle-ovmf (upstream added ovmf paths to
+      restricted_rw)
+  * Refreshed patches:
+    - refreshed d/p/ubuntu/9034-complete-9p-support
+  * New patches
+    - d/ubuntu/libvirt-guests-exclude-dom0.patch
+    - d/ubuntu/libxl-no-dm-check.patch
+    - d/ubuntu/libxl-fix-test-data.patch
+    - d/ubuntu/Debianize-virtlogd-service.patch
+    - d/ubuntu/Debianize-virtlockd-init.patch
+    - d/ubuntu/switch-service-files-to-libvirt-bin.patch
+    - d/ubuntu/libvirt-socket-fix-group.patch
+
+ -- Stefan Bader <[e-mail]>  Fri, 12 Feb 2016 14:46:21 +0100
+
+>>>>>>> debian/changelog
 libvirt (1.3.1-1) unstable; urgency=medium
 
   [ Guido Günther ]
@@ -747,6 +2678,154 @@ libvirt (1.3.0~rc1-1) experimental; urgency=medium
 
  -- Guido Günther <[e-mail]>  Fri, 04 Dec 2015 17:12:53 +0100
 
+<<<<<<< debian/changelog
+=======
+libvirt (1.2.21-2ubuntu10) xenial; urgency=medium
+
+  * Multiarchify the library packages.
+
+ -- Matthias Klose <[e-mail]>  Thu, 28 Jan 2016 16:33:15 +0100
+
+libvirt (1.2.21-2ubuntu9) xenial; urgency=medium
+
+  * debian/rules: Disable cdbs' implicitly generated dh_systemd_start calls.
+    We already call it explicitly with the right options, calling it again
+    with the default options stops libvirt-guests during upgrades.
+    (LP: #1533839)
+
+ -- Martin Pitt <[e-mail]>  Mon, 18 Jan 2016 09:10:21 +0100
+
+libvirt (1.2.21-2ubuntu8) xenial; urgency=low
+
+  * d/libvirt-stop-guests: Skip Domain-0 on guest shutdown. Newer
+    versions of libvirt will include dom0 in the list of running domains
+    (with libxl). This special domain must be ignored.
+
+ -- Stefan Bader <[e-mail]>  Thu, 14 Jan 2016 11:35:39 +0100
+
+libvirt (1.2.21-2ubuntu7) xenial; urgency=medium
+
+  * d/apparmor/libvirt-qemu: silence denial to shm/lttng file since shm
+    mountpoint has moved (LP: #1529319)
+
+ -- Serge Hallyn <[e-mail]>  Mon, 11 Jan 2016 11:55:28 -0800
+
+libvirt (1.2.21-2ubuntu6) xenial; urgency=medium
+
+  * d/apparmor/libvirt-qemu: add r access to max_mem_regions vhost module
+    paramater (LP: #1531564)
+
+ -- Serge Hallyn <[e-mail]>  Mon, 11 Jan 2016 11:33:02 -0800
+
+libvirt (1.2.21-2ubuntu5) xenial; urgency=medium
+
+  * SECURITY UPDATE: ACL bypass using storage pool directory traversal
+    - debian/patches/CVE-2015-5313.patch: filter filesystem volume names in
+      src/storage/storage_backend_fs.c.
+    - CVE-2015-5313
+
+ -- Marc Deslauriers <[e-mail]>  Fri, 08 Jan 2016 10:32:17 -0500
+
+libvirt (1.2.21-2ubuntu4) xenial; urgency=medium
+
+  * Revert Ubuntu-specific patch to build-depend on libsystemd-daemon-dev
+    instead of libsystemd-dev; libsystemd-daemon-dev is no longer built from
+    systemd source so we want libsystemd-dev.
+
+ -- Colin Watson <[e-mail]>  Tue, 29 Dec 2015 00:31:16 +0000
+
+libvirt (1.2.21-2ubuntu3) xenial; urgency=medium
+
+  * Fix build-test autopkgtest: it now expects to run with the current
+    directory set to the root of the unpacked source package, writes to
+    $ADTTMP rather than to the source package, and declares dependencies on
+    build-essential and pkg-config.
+
+ -- Colin Watson <[e-mail]>  Mon, 28 Dec 2015 05:25:54 +0000
+
+libvirt (1.2.21-2ubuntu2) xenial; urgency=medium
+
+  * d/apparmor/libvirt-qemu: add permission to the systemd-mounted hugepages
+    path.  (LP: #1524737)
+
+ -- Serge Hallyn <[e-mail]>  Thu, 17 Dec 2015 10:49:18 -0800
+
+libvirt (1.2.21-2ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/apparmor/{libvirt-lxc,libvirt-qemu,local-usr.sbin.libvirtd,
+      TEMPLATE.lxc,TEMPLATE.qemu,usr.lib.libvirt.virt-aa-helper,
+      usr.sbin.libvirtd} Add apparmor profiles.
+    - debian/bug-presubj: removed
+    - debian/control:
+      - add cdbs, dh-autoreconf, libcurl4-gnutls-dev
+      - add libxml-libxml-perl, libhal-dev
+      - swap open-iscsi to open-iscsi-utils
+      - Enable numa support on ppc64el.
+      - remove libsanlock-dev, libselinux1-dev
+      - use libsystemd-daemon-dev instead of libsystemd-dev
+      - remove systemtap-sdt-dev, python, sheepdog, librados-dev, libfuse-dev
+      - remove libssh2-1, augeas-tools
+      - add libcgmanager-dev, xsltproc
+      - remove Vcs-Git
+      - adjust X-Python-Version > 2.7
+      - don't build libvirt-clients, libvirt-daemon, libvirt-sanlock packages
+    - keep debian/{libvirt-bin.apport,libvirt-bin.cron.daily}
+    - debian/libvirt-daemon.* has been mostly renamed to debian/libvirt-bin.*
+    - add upstart script for libvirt-bin
+    - debian/*.{links,maintscript} files not added
+    - keep ubuntu maintscript modifications
+    - debian/libvirt-sanlock* not merged
+    - debian/libvirt-clients* not merged
+    - keep debian/{libvirt-migrate-qemu-disks.*,
+      libvirt-migrate-qemu-machinetype.*,
+      libvirt-migrate-xend-managed-domains.*}
+    - keep debian/libvirt-suspendonreboot
+    - keep debian/libvirt-uri.sh
+    - debian/polkit/* not added
+    - debian/README.Debian:
+      - add 'Apparmor Profile' section
+      - add 'Disk migration' section
+    - debian/rules:
+      - add cdbs and autoconf stuff
+      - don't build WITH_SANLOCK, WITH_INIT_SCRIPT, WITH_SYSTEMD, WITH_FIREWALLD
+        WITH_SELINUX
+      - use qemu-group kvm instead of libvirt-qemu
+      - set DEB_DH_INSTALLINIT_ARGS to '--upstart-only'
+      - remove auto_test section
+      - add build/libvirt-bin:: section to install
+        - apparmor files
+        - apport hooks
+        - libvirt-migrate-qemu-disks
+      - use clean:: instead of dh_*clean
+    - Move ubuntu specific patches to 'debian/patches/ubuntu'
+  * Dropped patches:
+    - drop 9033-apparmor-use-TEMPLATE.qemu-for-kvm.patch (upstream 16d2bc8b)
+    - drop 9036-util-prepare-uri-for-libxml2-2.9.2.patch (upstream 8f17d0ea)
+    - drop 9040-virt-aa-helper-add-unix-channels (upstream 03d7462d)
+    - drop CVE-2014-3633.patch (upstream 3e745e8f)
+    - drop CVE-2014-3657.patch (upstream fc22b2e7)
+    - drop CVE-2014-7823.patch (upstream b1674ad5)
+    - drop Don-t-fail-if-we-can-t-setup-avahi.patch (dropped in debian)
+    - drop add-ppc64le-support.patch (upstream 9265fd19, addce06c, 1e911742,
+      bdbe723f, 5e4f49ab)
+    - drop blockdev-migration patches (upstream 1049a8d8, 9c5efd1a, cb7297c1,
+      a5250449, e9ef8565, 952907f5, 5eb03b6e, 93a19e28, a4e92f9e, de0aeafe)
+    - storage-allow-zero-capacity-with-non-backing-file-to.patch,
+      tests-add-vol-qcow2-zerocapacity-test-to-storagevolx.patch
+      (upstream 0bcda653, b8cc0cc5)
+    - ubuntu/fix-ubuntu-xen-qemu-dm-path.patch dropped in favor of
+      Allow-xen-toolstack-to-find-it-s-binaries.patch
+    - drop ubuntu-libxl-Implement-basic-video-device-selection.patch
+      (upstream 1298daca)
+    - remove dont-include-non-migrateable-features-in-host-model
+      (upstream and not included in series)
+    - remove upstream-libxl-Allow-libxl-to-find-pygrub-binary.patch
+      (upstream and not included in series)
+
+ -- Chris J Arges <[e-mail]>  Wed, 02 Dec 2015 12:06:09 -0600
+
+>>>>>>> debian/changelog
 libvirt (1.2.21-2) unstable; urgency=medium
 
   * [014a0c7] Add a build test to verify that the we can link against libvirt
@@ -859,6 +2938,166 @@ libvirt (1.2.18-1) experimental; urgency=medium
 
  -- Guido Günther <[e-mail]>  Tue, 11 Aug 2015 21:19:43 +0200
 
+<<<<<<< debian/changelog
+=======
+libvirt (1.2.16-2ubuntu14) xenial; urgency=medium
+
+  * debian/apparmor/libvirt-qemu: add a bunch of newly available qemu-*
+    architecture binaries. (LP: #1519030)
+
+ -- Dimitri John Ledkov <[e-mail]>  Mon, 23 Nov 2015 17:42:52 +0000
+
+libvirt (1.2.16-2ubuntu13) xenial; urgency=medium
+
+  * debian/control: switch ebtables from Recommends to Depends or default
+    configuration network doesn't get created. (LP: #1505576)
+
+ -- Marc Deslauriers <[e-mail]>  Thu, 05 Nov 2015 15:14:04 -0600
+
+libvirt (1.2.16-2ubuntu12) xenial; urgency=medium
+
+  * virt-aa-helper apparmor policy:  add 'network inet6' (LP: #1511830)
+
+ -- Serge Hallyn <[e-mail]>  Mon, 02 Nov 2015 11:49:56 -0600
+
+libvirt (1.2.16-2ubuntu11) wily; urgency=medium
+
+  * Fix the preinst and postinst: the check for whether libvirt-bin was
+    running was wrong for upstart systems, but we don't need to do that
+    anyway - just stop libvirt-bin unconditionally.  (LP: #1499199)
+  * libvirt-guests.service: fix libvirtd.service -> libvirt-bin.service
+
+ -- Serge Hallyn <[e-mail]>  Sun, 27 Sep 2015 15:47:08 +0000
+
+libvirt (1.2.16-2ubuntu10) wily; urgency=medium
+
+  * Add qemu-block-extra libraries to libvirt apparmor profile (LP: #1495895)
+
+ -- Ryan Harper <[e-mail]>  Wed, 16 Sep 2015 13:20:48 -0500
+
+libvirt (1.2.16-2ubuntu9) wily; urgency=medium
+
+  * Add upstream patches implementing a '--migrate-disks' option to virsh
+    migrate to specify block devices to migrate.  (LP: #1398999)
+
+ -- Serge Hallyn <[e-mail]>  Fri, 04 Sep 2015 09:29:52 -0500
+
+libvirt (1.2.16-2ubuntu8) wily; urgency=medium
+
+  * Support OVMF images in virt-aa-helper.  (LP: #1483071)
+  * Fix the libvirt-bin.preinst to not stop libvirt-bin on upgrade
+    from 1.2.16-2ubuntu7.
+
+ -- Serge Hallyn <[e-mail]>  Fri, 14 Aug 2015 07:34:30 -0500
+
+libvirt (1.2.16-2ubuntu7) wily; urgency=medium
+
+  * Stop libvirt-bin at pre-inst if upgrading from a non-systemd version,
+    restart at postinst.  (This can be removed after 16.04 release)
+  * Commonize stopping of vms in upstart/systemd.
+
+ -- Serge Hallyn <[e-mail]>  Tue, 11 Aug 2015 17:40:36 -0500
+
+libvirt (1.2.16-2ubuntu6) wily; urgency=medium
+
+  * Add systemd units and libvirt-stop-guests script to stop VMs before
+    a host completes shutdown  (LP: #1480440)
+
+ -- Serge Hallyn <[e-mail]>  Tue, 11 Aug 2015 15:42:29 -0500
+
+libvirt (1.2.16-2ubuntu5) wily; urgency=medium
+
+  * debian/control changes:
+    - Replace module-init-tools with kmod
+  * debian/tests:
+    - add autopkgtests from Debian
+
+ -- Chris J Arges <[e-mail]>  Fri, 10 Jul 2015 14:15:48 -0500
+
+libvirt (1.2.16-2ubuntu4) wily; urgency=medium
+
+  * d/p/{storage-allow-zero-capacity-with-non-backing-file-to.patch,
+    tests-add-vol-qcow2-zerocapacity-test-to-storagevolx.patch} added to address
+    (LP: #1459748). Allow zero capacity storage creation with non-backing file.
+
+ -- Chris J Arges <[e-mail]>  Fri, 10 Jul 2015 12:50:50 -0500
+
+libvirt (1.2.16-2ubuntu3) wily; urgency=medium
+
+  * debian/apparmor/libvirt-qemu:
+    allow serial console backed by pts chardev (LP: #1342083) 
+
+ -- Chris J Arges <[e-mail]>  Tue, 07 Jul 2015 16:38:17 -0500
+
+libvirt (1.2.16-2ubuntu2) wily; urgency=low
+
+  [ Chris J Arges ]
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/apparmor/{libvirt-lxc,libvirt-qemu,local-usr.sbin.libvirtd,
+      TEMPLATE.lxc,TEMPLATE.qemu,usr.lib.libvirt.virt-aa-helper,
+      usr.sbin.libvirtd} Add apparmor profiles.
+    - debian/bug-presubj: removed
+    - debian/control:
+      - add cdbs, dh-autoreconf, libcurl4-gnutls-dev
+      - add libxml-libxml-perl, libhal-dev
+      - swap open-iscsi to open-iscsi-utils
+      - Enable numa support on ppc64 and ppc64el.
+      - remove libsanlock-dev, libselinux1-dev, libsystemd-daemon-dev
+      - remove systemtap-sdt-dev, python, sheepdog, librados-dev, libfuse-dev
+      - remove libssh2-1, augeas-tools
+      - add libcgmanager-dev, xsltproc
+      - remove Vcs-Git
+      - adjust X-Python-Version > 2.7
+      - don't build libvirt-clients, libvirt-daemon, libvirt-sanlock packages
+    * keep debian/{libvirt-bin.apport,libvirt-bin.cron.daily}
+    * debian/libvirt-daemon.* has been mostly renamed to debian/libvirt-bin.*
+    * add upstart script for libvirt-bin
+    * debian/*.links files not added
+    * debian/libvirt-sanlock* not merged
+    * debian/libvirt-clients* not merged
+    * debian smoke tests not merged
+    * keep debian/{libvirt-migrate-qemu-disks.*,
+      libvirt-migrate-qemu-machinetype.*,
+      libvirt-migrate-xend-managed-domains.*}
+    * keep debian/libvirt-suspendonreboot
+    * keep debian/libvirt-uri.sh
+    * Don't apply the following patches:
+      - d/p/Debianize-libvirt-guests.patch
+      - d/p/Debianize-systemd-service-files.patch
+      - d/p/debian/Debianize-virtlockd.patch
+      - d/p/fix-Debian-specific-path-to-hvm-loader.patch
+      - d/p/Disable-gnulib-s-test-nonplocking-pipe.sh.patch
+      - d/p/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
+    * debian/polkit/* not added
+    * debian/README.Debian:
+      - add 'Apparmor Profile' section
+      - add 'Disk migration' section
+    * debian/rules:
+      - add cdbs and autoconf stuff
+      - don't build WITH_SANLOCK, WITH_INIT_SCRIPT, WITH_SYSTEMD, WITH_FIREWALLD
+        WITH_SELINUX
+      - use qemu-group kvm instead of libvirt-qemu
+      - set DEB_DH_INSTALLINIT_ARGS to '--upstart-only'
+      - remove auto_test section
+      - add build/libvirt-bin:: section to install
+        - apparmor files
+        - apport hooks
+        - libvirt-migrate-qemu-disks
+      - use clean:: instead of dh_*clean
+
+  [ Chuck Short ]
+    + Rediffed:                                                                 
+     - debian/patches/storage-default-permission-mode-to-0711
+     - debian/patches/ubuntu_machine_type.patch
+  * debian/libvirt-bin.init: Adjust avahi to avahi-daemon (LP: #1453572)
+
+  [ Serge Hallyn ]
+  * 9040-virt-aa-helper-add-unix-channels.patch: add support for unix
+    sockets for serials.  (LP: #1015154)
+
+ -- Chris J Arges <[e-mail]>  Wed, 01 Jul 2015 13:33:40 -0500
+
+>>>>>>> debian/changelog
 libvirt (1.2.16-2) unstable; urgency=medium
 
   * [0266267] Build-Depend and suggest nfs-common
@@ -924,6 +3163,52 @@ libvirt (1.2.15-1) experimental; urgency=medium
 
  -- Guido Günther <[e-mail]>  Tue, 05 May 2015 19:26:21 +0200
 
+<<<<<<< debian/changelog
+=======
+libvirt (1.2.15-0ubuntu4) wily; urgency=medium
+
+  * Add post-start to upstart (/etc/init/libvirt-bin.conf) and
+    sysv (/etc/init.d/libvirt-bin) jobs to ensure libvirt-sock
+    created before up (LP: #1455608)
+
+ -- Edward Hope-Morley <[e-mail]>  Thu, 28 May 2015 16:06:44 +0100
+
+libvirt (1.2.15-0ubuntu3) wily; urgency=low
+
+  * d/p/ubuntu-libxl-qemu-path.patch: Set correct path for qemu binary
+    for new configs and convert old configs using qemu-dm.
+    (LP: #1459600)
+  * d/p/ubuntu-libxl-hvmloader-path.patch: Get Xen version from dpkg-query
+    at compile time and set LIBXL_FIRMWARE_DIR as long as libxen-dev does
+    not provide a xenlight.pc file. Use that directory to update existing
+    configs.
+    (LP: #1459603)
+
+ -- Stefan Bader <[e-mail]>  Thu, 28 May 2015 12:21:23 +0200
+
+libvirt (1.2.15-0ubuntu2) wily; urgency=medium
+
+  * debian/apparmor/libvirt-qemu: add /sys read accesses needed by newer
+    qemu: /sys/devices/system/node/, /sys/devices/system/cpu/ and
+    /sys/devices/system/node/node[0-9]*/meminfo
+
+ -- Jamie Strandboge <[e-mail]>  Wed, 13 May 2015 16:41:54 -0500
+
+libvirt (1.2.15-0ubuntu1) wily; urgency=medium
+
+  * New upstream release:
+    + Dropped patches:
+      - d/p/add-cgmanager-support.patch
+      - d/p/cgmanager-mutex
+      - d/p/cgm-ignore-machined-failure
+      - d/p/9020-lp545795.patch
+      - d/pa/ubuntu-libxl-qemu-nopath.patch
+      - d/p/ubuntu-libxl-migrate-dm.patch
+      - d/p9037-virt-aa-helper-add-unix-channels-esp-for-qemu-guest-.patch
+
+ -- Chuck Short <[e-mail]>  Thu, 07 May 2015 10:27:49 -0400
+
+>>>>>>> debian/changelog
 libvirt (1.2.15~rc2-1) experimental; urgency=medium
 
   * [852e3c3] New upstream version 1.2.15~rc2
@@ -982,6 +3267,113 @@ libvirt (1.2.12-1) experimental; urgency=medium
 
  -- Guido Günther <[e-mail]>  Thu, 29 Jan 2015 11:02:21 +0100
 
+<<<<<<< debian/changelog
+=======
+libvirt (1.2.12-0ubuntu12) vivid; urgency=low
+
+  * Add profile script to automatically set the default URI based on
+    the currently running hyperisor (Xen or KVM/Qemu).
+    (LP: #1334749)
+
+ -- Stefan Bader <[e-mail]>  Tue, 14 Apr 2015 09:02:52 -0500
+
+libvirt (1.2.12-0ubuntu11) vivid; urgency=medium
+
+  * create /var/lib/libvirt/qemu/channel/target (LP: #1393842)
+    - libvirt-bin.dirs: add /var/lib/libvirt/qemu/channel/target
+    - libvirt-bin.postinst: chown target directory to libvirt-qemu:kvm so
+      qemu can create the unix sockets.
+
+ -- Serge Hallyn <[e-mail]>  Thu, 09 Apr 2015 10:40:05 -0500
+
+libvirt (1.2.12-0ubuntu10) vivid; urgency=medium
+
+  * Fix previous patch to ignore any abstract unix domain sockets
+  * Update the cgmanager patch so that container start and stop work under
+    systemd.  (LP: #1438730)  In 15.10 we will drop the cgmanager patch(es).
+
+ -- Serge Hallyn <[e-mail]>  Wed, 08 Apr 2015 10:58:04 -0500
+
+libvirt (1.2.12-0ubuntu9) vivid; urgency=medium
+
+  * 9037-virt-aa-helper-add-unix-channels-esp-for-qemu-guest-.patch: Allow
+    libvirt domains to start when using qemu guest agent.  (LP: #1393842)
+
+ -- Serge Hallyn <[e-mail]>  Mon, 06 Apr 2015 11:14:03 -0500
+
+libvirt (1.2.12-0ubuntu8) vivid; urgency=medium
+
+  * silence denial of attempted reads of lttng files (LP: #1432644)
+
+ -- Serge Hallyn <[e-mail]>  Fri, 27 Mar 2015 21:36:27 -0500
+
+libvirt (1.2.12-0ubuntu7) vivid; urgency=low
+
+  * No-change rebuild to pull in libxen-dev 4.5
+
+ -- Stefan Bader <[e-mail]>  Wed, 25 Feb 2015 18:31:16 +0100
+
+libvirt (1.2.12-0ubuntu6) vivid; urgency=low
+
+  * Fix xml validation for Xen by allowing non-absolute path values
+    in loader and bootloader elements (LP: #1425497).
+  * Fix up Xen emulator in old configurations and for new definitions to
+    point to /usr/bin/qemu-system-i386 (LP: #1425497).
+
+ -- Stefan Bader <[e-mail]>  Fri, 13 Feb 2015 17:57:27 +0100
+
+libvirt (1.2.12-0ubuntu5) vivid; urgency=medium
+
+  * Remove smoser-ppc64le-is-ppc64.patch - the problem will be solved by the
+    qemu-system-ppcle symlink in qemu-system-ppc package.
+
+ -- Serge Hallyn <[e-mail]>  Thu, 12 Feb 2015 15:38:39 -0600
+
+libvirt (1.2.12-0ubuntu4) vivid; urgency=medium
+
+  * libvirt-qemu: allow kvm script on ppc to execute uname
+
+ -- Serge Hallyn <[e-mail]>  Thu, 12 Feb 2015 14:05:14 -0600
+
+libvirt (1.2.12-0ubuntu3) vivid; urgency=medium
+
+  * Apply patch from smoser to make libvirt on ppc64le functional.
+    (LP: #1418221)
+
+ -- Serge Hallyn <[e-mail]>  Mon, 09 Feb 2015 12:09:49 -0600
+
+libvirt (1.2.12-0ubuntu2) vivid; urgency=medium
+
+  * debian/control: Use libxml-libxml-perl instead of libxml-xpath-perl. 
+  * debian/patches/docs-remove-xpath.patch: Use libxml instead of XPath.
+
+ -- Chuck Short <[e-mail]>  Fri, 06 Feb 2015 11:28:15 -0500
+
+libvirt (1.2.12-0ubuntu1) vivid; urgency=medium
+
+  * New upstream release
+  * Rediffed patches:
+    - debian/patches/9030-create-socket-dir
+    - debian/patches/add-cgmanager-support.patch
+    - debian/patches/cgroups-ignore-systemd-failure
+  * Dropped patches:
+    - debian/patches/ubuntu-libxl-Implement-basic-video-device-selection.patch
+    - debian/patches/ubuntu-libxl-Fix-up-VRAM-to-minimum-requirements.patch
+    - debian/patches/9033-apparmor-use-TEMPLATE.qemu-for-kvm.patch
+    - debian/patches/-CVE-2014-3633.patch
+    - debian/patches/dont-include-non-migrateable-features-in-host-model
+    - debian/patches/9036-util-prepare-uri-for-libxml2-2.9.2.patch
+    - debian/patches/CVE-2014-3657.patch
+    - debian/patches/CVE-2014-7823.patch
+    - debian/patches/add-ppc64le-support.patch
+    - debian/patches/upstream-libxl-Allow-libxl-to-find-pygrub-binary.patch
+  * debian/control: Add libxml-xpath-perl and xsltproc to dependencies
+  * debian/patches/skip-vircgrouptest.patch: Skip cgroup tests.
+  * debian/patches/disable-network-test.patch: Skip network tests
+
+ -- Chuck Short <[e-mail]>  Tue, 03 Feb 2015 13:12:36 -0500
+
+>>>>>>> debian/changelog
 libvirt (1.2.12~rc2-1) experimental; urgency=medium
 
   * [67f2b22] New upstream version 1.2.12~rc2
@@ -1223,6 +3615,7 @@ libvirt (1.2.8-1) experimental; urgency=medium
 
  -- Guido Günther <[e-mail]>  Fri, 05 Sep 2014 19:56:50 +0200
 
+<<<<<<< debian/changelog
 libvirt (1.2.7-11) unstable; urgency=medium
 
   * [6534478] Check status in a systemd 208 compatible way
@@ -1272,75 +3665,332 @@ libvirt (1.2.7-7) unstable; urgency=medium
     (Closes: #757952)
 
  -- Guido Günther <[e-mail]>  Wed, 13 Aug 2014 21:50:07 +0200
+=======
+libvirt (1.2.8-0ubuntu21) vivid; urgency=medium
 
-libvirt (1.2.7-6) unstable; urgency=medium
+  * d/apparmor/libvirt-qemu: Update the ceph.conf allow rule (LP: #1403648)
 
-  * [5e39138] Don't provide libvirt-bin via LSB headers.
-    This avoids a conflict when /e/i/libvirt-bin and /e/i/libvirtd
-    are around at the same time during dpkg's configure phase and
-    both init scripts Provide: libvirt-bin.
-    (Closes: #757330)
+ -- Serge Hallyn <[e-mail]>  Fri, 30 Jan 2015 10:02:20 +0100
 
- -- Guido Günther <[e-mail]>  Fri, 08 Aug 2014 17:58:36 +0200
+libvirt (1.2.8-0ubuntu20) vivid; urgency=medium
 
-libvirt (1.2.7-5) unstable; urgency=medium
+  * debian/rules:
+    - use --with-esx (LP: #565771)
+    - specify restart-after-upgrade (LP: #1215617)
+  * debian/control: add libcurl4-gnutls-dev for esx support
 
-  * [06d457c] Bump comparison version so this applies to current failed
-    upgrades too.
-  * [bdae16d] Remove another obsolete conffile (Closes: #757332)
-  * [2f486c5] Don't try to stop libvirt-bin if it's already gone
-    (Closes: #757407)
-  * [a9643a0] Remove another obsolete conffile (Closes: #757332)
+ -- Serge Hallyn <[e-mail]>  Wed, 21 Jan 2015 13:01:59 -0600
 
- -- Guido Günther <[e-mail]>  Thu, 07 Aug 2014 23:21:39 +0200
+libvirt (1.2.8-0ubuntu19) vivid; urgency=medium
 
-libvirt (1.2.7-4) unstable; urgency=medium
+  * apparmor libvirt-qemu template: allow reading charm-specific ceph config
+    and silence denials for /tmp/**.  (LP: #1403648)
 
-  * [5e71896] Move networking configuration to libvirt-daemon-system too
-  * [32eea48] Remove left over empty directory
-  * [b3a2735] Also purge libvirt-bin.service on new installations.
-    The old service file was in libvirt-bin so we need to remove it when
-    libvirt-daemon-service is first installed (as we did before when
-    the whole code was in the postinst).
-    Thanks to Laurent Bigonville for the analysis (Closes: #757293)
+ -- Serge Hallyn <[e-mail]>  Tue, 06 Jan 2015 10:27:33 -0600
 
- -- Guido Günther <[e-mail]>  Thu, 07 Aug 2014 10:57:53 +0200
+libvirt (1.2.8-0ubuntu18) vivid; urgency=medium
 
-libvirt (1.2.7-3) unstable; urgency=medium
+  * mutex cgmanager actions (Thanks to Don Bowman for finding the cause)
+    (LP: #1397130) (LP: #1367702)
 
-  * Upload to unstable
-  * [f634d53] Don't try to install qemu configuration on kFreeBSD.
-    QEMU support on kFreeBSD support is currently disabled due to test
-    failures.
+ -- Serge Hallyn <[e-mail]>  Thu, 18 Dec 2014 13:28:03 -0600
 
- -- Guido Günther <[e-mail]>  Wed, 06 Aug 2014 20:28:05 +0200
+libvirt (1.2.8-0ubuntu17) vivid; urgency=low
 
-libvirt (1.2.7-2) experimental; urgency=medium
+  * d/p/upstream-libxl-Allow-libxl-to-find-pygrub-binary.patch:
+    Allow libxl to figure out the path to pygrub. (LP: #1396942)
 
-  * [ebfec9b] Don't try to install lxc.conf on kFreeBSD.
-    Another kFreeBSD build fix
+ -- Stefan Bader <[e-mail]>  Thu, 11 Dec 2014 09:51:20 +0100
 
- -- Guido Günther <[e-mail]>  Mon, 04 Aug 2014 14:10:57 +0200
+libvirt (1.2.8-0ubuntu16) vivid; urgency=medium
 
-libvirt (1.2.7-1) experimental; urgency=medium
+  * debian/patches/add-ppc64le-support.patch: Added patches needed
+    for ppc64le support. (LP: #1396070) 
 
-  * [65e69d3] New upstream version 1.2.7
-  * [d615910] Don't try to install virt-login-shell on non-linux.
-    It's LXC only. This fixes the build failure on kFreeBSD.
+ -- Chuck Short <[e-mail]>  Thu, 27 Nov 2014 08:57:35 -0500
 
- -- Guido Günther <[e-mail]>  Sun, 03 Aug 2014 19:20:26 +0200
+libvirt (1.2.8-0ubuntu15) vivid; urgency=medium
 
-libvirt (1.2.7~rc2-1) experimental; urgency=medium
+  * libvirt-qemu: add r to sgabios.bin (LP: #1393548)
 
-  [ Guido Günther ]
-  * [16575d9] New upstream version 1.2.7~rc2
-  * [bc785a7] Drop left over libvirt-bin references.
-    Fixes more leftovers of #730604.
-  * [ca64c62] Rediff patches
-  * [998e7d4] Update symbols file
-  * [06cf7b4] Make sure libvirt-bin versioned dependencies are recent enough
+ -- Serge Hallyn <[e-mail]>  Mon, 17 Nov 2014 15:05:22 -0600
 
-  [ Laurent Bigonville ]
+libvirt (1.2.8-0ubuntu14) vivid; urgency=medium
+
+  [ Serge Hallyn ]
+  * 9036-util-prepare-uri-for-libxml2-2.9.2.patch: fix FTBFS against new
+    libxml 2.9.2 (LP: #1390637)
+
+  [ Marc Deslauriers ]
+  * SECURITY UPDATE: denial of service via virConnectListAllDomains
+    - debian/patches/CVE-2014-3657.patch: fix domain deadlock in
+      src/conf/domain_conf.c.
+    - CVE-2014-3657
+  * SECURITY UPDATE: xml information leak with read-only connections
+    - debian/patches/CVE-2014-7823.patch: check for migratable flag in
+      src/libvirt.c, src/remote/remote_protocol.x.
+    - CVE-2014-7823
+
+ -- Marc Deslauriers <[e-mail]>  Tue, 11 Nov 2014 13:14:00 -0500
+
+libvirt (1.2.8-0ubuntu13) vivid; urgency=medium
+
+  * cull too-new apparmor rules depending on target host (LP: #1387251)
+  * add mising apparmor permissions for slof (LP: #1374554)
+
+ -- Serge Hallyn <[e-mail]>  Fri, 07 Nov 2014 20:32:23 +0000
+
+libvirt (1.2.8-0ubuntu12) vivid; urgency=medium
+
+  * complete the 9p support: (LP: #1378434)
+    - libvirt-qemu: add fowner and fsetid
+    - virt-aa-helper: add 'l' to 9p file options
+  * dont-include-non-migrateable-features-in-host-model (LP: #1386503)
+
+ -- Serge Hallyn <[e-mail]>  Wed, 29 Oct 2014 15:07:21 -0500
+
+libvirt (1.2.8-0ubuntu11) utopic; urgency=medium
+
+  [ Felix Geyer ] 
+  * d/p/ubuntu_machine_type.patch: Fix No PCI buses available. (LP: #1379346).
+
+ -- Chris J Arges <[e-mail]>  Thu, 09 Oct 2014 08:57:27 -0500
+
+libvirt (1.2.8-0ubuntu10) utopic; urgency=medium
+
+  * libvirt-bin.upstart: delay start until rc finished
+    This give hypervisors more time to finish their setup (LP: #1377900).
+  * libvirt-bin.upstart: add xen:/// uri to the list (LP: #1377960)
+
+ -- Stefan Bader <[e-mail]>  Mon, 06 Oct 2014 16:23:06 +0200
+
+libvirt (1.2.8-0ubuntu9) utopic; urgency=medium
+
+  * libvirt-qemu apparmor template: add /sys/firmware/devicetree/** r
+    (LP: #1374554)
+
+ -- Serge Hallyn <[e-mail]>  Wed, 01 Oct 2014 17:09:05 -0500
+
+libvirt (1.2.8-0ubuntu8) utopic; urgency=medium
+
+  * libvirt-bin.postinst: fix syntax error (s/if/fi/)
+
+ -- Serge Hallyn <[e-mail]>  Tue, 30 Sep 2014 13:07:19 -0500
+
+libvirt (1.2.8-0ubuntu7) utopic; urgency=medium
+
+  * libvirt-bin.postinst: check for confiles whichhave been removed rather
+    than fail package install (LP: #1375910)
+
+ -- Serge Hallyn <[e-mail]>  Tue, 30 Sep 2014 12:37:16 -0500
+
+libvirt (1.2.8-0ubuntu6) utopic; urgency=medium
+
+  * SECURITY UPDATE: denial of service or information disclosure via
+    virDomainGetBlockIoTune
+    - debian/patches/CVE-2014-3633.patch: use correct definition when
+      looking up disk in src/qemu/qemu_driver.c.
+    - CVE-2014-3633
+
+ -- Marc Deslauriers <[e-mail]>  Mon, 29 Sep 2014 15:23:37 -0400
+
+libvirt (1.2.8-0ubuntu5) utopic; urgency=medium
+
+  * debian/apparmor/libvirt-lxc (sync with container-base with lxc):
+    - remove bare 'signal' and 'ptrace' rules (base abstraction covers most
+      of what we need)
+    - allow signal (receive) peer=/usr/sbin/libvirtd
+    - allow ptrace peer=@{profile_name}
+    - deny mount options=(ro, remount, silent) -> /
+    - allow mount fstype=hugetlbfs
+    - shuffle a couple of rules around to make it easier to diff with lxc
+      policy
+  * debian/apparmor/TEMPLATE.lxc (sync with lxc-default):
+    - use attach_disconnected and mediate_deleted
+    - deny mount fstype=devpts,
+
+ -- Jamie Strandboge <[e-mail]>  Thu, 25 Sep 2014 16:24:21 -0500
+
+libvirt (1.2.8-0ubuntu4) utopic; urgency=medium
+
+  * debian/apparmor/usr.sbin.libvirtd: allow 'network netlink'
+
+ -- Jamie Strandboge <[e-mail]>  Thu, 18 Sep 2014 15:15:13 -0500
+
+libvirt (1.2.8-0ubuntu3) utopic; urgency=medium
+
+  * 9033-apparmor-use-TEMPLATE.qemu-for-kvm.patch - fix failure to start
+    KVM vms.
+
+ -- Serge Hallyn <[e-mail]>  Thu, 18 Sep 2014 14:08:04 -0500
+
+libvirt (1.2.8-0ubuntu2) utopic; urgency=low
+
+  * d/p/ubuntu-xend-probe.patch:
+    Update patch correctly and re-enable it. It seems like it only was
+    half updated and then disabled without reasons.
+  * d/p/ubuntu-libxl-Implement-basic-video-device-selection.patch:
+    Re-activate adapted patch. Some pieces made it into upstream as a
+    bug fix. The rest is still needed to allow selecing an alternate
+    graphics device for Xen HVM guests.
+  * d/p/ubuntu-libxl-Fix-up-VRAM-to-minimum-requirements.patch:
+    Re-activate unchanged patch (for some reason dropped when moving
+    to 1.2.6).
+    This one is a bit of a work-around mainly for virt-manager which sets
+    gfx memory to values below the minimum requirement for Xen. And the
+    UI does not allow to change that. This patch just goes for the minimum
+    in that case.
+
+ -- Stefan Bader <[e-mail]>  Thu, 18 Sep 2014 10:00:36 +0200
+
+libvirt (1.2.8-0ubuntu1) utopic; urgency=medium
+
+  [ Chuck Short ]
+  * New upstream release:  (LP: #1367422)
+    + Dropped:
+      - debian/patches/ovs-delete-port-if-exists-while-adding-new-one
+    + Refreshed:
+      - debian/patches/add-cgmanager-support.patch
+      - debian/patches/storage-default-permission-mode-to-0711
+
+  [ Serge Hallyn ]
+  * d/apparmor
+    - install TEMPLATE.qemu and TEMPLATE.lxc
+    - add libvirt-lxc abstraction, add permissions to it needed for
+      a ubuntu container to start.
+    - libvirt-qemu - add qemu-bridge-helper policy from upstream
+    - libvirt-qemu - add qemu-microblaze allows from upstream
+    - edit lxc.conf to enable apparmor by default  (LP: #914716)
+      (LP: #1008393) (LP: #1088295)
+  * d/apparmor/libvirt-qemu: add /dev/shm as path to spice.* nodes
+    for systemd case.  (LP: #1365163)
+  * d/p/9030-create-socket-dir - create session socket dir if
+    needed  (Should be replaced eventually by the upstream fix)
+  * d/p/9032-lxc-allow-no-security-driver: don't fail if apparmor
+    driver is not available (else the qa-regression-tests fail with
+    skip_apparmor)
+
+ -- Serge Hallyn <[e-mail]>  Mon, 15 Sep 2014 18:30:06 -0500
+
+libvirt (1.2.7-11) unstable; urgency=medium
+
+  * [6534478] Check status in a systemd 208 compatible way
+    systemd 204 returned 0 when trying to reload a not running service but
+    208 changed behaviour. So use status instead of is-enabled.
+    Thanks to Neutron Soutmun for his feedback (Closes: #758688)
+
+ -- Guido Günther <[e-mail]>  Sun, 24 Aug 2014 10:54:26 +0200
+
+libvirt (1.2.7-10) unstable; urgency=medium
+
+  * [d319f15] Only reexec virtlockd if enabled (Closes: #758688)
+
+ -- Guido Günther <[e-mail]>  Thu, 21 Aug 2014 16:34:36 +0200
+
+libvirt (1.2.7-9) unstable; urgency=medium
+
+  * [1c2c5ee] Don't let dh_systemd_start guess the package to act on
+    (Closes: #758552)
+  * [ab79901] Don't restart libvirt-guests when using systemd so it's
+    consistent with sysvinit. We'd restart VMs on package upgrads otherwise.
+
+ -- Guido Günther <[e-mail]>  Tue, 19 Aug 2014 09:59:47 +0200
+
+libvirt (1.2.7-8) unstable; urgency=medium
+
+  * [d98aa3b] Fix wrong relation in preinst.
+    Thanks to Laurent Bigonville (Closes: #758136)
+
+ -- Guido Günther <[e-mail]>  Thu, 14 Aug 2014 21:06:45 +0200
+
+libvirt (1.2.7-7) unstable; urgency=medium
+
+  * [42dbd16] Skip more linux specific stuff on kFreeBSD
+  * [a2ff23f] Don't restart virtlockd on upgrade virtlockd must be reloaded so
+    it reexecs itself. (Closes: #757453)
+  * [4914adc] Use symlinks for upstream changelog.  This safes 1.9M per
+    package
+  * [3583f4b] Don't fail qemu driver intialization if we can't determine
+    hugepage size.  Thanks to a lot to Jamie Heilman for testing it
+    (Closes: #757609)
+  * [3b23724] Make 'uri' command a bit more prominent. (Closes: #688778)
+  * [63e7e51] Also stop libvirt-bin in libvirt-bin's preinst.
+    When libvirt-daemon-system's preinst runs the new libvirt-bin might
+    already be unpacked and therefore the libvirt-bin service file already
+    gone. So additionally stop libvirt-bin in libvirt-bin's preinst.
+    (Closes: #757952)
+
+ -- Guido Günther <[e-mail]>  Wed, 13 Aug 2014 21:50:07 +0200
+>>>>>>> debian/changelog
+
+libvirt (1.2.7-6) unstable; urgency=medium
+
+  * [5e39138] Don't provide libvirt-bin via LSB headers.
+    This avoids a conflict when /e/i/libvirt-bin and /e/i/libvirtd
+    are around at the same time during dpkg's configure phase and
+    both init scripts Provide: libvirt-bin.
+    (Closes: #757330)
+
+ -- Guido Günther <[e-mail]>  Fri, 08 Aug 2014 17:58:36 +0200
+
+libvirt (1.2.7-5) unstable; urgency=medium
+
+  * [06d457c] Bump comparison version so this applies to current failed
+    upgrades too.
+  * [bdae16d] Remove another obsolete conffile (Closes: #757332)
+  * [2f486c5] Don't try to stop libvirt-bin if it's already gone
+    (Closes: #757407)
+  * [a9643a0] Remove another obsolete conffile (Closes: #757332)
+
+ -- Guido Günther <[e-mail]>  Thu, 07 Aug 2014 23:21:39 +0200
+
+libvirt (1.2.7-4) unstable; urgency=medium
+
+  * [5e71896] Move networking configuration to libvirt-daemon-system too
+  * [32eea48] Remove left over empty directory
+  * [b3a2735] Also purge libvirt-bin.service on new installations.
+    The old service file was in libvirt-bin so we need to remove it when
+    libvirt-daemon-service is first installed (as we did before when
+    the whole code was in the postinst).
+    Thanks to Laurent Bigonville for the analysis (Closes: #757293)
+
+ -- Guido Günther <[e-mail]>  Thu, 07 Aug 2014 10:57:53 +0200
+
+libvirt (1.2.7-3) unstable; urgency=medium
+
+  * Upload to unstable
+  * [f634d53] Don't try to install qemu configuration on kFreeBSD.
+    QEMU support on kFreeBSD support is currently disabled due to test
+    failures.
+
+ -- Guido Günther <[e-mail]>  Wed, 06 Aug 2014 20:28:05 +0200
+
+libvirt (1.2.7-2) experimental; urgency=medium
+
+  * [ebfec9b] Don't try to install lxc.conf on kFreeBSD.
+    Another kFreeBSD build fix
+
+ -- Guido Günther <[e-mail]>  Mon, 04 Aug 2014 14:10:57 +0200
+
+libvirt (1.2.7-1) experimental; urgency=medium
+
+  * [65e69d3] New upstream version 1.2.7
+  * [d615910] Don't try to install virt-login-shell on non-linux.
+    It's LXC only. This fixes the build failure on kFreeBSD.
+
+ -- Guido Günther <[e-mail]>  Sun, 03 Aug 2014 19:20:26 +0200
+
+libvirt (1.2.7~rc2-1) experimental; urgency=medium
+
+  [ Guido Günther ]
+  * [16575d9] New upstream version 1.2.7~rc2
+  * [bc785a7] Drop left over libvirt-bin references.
+    Fixes more leftovers of #730604.
+  * [ca64c62] Rediff patches
+  * [998e7d4] Update symbols file
+  * [06cf7b4] Make sure libvirt-bin versioned dependencies are recent enough
+
+  [ Laurent Bigonville ]
   * [daf46fe] Stop the daemon in the preinst script instead of the postinst
     one when renaming the .service file as it now contains the
    "Restart=on-failure" option and blindly killing the daemon is not working
@@ -1382,6 +4032,122 @@ libvirt (1.2.6-1) experimental; urgency=medium
 
  -- Guido Günther <[e-mail]>  Tue, 22 Jul 2014 22:33:51 +0200
 
+<<<<<<< debian/changelog
+=======
+libvirt (1.2.6-0ubuntu6) utopic; urgency=medium
+
+  * debian/apparmor/usr.sbin.libvirtd: update for abstract socket mediation
+    (LP: #1362199)
+  * debian/apparmor/libvirt-qemu: allow 'r' on @{PROC}/sys/kernel/cap_last_cap
+  * debian/control: Suggests apparmor >= 2.8.96~2541-0ubuntu4~
+
+ -- Jamie Strandboge <[e-mail]>  Fri, 05 Sep 2014 17:32:16 -0500
+
+libvirt (1.2.6-0ubuntu5) utopic; urgency=medium
+
+  * cgroups-ignore-systemd-failure - fix incoming migration failures when
+    systemd-shim is installed.
+  * ovs-delete-port-if-exists-while-adding-new-one - cherrypick commit 33445ce
+    from upstream (LP: #1343262)
+
+ -- Serge Hallyn <[e-mail]>  Fri, 08 Aug 2014 09:56:43 -0500
+
+libvirt (1.2.6-0ubuntu4) utopic; urgency=high
+
+  * No change rebuild against gnutls28.
+
+ -- Dimitri John Ledkov <[e-mail]>  Fri, 08 Aug 2014 13:28:03 +0100
+
+libvirt (1.2.6-0ubuntu3) utopic; urgency=medium
+
+  * debian/apparmor/usr.sbin.libvirtd - add cap-sys-resource to fully
+    fix (LP: #1276719)
+
+ -- Serge Hallyn <[e-mail]>  Thu, 07 Aug 2014 12:43:20 -0500
+
+libvirt (1.2.6-0ubuntu2) utopic; urgency=medium
+
+  * Rebuild against libparted2.
+
+ -- Colin Watson <[e-mail]>  Mon, 21 Jul 2014 21:27:18 +0100
+
+libvirt (1.2.6-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release:
+    + Dropped:
+     - debian/patches/virt-aa-helper-vhost.patch
+     - debian/patches/libxl-Implement-basic-video-device-selection.patch
+     - debian/patches/libxl-Fix-up-VRAM-to-minimum-requirements.patch
+    + debian/rules: Include packaging version in the log file. (LP: #1335221)
+
+ -- Chuck Short <[e-mail]>  Fri, 04 Jul 2014 08:40:24 -0400
+
+libvirt (1.2.5-0ubuntu6) utopic; urgency=low
+
+  * libxl: Refresh patch(es) to allow the choice between Cirrus and
+    VGA for Xen HVM guests.
+    - d/p/libxl-Implement-basic-video-device-selection.patch [v4]
+    - d/p/libxl-Fix-up-VRAM-to-minimum-requirements.patch
+
+ -- Stefan Bader <[e-mail]>  Mon, 30 Jun 2014 16:08:56 +0200
+
+libvirt (1.2.5-0ubuntu5) utopic; urgency=low
+
+  * debian/apparmor/usr.sbin.libvirtd: allow libvirtd to run
+    libxl-save-helper (required for save restore through libxl).
+    (LP: #1334195)
+
+ -- Stefan Bader <[e-mail]>  Thu, 26 Jun 2014 15:53:05 +0200
+
+libvirt (1.2.5-0ubuntu4) utopic; urgency=low
+
+  * debian/apparmor/usr.sbin.libvirtd: allow pygrub to be run
+    (LP: #1326003)
+
+ -- Stefan Bader <[e-mail]>  Wed, 18 Jun 2014 11:04:15 +0200
+
+libvirt (1.2.5-0ubuntu3) utopic; urgency=medium
+
+  * d/p/virt-aa-helper-vhost.patch: allow access to /dev/vhost-net if domain
+    needs it (LP: #1322568)
+
+ -- Serge Hallyn <[e-mail]>  Tue, 17 Jun 2014 22:01:49 -0500
+
+libvirt (1.2.5-0ubuntu2) utopic; urgency=medium
+
+  * implement cgmanager support (LP: #1322677)
+    - debian/control: build-dep on libcgmanager-dev, depend on cgmanager
+    - d/p/add-cgmanager-support.patch
+
+ -- Serge Hallyn <[e-mail]>  Tue, 17 Jun 2014 16:40:20 -0500
+
+libvirt (1.2.5-0ubuntu1) utopic; urgency=medium
+
+  [ Chuck Short ]
+  * New upstream version:
+    + Rediffed:
+      - d/p/ubuntu-xend-probe.patch
+    + Dropped:
+      - d/p/libxl-Check-for-control_d-string-to-decide-about-dom.patch
+      - d/p/libxl-do-not-use-virdomain-id.patch
+      - d/p/libxl-set-disk-format-for-cdrom.patch
+      - d/p/libxl-set-vfb0-data-in-build-config.patch
+      - d/p/libxl-support-sexpr-in-native-to-XML-conversion.patch
+      - d/p/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
+      - d/p/accomodate-new-qemu-migration-status-setup.patch
+      - d/p/9025-apparmor-allow-access-to-filesystem-mounts
+      - d/p/add-a-mutex-to-serialize-updates-to-fw.patch
+      - d/p/arm-cpu-baseline.patch
+    + debian/control: Add ebtables, iptables, and qemu-utils as a build dependency.
+
+  [ Serge Hallyn ]
+  * d/p/ubuntu-skip-virstoragetest: skip a test that hangs in buildds.
+  * d/apparmor/TEMPLATE: replace libvirt-qemu with libvirt-driver to match
+    upstream commit 43c030f.
+
+ -- Chuck Short <[e-mail]>  Mon, 02 Jun 2014 09:35:18 -0400
+
+>>>>>>> debian/changelog
 libvirt (1.2.4-3) unstable; urgency=medium
 
   * [b0b7359] Don't pretend kFreeBSD supports linux only features.  So far we
@@ -1460,6 +4226,150 @@ libvirt (1.2.3-1) experimental; urgency=medium
 
  -- Guido Günther <[e-mail]>  Mon, 07 Apr 2014 12:15:02 +0200
 
+<<<<<<< debian/changelog
+=======
+libvirt (1.2.2-0ubuntu13.2) utopic; urgency=medium
+
+  * debian/apparmor/libvirt-qemu: add device-tree access for ppc
+    (LP: #1321365)
+
+ -- Serge Hallyn <[e-mail]>  Thu, 05 Jun 2014 12:06:17 -0500
+
+libvirt (1.2.2-0ubuntu13.1) trusty-proposed; urgency=medium
+
+  * debian/control: change apparmor dependency into an inverse conflicts,
+    so that libvirt can continue to be used without apparmor.  (LP: #1304167)
+
+ -- Serge Hallyn <[e-mail]>  Thu, 17 Apr 2014 10:42:08 -0500
+
+libvirt (1.2.2-0ubuntu13) trusty; urgency=medium
+
+  * Add a dependency on the new apparmor to make sure we have the new
+    parser around before we attempt to load a profile requiring the new
+    stanza support. (LP: #1304167)
+
+ -- Serge Hallyn <[e-mail]>  Mon, 14 Apr 2014 11:03:37 -0500
+
+libvirt (1.2.2-0ubuntu12) trusty; urgency=low
+
+  * d/p/libxl-support-sexpr-in-native-to-XML-conversion.patch:
+    Allow to use libvirt to convert xend guest configurations into
+    xml format.
+  * Add libvirt-migrate-xend-managed-domains migration script.
+    (LP: #1303886)
+  * Added breaks for xen-utils-4.(1|3) to ensure postinst order.
+
+ -- Stefan Bader <[e-mail]>  Tue, 08 Apr 2014 19:55:29 +0200
+
+libvirt (1.2.2-0ubuntu11) trusty; urgency=medium
+
+  * debian/patches/recognize-trusty-machine-type.patch: Revert patch
+    since it was causing issues with virtio deivces. (LP: #1304107) 
+
+ -- Chuck Short <[e-mail]>  Tue, 08 Apr 2014 12:51:55 -0400
+
+libvirt (1.2.2-0ubuntu10) trusty; urgency=medium
+
+  * d/p/recognize-trusty-machine-type.patch: handle "trusty" qemu machine type
+    (LP: #1294823)
+
+ -- Serge Hallyn <[e-mail]>  Fri, 04 Apr 2014 09:29:22 -0500
+
+libvirt (1.2.2-0ubuntu9) trusty; urgency=medium
+
+  [ Jamie Strandboge ]
+  * updates for AppArmor signals and ptrace mediation (LP: #1298611)
+    - debian/apparmor/libvirt-qemu: allow guests to receive signals from and
+      be tracedby libvirtd (additional signal and ptrace rules come from the
+      AppArmor base abstraction)
+    - debian/apparmor/usr.sbin.libvirtd:
+      + grant bare signal and ptrace rule
+      + grant dbus on the system bus (should have been added in 13.10)
+
+ -- Tyler Hicks <[e-mail]>  Thu, 03 Apr 2014 02:09:53 -0500
+
+libvirt (1.2.2-0ubuntu8) trusty; urgency=medium
+
+  * debian/apparmor/libvirt-qemu: Allow qemu-system-aarch64 to be used.
+    (LP: #1301516)
+
+ -- Chuck Short <[e-mail]>  Wed, 02 Apr 2014 14:20:39 -0400
+
+libvirt (1.2.2-0ubuntu7) trusty; urgency=low
+
+  * d/p/libxl-Create-log-directory-earlier.patch:
+    Move creation of log directory inside function that tries to create
+    a log file inside of it. Fixes startup when the libxl log directory
+    has not been created, yet.
+  * d/p/libxl-do-not-use-virdomain-id.patch:
+    Replace usage of dom->id with vm->def-id inside the driver (as that
+    is not getting stale). Fixes guest creation and reboot through
+    virt-manager (apart from possibly other things).
+  * d/p/libxl-set-disk-format-for-cdrom.patch:
+    Set disk format, otherwise an empty virtual CDROM makes the guest
+    unstartable.
+  * d/p/libxl-set-vfb0-data-in-build-config.patch:
+    Actually set video and display data in the domain build info. Beside
+    of preventing disagreement about VNC ports, this allows to select
+    standard VGA graphics and more VRAM trhough libvirt.
+
+ -- Stefan Bader <[e-mail]>  Thu, 27 Mar 2014 16:46:31 +0100
+
+libvirt (1.2.2-0ubuntu6) trusty; urgency=medium
+
+  * debian/libvirt-bin.dirs: Add /var/log/libvirt/libxl. 
+
+ -- Chuck Short <[e-mail]>  Mon, 24 Mar 2014 14:32:54 -0400
+
+libvirt (1.2.2-0ubuntu5) trusty; urgency=low
+
+  * Refreshed d/p/libxl-Check-for-control_d-string-to-decide-about-dom.patch
+    to avoid logging an error when file is not present.
+
+ -- Stefan Bader <[e-mail]>  Fri, 21 Mar 2014 09:49:36 +0100
+
+libvirt (1.2.2-0ubuntu4) trusty; urgency=medium
+
+  * debian/patches/arm-cpu-baseline.patch: Implement a stub cpuArchDriver.baseline() 
+    handler for arm.
+
+ -- Chuck Short <[e-mail]>  Mon, 17 Mar 2014 10:59:49 -0400
+
+libvirt (1.2.2-0ubuntu3) trusty; urgency=low
+
+  * d/p/libxl-Check-for-control_d-string-to-decide-about-dom.patch: Prevent
+    using the libxl driver when not running in dom0 but having xenfs mounted.
+    (LP: #1248025)
+
+ -- Stefan Bader <[e-mail]>  Wed, 12 Mar 2014 14:16:14 +0100
+
+libvirt (1.2.2-0ubuntu2) trusty; urgency=medium
+
+  * d/p/add-a-mutex-to-serialize-updates-to-fw.patch: fix another deadlock
+    when starting a large number of VMs.  (LP: #1228977)
+
+ -- Serge Hallyn <[e-mail]>  Tue, 11 Mar 2014 14:08:02 -0500
+
+libvirt (1.2.2-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release:
+    - Rediffed patches:
+      - debian/patches/Allow-libvirt-group-to-access-the-socket.patch
+      - debian/patches/9004-libvirtd-group-name.patch
+      - debian/patches/dnsmasq-as-priv-user
+    - Dropped patches:
+      - debian/patches/9005-increase-unix-socket-timeout.patch: No longer
+        needed.
+      - debian/patches/rbd-storage-format.patch: No longer needed.
+      - debian/patches/9022-qemu-enable-host-passthrough-mode-for-aarch64:
+        No longer needed.
+      - debian/patches/9023-xen-fix-parsing-xend-http-response.patch:
+        No longer needed.
+      - debian/patches/
+
+ -- Chuck Short <[e-mail]>  Mon, 03 Mar 2014 13:30:36 -0500
+
+>>>>>>> debian/changelog
 libvirt (1.2.1-2) unstable; urgency=medium
 
   * [e936a7e] Document libvirt user capabilities
@@ -1479,6 +4389,82 @@ libvirt (1.2.1-1) unstable; urgency=medium
 
  -- Guido Günther <[e-mail]>  Fri, 17 Jan 2014 06:16:29 +0100
 
+<<<<<<< debian/changelog
+=======
+libvirt (1.2.1-0ubuntu10) trusty; urgency=medium
+
+  * Pull patch from mailing list (merged with separate patch posted to the
+    bug) to fix 9p mounts. (LP: #1285995)
+
+ -- Serge Hallyn <[e-mail]>  Fri, 28 Feb 2014 09:34:54 -0600
+
+libvirt (1.2.1-0ubuntu9) trusty; urgency=medium
+
+  * Cherrypick 9024-qemu-implement-a-stub-baseline-handler-for-aarch64 from
+    upstream git.
+
+ -- Serge Hallyn <[e-mail]>  Fri, 14 Feb 2014 18:20:03 -0600
+
+libvirt (1.2.1-0ubuntu8) trusty; urgency=medium
+
+  * Add uvtool image path to virt-aa-helper AppArmor profile.
+
+ -- Robie Basak <[e-mail]>  Fri, 14 Feb 2014 17:54:58 +0000
+
+libvirt (1.2.1-0ubuntu7) trusty; urgency=low
+
+  * debian/patches/nwfilter-locking.patch: Dropped causes ftbfs. 
+
+ -- Chuck Short <[e-mail]>  Thu, 13 Feb 2014 10:07:56 -0700
+
+libvirt (1.2.1-0ubuntu6) trusty; urgency=medium
+
+  * debian/control: Move pm-utils from suggests to Recommends.
+    (LP: #1274772) 
+  * debian/patches/patches/nwfilter-locking.patch: Fix nwfilter locking
+    causing libvirt to crash. (LP: #1228977)
+
+ -- Chuck Short <[e-mail]>  Thu, 06 Feb 2014 14:27:40 -0500
+
+libvirt (1.2.1-0ubuntu5) trusty; urgency=low
+
+  * cherry-pick "xen: fix parsing xend http response" from upstream
+    git to fix connecting to xex in xm/xend mode (LP: #915954)
+
+ -- Stefan Bader <[e-mail]>  Thu, 30 Jan 2014 10:05:31 +0000
+
+libvirt (1.2.1-0ubuntu4) trusty; urgency=medium
+
+  * cherrypick d/p/9022-qemu-enable-host-passthrough-mode-for-aarch64 from
+    upstream git.
+
+ -- Serge Hallyn <[e-mail]>  Tue, 28 Jan 2014 10:28:09 +0000
+
+libvirt (1.2.1-0ubuntu3) trusty; urgency=medium
+
+  * d/control: add nfs-common to build-deps (LP: #1264955)
+
+ -- Serge Hallyn <[e-mail]>  Wed, 22 Jan 2014 08:56:01 -0600
+
+libvirt (1.2.1-0ubuntu2) trusty; urgency=medium
+
+  * debian/patches/rbd-storage-format.patch: Make image format 2 the default
+    for RBD. 
+
+ -- Chuck Short <[e-mail]>  Fri, 17 Jan 2014 10:31:37 -0500
+
+libvirt (1.2.1-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release:
+    - Dropped patches:
+     + debian/patches/0001-libxl-Fix-devid-init-in-libxlMakeNicList.patch:
+       No longer needed
+     + debian/patches/0001-libxl-Fix-initialization-of-nictype-in-libxl_device_.patch:
+       No longer needed.
+
+ -- Chuck Short <[e-mail]>  Thu, 16 Jan 2014 09:17:20 -0500
+
+>>>>>>> debian/changelog
 libvirt (1.2.1~rc2-1) experimental; urgency=medium
 
   * [e559e92] libvirt-bin.init: Fix typo in path when checking for systemd
@@ -1541,6 +4527,44 @@ libvirt (1.2.0-1) unstable; urgency=medium
 
  -- Guido Günther <[e-mail]>  Wed, 18 Dec 2013 08:18:48 +0100
 
+<<<<<<< debian/changelog
+=======
+libvirt (1.2.0-0ubuntu3) trusty; urgency=medium
+
+  * debian/apparmor/usr.lib.libvirt.virt-aa-helper: add
+    /var/lib/nova/instances/snapshots/** r to allow virt-aa-helper to read
+    the snapshot directory to find images which VMs should be granted access
+    to.  (LP: #1244694)
+
+ -- Serge Hallyn <[e-mail]>  Thu, 09 Jan 2014 16:39:13 -0600
+
+libvirt (1.2.0-0ubuntu2) trusty; urgency=low
+
+  * Refresh/fix detection of xm/xl toolstack in use. The previous port
+    had two glitches, one of them causing the daemon to segfault.
+  * Cherry-pick "libxl: Fix initialization of nictype in libxl_device_nic"
+    from upstream to have the same default NIC choice with the libxl driver
+    as we had with the xen(d) driver (HVM guest uses a emulated rtl8139).
+  * Cherry-pick "libxl: Fix devid init in libxlMakeNicList" from upstream
+    to allow HVM guests to be brought up from the libxl driver.
+
+ -- Stefan Bader <[e-mail]>  Thu, 09 Jan 2014 11:19:07 +0100
+
+libvirt (1.2.0-0ubuntu1) trusty; urgency=low
+
+  * New upstream release:
+    - Refreshed patches:
+      + debian/patches/storage-default-permission-mode-to-0711
+    - Dropped patches:
+      + debian/patches/util_use_w_flag_when_calling_iptables.patch
+   * debian/control, debian/rules, debian/python.mk,
+     debian/python-libvirt.install: python libvirt bindings have been
+     split out into its own source called libvirt-python.
+   * debian/libvirt-dev.install: Install API files into dev package
+
+ -- Chuck Short <[e-mail]>  Mon, 02 Dec 2013 09:56:17 -0500
+
+>>>>>>> debian/changelog
 libvirt (1.2.0~rc2-1) experimental; urgency=low
 
   * [8bfdc7f] New upstream version 1.2.0~rc2
@@ -1581,6 +4605,81 @@ libvirt (1.1.4-1) unstable; urgency=low
 
  -- Guido Günther <[e-mail]>  Mon, 04 Nov 2013 07:05:45 +0100
 
+<<<<<<< debian/changelog
+=======
+libvirt (1.1.4-0ubuntu5) trusty; urgency=medium
+
+  * Build using dh-autoreconf.
+  * Enable numa support on ppc64 and ppc64el.
+
+ -- Matthias Klose <[e-mail]>  Sun, 22 Dec 2013 15:55:04 +0100
+
+libvirt (1.1.4-0ubuntu4) trusty; urgency=low
+
+  * debian/libvirt-dev.install: Add missing libvirt-lxc.so. 
+
+ -- Chuck Short <[e-mail]>  Thu, 21 Nov 2013 13:10:58 -0500
+
+libvirt (1.1.4-0ubuntu3) trusty; urgency=low
+
+  * d/p/accomodate-new-qemu-migration-status-setup.patch: work around
+    libvirt's not yet knowing of qemu's new migration state, 'setup'.
+    This can be removed when upstream libvirt has a proper patch.  QRT
+    fails without this.
+
+ -- Serge Hallyn <[e-mail]>  Thu, 14 Nov 2013 08:41:07 -0600
+
+libvirt (1.1.4-0ubuntu2) trusty; urgency=low
+
+  * debian/patches/9002-better_default_uri_virsh.patch: Update to fix the
+    FTBFS.
+
+ -- Chuck Short <[e-mail]>  Wed, 13 Nov 2013 11:04:29 -0500
+
+libvirt (1.1.4-0ubuntu1) trusty; urgency=low
+
+  [ Chuck Short ]
+  * New upstream version:
+    - Rediffed patches:
+      + d/p/Don-t-enable-default-network-on-boot.patch
+      + d/p/ubuntu-xend-probe.patch
+      + d/p/Don-t-fail-if-we-can-t-setup-avahi.patch
+      + d/p/Disable-failing-virnetsockettest.patch
+      + d/p/Don-t-enable-default-network-on-boot.patch
+    - Dropped patches:
+      + d/p/v1.1.1-maint/0001-xen-fix-memory-corruption-in-legacy-driver.patch
+      + d/p/v1.1.1-maint/0002-qemu_migration-Don-t-error-on-tunelled-migration-wit.patch
+      + d/p/v1.1.1-maint/0003-build-fix-configure-detection-of-if_bridge.h-on-RHEL.patch
+      + d/p/v1.1.1-maint/0004-remote-Fix-a-segfault-in-remoteDomainCreateWithFlags.patch
+      + d/p/v1.1.1-maint/0005-Revert-build-fix-configure-detection-of-if_bridge.h-.patch
+      + d/p/v1.1.1-maint/0006-build-more-workarounds-for-if_bridge.h.patch
+      + d/p/v1.1.1-maint/0007-Fix-qemuProcessReadLog-with-non-zero-offset.patch
+      + d/p/v1.1.1-maint/0008-Reverse-logic-allowing-partial-DHCP-host-XML.patch
+      + d/p/v1.1.1-maint/0009-virsh-domain-Fix-memleak-in-cmdUndefine-with-storage.patch
+      + d/p/v1.1.1-maint/0010-virsh-domain-Fix-memleak-in-cmdCPUBaseline.patch
+      + d/p/v1.1.1-maint/0011-virbitmap-Refactor-virBitmapParse-to-avoid-access-be.patch
+      + d/p/CVE-2013-4296.patch
+      + d/p/CVE-2013-4311.patch
+      + d/p/CVE-2013-4297.patch
+      + d/p/fix-crash-in-libvirtd-when-events
+      + d/p/security-provide-supplemental-groups
+      + d/p/add-bounds-checking-on-virdomainmigrate
+      + d/p/xen-use-internal-interfaces-in-xendomainusedcpus
+      + d/p/fix-remote-client-segfault.patch
+      + d/p/ubuntu-xend-xmlcreate-double-free.patch
+      + d/p/9002-better_default_uri_virsh.patch
+
+  [ Serge Hallyn ]
+  * update and re-add d/p/9002-better_default_uri_virsh.patch.  Also patch
+    new uri-precedence test, as we break it with this patch.
+  * add d/p/util_use_w_flag_when_calling_iptables.patch (LP: #1245322)
+  * debian/apparmor/libvirt-qemu: allow access to hugepages mounts
+    (LP: #1250216)
+  * debian/apparmor/libvirt-qemu: allow access to usb info (LP: #1245251)
+
+ -- Chuck Short <[e-mail]>  Mon, 11 Nov 2013 11:03:06 -0500
+
+>>>>>>> debian/changelog
 libvirt (1.1.4~rc2-1) experimental; urgency=low
 
   * [b56f727] Add option to mount cgroups during daemon start.  The init
@@ -1708,6 +4807,102 @@ libvirt (1.1.1-1) unstable; urgency=low
 
  -- Guido Günther <[e-mail]>  Mon, 05 Aug 2013 11:31:05 +0200
 
+<<<<<<< debian/changelog
+=======
+libvirt (1.1.1-0ubuntu9) trusty; urgency=low
+
+  * debian/apparmor/usr.sbin.libvirtd: add audit_write capability
+    (LP: #1204616)
+
+ -- Serge Hallyn <[e-mail]>  Wed, 23 Oct 2013 14:09:04 -0500
+
+libvirt (1.1.1-0ubuntu8) saucy; urgency=low
+
+  * SECURITY UPDATE: denial of service via invalid free in
+    virFileNBDDeviceAssociate.
+    - debian/patches/CVE-2013-4297.patch: properly initialize qemunbd in
+      src/util/virfile.c.
+    - CVE-2013-4297
+
+ -- Marc Deslauriers <[e-mail]>  Wed, 02 Oct 2013 13:35:14 -0400
+
+libvirt (1.1.1-0ubuntu7) saucy; urgency=low
+
+  * fix-crash-in-libvirtd-when-events: make sure to remove all event
+    callbacks when a client disconnects from libvirtd.
+
+ -- Serge Hallyn <[e-mail]>  Wed, 02 Oct 2013 08:14:53 -0500
+
+libvirt (1.1.1-0ubuntu6) saucy; urgency=low
+
+  * SECURITY UPDATE: possible privilege escalation via pkcheck race.
+    - debian/patches/CVE-2013-4311.patch: add uid to pkcheck call in
+      configure.ac, daemon/remote.c, src/access/viraccessdriverpolkit.c,
+      src/rpc/virnetserverclient.c, src/util/viridentity.*.
+    - debian/rules: use DEB_AUTO_UPDATE_AUTOCONF and
+      DEB_AUTO_UPDATE_AUTOHEADER.
+    - debian/control: specify version of policykit-1 security update, add
+      libpolkit-gobject-1-dev to Build-Depends.
+    - CVE-2013-4311
+  * SECURITY UPDATE: denial of service in remoteDispatchDomainMemoryStats
+    - debian/patches/CVE-2013-4296.patch: properly initialize stats in
+      daemon/remote.c.
+    - CVE-2013-4296
+
+ -- Marc Deslauriers <[e-mail]>  Tue, 24 Sep 2013 19:25:55 -0400
+
+libvirt (1.1.1-0ubuntu5) saucy; urgency=low
+
+  * add-bounds-checking-on-virdomainmigrate: upstream patch for CVE-2013-4292
+  * security-provide-supplemental-groups: upstream patch for CVE-2013-4291
+
+ -- Serge Hallyn <[e-mail]>  Mon, 09 Sep 2013 13:16:43 -0500
+
+libvirt (1.1.1-0ubuntu4) saucy; urgency=low
+
+  * apply all patches from v1.1.1-maint
+  * cherrypick xen-use-internal-interfaces-in-xendomainusedcpus from upstream
+    git.
+
+ -- Serge Hallyn <[e-mail]>  Thu, 22 Aug 2013 10:57:20 -0500
+
+libvirt (1.1.1-0ubuntu3) saucy; urgency=low
+
+  * debian/apparmor/usr.sbin.libvirtd: Include the system bus abstraction in
+    the libvirtd AppArmor profile as libvirtd connects to the D-Bus system bus
+
+ -- Tyler Hicks <[e-mail]>  Tue, 20 Aug 2013 09:07:17 -0700
+
+libvirt (1.1.1-0ubuntu2) saucy; urgency=low
+
+  * debian/patches/fix-remote-client-segfault.patch: Fix segfault when 
+    using a remote client. 
+
+ -- Chuck Short <[e-mail]>  Mon, 19 Aug 2013 10:33:08 -0400
+
+libvirt (1.1.1-0ubuntu1) saucy; urgency=low
+
+  [ Chuck Short ]
+  * New usptream version:
+    - Dropped: 
+      + debian/patches/CVE-2013-2218-fix-crash-listing-network-interfaces-with-filters:
+        no longer needed.
+      + debian/patches/ubuntu-xen-hypervisor-4.3.patch: no longer needed.
+      + debian/patches/ubuntu-xen-fix-api-deadlocks.patch: no longer needed.
+    - Rediffed:
+      + debian/patches/Don-t-enable-default-network-on-boot.patch
+      + debian/patches/9005-increase-unix-socket-timeout.patch
+
+   [ Stefan Bader ]
+   * Add apparmor rights to call into /usr/lib/xen-common/bin/xen-toolstack
+     to figure out which one is active.
+   * debian/patches/ubuntu-xend-probe.patch: Fix failure to detect
+     whether Xen uses xm/xend toolstack or xl/libxl. Avoid running
+     "xend status" as we do not package that in a pbublic path.
+
+ -- Chuck Short <[e-mail]>  Thu, 15 Aug 2013 17:23:21 +0000
+
+>>>>>>> debian/changelog
 libvirt (1.1.0-4) unstable; urgency=low
 
   * [22913a0] Skip tests on all architectures except for i386 and amd64 as we
@@ -1777,6 +4972,51 @@ libvirt (1.0.6-1) unstable; urgency=low
 
  -- Guido Günther <[e-mail]>  Thu, 06 Jun 2013 15:27:52 +0200
 
+<<<<<<< debian/changelog
+=======
+libvirt (1.0.6-0ubuntu4) saucy; urgency=low
+
+  * ubuntu-xen-fix-api-deadlocks.patch (LP: #1191782)
+    Fix the deadlocks in the xen driver when doing a dumpxml for active
+    domains.
+  * ubuntu-libxl-qemu-nopath.patch
+    Create libxl configurations without paths for qemu-dm and hvmloader.
+    The Xen toolstack can figure this out.
+  * ubuntu-xen-hypervisor-4.3.patch
+    Update the xen driver to handle the new sysctl and domctl versions
+    in Xen-4.3.
+  * Add apparmor definitions to execute scripts in /etc/xen/scrips as
+    the libxl driver calls out to them (with the xen/xm driver this was
+    done by the xen toolstack and communication with that was through
+    a socket).
+
+ -- Stefan Bader <[e-mail]>  Tue, 16 Jul 2013 10:59:11 +0200
+
+libvirt (1.0.6-0ubuntu3) saucy; urgency=low
+
+  * debian/apparmor/usr.lib.libvirt.virt-aa-helper: allow owner read of
+    @{PROC}/[0-9]*/status
+
+ -- Jamie Strandboge <[e-mail]>  Mon, 15 Jul 2013 10:28:42 -0500
+
+libvirt (1.0.6-0ubuntu2) saucy; urgency=low
+
+  * Apply CVE-2013-2218-fix-crash-listing-network-interfaces-with-filters.
+
+ -- Serge Hallyn <[e-mail]>  Fri, 28 Jun 2013 13:13:20 -0500
+
+libvirt (1.0.6-0ubuntu1) saucy; urgency=low
+
+  * New upstream relase.
+    + Dropped patches:
+      - debian/patches/vnc-socket.patch: Dropped no longer needed.
+      - debian/patches/Add-sanitytest.py.patch: Dropped no longer needed.
+   * debian/libvirt-bin.postinst: Make sure qemu.conf isn't world readable 
+     by default.
+
+ -- Chuck Short <[e-mail]>  Mon, 03 Jun 2013 11:27:02 -0500
+
+>>>>>>> debian/changelog
 libvirt (1.0.5-3) unstable; urgency=low
 
   * Upload to unstable (Closes: #709216, #705205)
@@ -1806,6 +5046,28 @@ libvirt (1.0.5-1) experimental; urgency=low
 
  -- Guido Günther <[e-mail]>  Thu, 02 May 2013 21:34:32 +0200
 
+<<<<<<< debian/changelog
+=======
+libvirt (1.0.5-0ubuntu1) saucy; urgency=low
+
+  * New upstream release: 
+    + Dropped patches:
+      - debian/patches/fix-virterror-namechange
+      - debian/patches/apparmor-use-apparmor-setfdlabel
+      - debian/patches/prevent-lxc-shutdown-host.patch
+      - debian/patches/apparmor-no-need-to-check-security-model
+      - debian/patches/nonblock-fix.patch
+     + Refreshed patches:
+      - debian/patches/9002-better_default_uri_virsh.patch
+      - debian/patches/enable-kvm-spice.patch
+      - debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
+   * debian/patches/Add-sanitytest.py.patch: Add patch to fix missing sanitytest.py
+     when building the testsuite.
+   * debian/libvirt-dev.install: dont't ship files for static linking.
+
+ -- Chuck Short <[e-mail]>  Thu, 02 May 2013 10:21:49 -0500
+
+>>>>>>> debian/changelog
 libvirt (1.0.5~rc1-1) experimental; urgency=low
 
   * [c2302f5] Dont' fail with aug-tools installed.
@@ -1881,6 +5143,125 @@ libvirt (1.0.2-1) experimental; urgency=low
 
  -- Guido Günther <[e-mail]>  Wed, 30 Jan 2013 21:06:02 +0100
 
+<<<<<<< debian/changelog
+=======
+libvirt (1.0.2-0ubuntu12) saucy; urgency=low
+
+  * debian/libvirt-bin.{dirs,install}: install dnsmasq.d-available/libvirt-bin
+    (LP: #1113821)
+
+ -- Serge Hallyn <[e-mail]>  Mon, 29 Apr 2013 07:38:07 -0500
+
+libvirt (1.0.2-0ubuntu11) raring; urgency=low
+
+  * debian/patches/nonblock-fix.patch: cherrypicked upstream patch to
+    not mark qemu migration fd non-blocking.  This fixes tcp live
+    migration. (LP: #1157626)
+
+ -- Serge Hallyn <[e-mail]>  Thu, 18 Apr 2013 10:43:26 -0500
+
+libvirt (1.0.2-0ubuntu10) raring; urgency=low
+
+  * Add code to postinst to fix any double-migration of /etc/dnsmasq.
+    (LP: #1157332)
+
+ -- Serge Hallyn <[e-mail]>  Thu, 28 Mar 2013 09:11:04 -0500
+
+libvirt (1.0.2-0ubuntu9) raring; urgency=low
+
+  * debian/patches/prevent-lxc-shutdown-host.patch: Backport fix
+    from upstream to prevent lxc-containets shutting down the host. 
+
+ -- Chuck Short <[e-mail]>  Mon, 25 Mar 2013 09:28:47 -0500
+
+libvirt (1.0.2-0ubuntu8b1) raring; urgency=low
+
+  * No-change rebuild against libudev1
+
+ -- Martin Pitt <[e-mail]>  Wed, 13 Mar 2013 07:02:03 +0000
+
+libvirt (1.0.2-0ubuntu8) raring; urgency=low
+
+  * put libvirt-bin dnsmasq file into /etc/dnsmasq.d-available, and
+    create a symlink in /etc/dnsmasq.d, to avoid problems when removing
+    and re-installing libvirt-bin.  (LP: #1113821)
+
+ -- Serge Hallyn <[e-mail]>  Tue, 26 Feb 2013 12:09:37 -0600
+
+libvirt (1.0.2-0ubuntu7) raring; urgency=low
+
+  * libvirt-bin.postinst: also put admin group members into the libvirtd
+    group, to support systems installed before precise.  (LP: #1124127)
+  * libvirt-bin.postinst: use getent group instead of grep /etc/group
+  * rules: pass path to collie to enable sheepdog backend (LP: #1129107)
+  * control, rules: enable building against libaudit, which is in main.
+
+ -- Adam Conrad <[e-mail]>  Wed, 20 Feb 2013 15:50:47 -0700
+
+libvirt (1.0.2-0ubuntu6) raring; urgency=low
+
+  * Really refresh debian/patches/fix-ubuntu-xen-qemu-dm-path.patch and
+    not only claim to and disable it.
+
+ -- Stefan Bader <[e-mail]>  Tue, 19 Feb 2013 15:00:27 +0100
+
+libvirt (1.0.2-0ubuntu5) raring; urgency=low
+
+  * debian/apparmor/libvirt-qemu: allow qemu read access to
+    @{PROC}/sys/vm/overcommit_memory
+
+ -- Jamie Strandboge <[e-mail]>  Thu, 14 Feb 2013 10:12:40 -0600
+
+libvirt (1.0.2-0ubuntu4) raring; urgency=low
+
+  * Update Readme.Debian
+    - we use libvirtd, not libvirt group (LP: #1095140)
+    - we add users from sudo, not admin group, to libvirtd.
+  * libvirt-bin.postinst: put users from sudo, not admin group, into group
+    libvirtd. (LP: #1124127)
+
+ -- Serge Hallyn <[e-mail]>  Wed, 13 Feb 2013 09:47:58 -0600
+
+libvirt (1.0.2-0ubuntu3) raring; urgency=low
+
+  * libvirt-bin.postrm: only remove /etc/dnsmasq.d/libvirt-bin during
+    remove.  (LP: #1113821)
+
+ -- Serge Hallyn <[e-mail]>  Mon, 04 Feb 2013 10:35:47 -0600
+
+libvirt (1.0.2-0ubuntu2) raring; urgency=low
+
+  * debian/patches/fix-virterror-namechange: Include virterror otherwise
+    python-libvirt wont be able to find any error codes. 
+
+ -- Chuck Short <[e-mail]>  Fri, 01 Feb 2013 13:10:58 -0600
+
+libvirt (1.0.2-0ubuntu1) raring; urgency=low
+
+  [ Chuck Short ]
+  * New upstream release: 
+    + Dropped patches:
+      - debian/patches/Add_RESUME_event_listener_to_qemu_monitor.patch
+      - debian/patches/build-work-around-broken-kernel-header.patch
+      - debian/patches/bridge-fix-persistent-networks.patch
+      - debian/patches/CVE-2013-0170.patch
+      - debian/patches/qemu-relax-hard-rss-limit.patch
+      - debian/patches/9003-better-default-arch.patch
+    + Refreshed patches:
+      - debian/patches/fix-ubuntu-xen-qemu-dm-path.patch
+      - debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
+      - debian/patches/9021-fix-uint64_t.patch
+      - debian/patches/9020-lp545795.patch
+      - debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch
+    + debian/libvirt0.install: Add libvirt-lxc.so.*
+
+  [ Serge Hallyn ]
+  * debian/patches/fix-virterror-namechange: fix unfinished name change
+    causing errors in generated libvirt.py.
+
+ -- Chuck Short <[e-mail]>  Wed, 30 Jan 2013 09:04:38 -0600
+
+>>>>>>> debian/changelog
 libvirt (1.0.2~rc1-1) experimental; urgency=low
 
   * [5ce607c] Make python-libvirt depend on the exact same libvirt0 version
@@ -1924,6 +5305,45 @@ libvirt (1.0.1-1) experimental; urgency=low
 
  -- Guido Günther <[e-mail]>  Sun, 23 Dec 2012 12:28:01 +0100
 
+<<<<<<< debian/changelog
+=======
+libvirt (1.0.1-0ubuntu4) raring; urgency=low
+
+  * SECURITY UPDATE: denial of service and possible code execution via
+    uninitialized pointer
+    - debian/patches/CVE-2013-0170.patch: remove message from queue before
+      freeing in src/rpc/virnetserverclient.c.
+    - CVE-2013-0170
+
+ -- Marc Deslauriers <[e-mail]>  Tue, 29 Jan 2013 15:19:54 -0500
+
+libvirt (1.0.1-0ubuntu3) raring; urgency=low
+
+  * debian/apparmor/libvirt-qemu: add /usr/share/ovmf/** r (LP: #1074207)
+
+ -- Serge Hallyn <[e-mail]>  Tue, 29 Jan 2013 11:55:19 -0600
+
+libvirt (1.0.1-0ubuntu2) raring; urgency=low
+
+  * add qemu-relax-hard-rss-limit.rss to avoid OOM kills (LP: #1102290)
+  * debian/rules: replace --without-vbox with --with-vbox (LP: #1103721)
+
+ -- Serge Hallyn <[e-mail]>  Thu, 24 Jan 2013 13:00:48 -0600
+
+libvirt (1.0.1-0ubuntu1) raring; urgency=low
+
+  * New upstream version.  (LP: #1102487)
+    + Dropped apparmor-allow-hugepages
+    + update dnsmasq-as-priv-user, upstream now uses a configuration file.
+    + swap Add_RESUME_event_listener_to_qemu_monitor.patch from git tree for
+      the backported handle_resume_1.0.0-0ubuntu4.patch.
+    + rebuild debian/patches/build-work-around-broken-kernel-header
+    + add bridge-fix-persistent-networks.patch from upstream to fix bug
+      where new networks are not marked persistent.
+
+ -- Serge Hallyn <[e-mail]>  Wed, 23 Jan 2013 13:24:30 -0600
+
+>>>>>>> debian/changelog
 libvirt (1.0.1~rc1-1) experimental; urgency=low
 
   * [dca42fb] Rely on DBus activation for hal (Closes: #694020)
@@ -1943,6 +5363,73 @@ libvirt (1.0.0-1) experimental; urgency=low
 
  -- Guido Günther <[e-mail]>  Tue, 06 Nov 2012 20:59:48 +0100
 
+<<<<<<< debian/changelog
+=======
+libvirt (1.0.0-0ubuntu5) raring; urgency=low
+
+  * handle_resume_1.0.0-0ubuntu4.patch: Add RESUME event listener to qemu
+    monitor (LP: #1097824)
+  * build-work-around-broken-kernel-header: work around FTBFS due to a
+    broken linux/if_bridge.h.
+
+ -- Serge Hallyn <[e-mail]>  Wed, 16 Jan 2013 09:15:20 -0600
+
+libvirt (1.0.0-0ubuntu4) raring; urgency=low
+
+  * debian/patches/apparmor-allow-hugepages: update apparmor policies to
+    allow use of hugepages.  (LP: #646468)
+  * debian/patches/vnc-socket.patch: If a vnc socket is in use, add it's
+    path to the apparmor policy.  (LP: #1069534)
+
+ -- Serge Hallyn <[e-mail]>  Wed, 05 Dec 2012 16:43:04 -0600
+
+libvirt (1.0.0-0ubuntu3) raring; urgency=low
+
+  * libvirt-bin.postinst: on first install, don't autostart virbr0 if
+    192.168.122.0 already is in use.  On upgrade, always autostart
+    virbr0 if and only if it was autostarted before the upgrade.
+
+ -- Serge Hallyn <[e-mail]>  Tue, 27 Nov 2012 00:25:11 -0600
+
+libvirt (1.0.0-0ubuntu2) raring; urgency=low
+
+  * debian/patches/add-armhf-sysinfo-infomration.patch: Disable
+    to fix FTBFS on arm.
+
+ -- Chuck Short <[e-mail]>  Mon, 19 Nov 2012 10:41:02 -0600
+
+libvirt (1.0.0-0ubuntu1) raring; urgency=low
+
+  [ Chuck Short ]
+  * New upstream version: 
+    + droppped:
+      - debian/patches/CVE-2012-3445.patch
+      - debian/patches/fix-cve-2012-4423
+      - debian/patches/lp1039678.patch
+      - debian/patches/add-libvirt-highbank-support.patch
+      - debian/patches/add-armhf-cpuinfo-parser.patch
+      - debian/patches/fix-lxc-container-unmounting.patch
+      - debian/patches/libnl3-build-fix.patch
+      - debian/patches/Don-t-require-gawk-for-a-simple-print-expression.patch
+      - debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch
+      - debian/patches/qemu-warn-on-pc-0.12.patch
+      - debian/patches/storage-default-pool-permission-mode-to-0755
+      - debian/patches/netcf-daemon-fix-wrong-macro-name
+      - debian/patches/xen_hypervisor-treat-missing-privcmd-file-as-temporary.patch
+    + Re-diffed:
+      - debian/patches/9002-better_default_uri_virsh.patch
+      - debian/patches/dnsmasq-as-priv-user
+      - debian/patches/enable-kvm-spice.patch
+    + debian/control, debian/rules: Turn on rbd pool storage.
+
+   [ Serge Hallyn ]
+   * Add patches to fix apparmor labeling issue at VM start:
+     - apparmor-no-need-to-check-security-model
+     - apparmor-use-apparmor-setfdlabel
+
+ -- Chuck Short <[e-mail]>  Mon, 12 Nov 2012 07:50:44 -0600
+
+>>>>>>> debian/changelog
 libvirt (1.0.0~rc3-1) experimental; urgency=low
 
   * [d3d06ad] New upstream version 1.0.0~rc3
@@ -2068,6 +5555,122 @@ libvirt (0.9.13-1) experimental; urgency=low
 
  -- Guido Günther <[e-mail]>  Wed, 01 Aug 2012 13:14:30 +0200
 
+<<<<<<< debian/changelog
+=======
+libvirt (0.9.13-0ubuntu12) quantal; urgency=low
+
+  * Refresh fix-ubuntu-xen-qemu-dm-path.patch to only use executable
+    names and let the toolchain find out the right paths (LP: #914788).
+    Thanks George Dunlap.
+  * Refresh and re-activate xen_hypervisor-treat-missing-privcmd-file-
+    as-temporary.patch (LP: #922486)
+
+ -- Stefan Bader <[e-mail]>  Fri, 05 Oct 2012 11:35:43 +0200
+
+libvirt (0.9.13-0ubuntu11) quantal-proposed; urgency=low
+
+  * SECURITY UPDATE: denial of service via invalid RPC command
+    - debian/patches/CVE-2012-3445.patch: make sure nparams isn't set to
+      zero in daemon/remote.c.
+    - CVE-2012-3445
+
+ -- Marc Deslauriers <[e-mail]>  Wed, 26 Sep 2012 11:49:45 -0400
+
+libvirt (0.9.13-0ubuntu10) quantal; urgency=high
+
+  * apply fix-cve-2012-4423 from upstream to prevent potential daemon
+    segfaults with newer virsh.
+    - Fixes: CVE-2012-4423.
+
+ -- Serge Hallyn <[e-mail]>  Fri, 14 Sep 2012 11:05:40 -0500
+
+libvirt (0.9.13-0ubuntu9) quantal; urgency=low
+
+  * debian/patches/lp1039678.patch: fix segfault in 'snapshot-list'
+    - LP: #1039678
+
+ -- Jamie Strandboge <[e-mail]>  Tue, 21 Aug 2012 13:59:34 -0500
+
+libvirt (0.9.13-0ubuntu8) quantal-proposed; urgency=low
+
+  * debian/libvirt-bin.apport: add filter on AppArmor profile names to
+    prevent false positives from denials originating in other packages.
+
+ -- Marc Deslauriers <[e-mail]>  Mon, 20 Aug 2012 10:49:17 -0400
+
+libvirt (0.9.13-0ubuntu7) quantal; urgency=low
+
+  * debian/apparmor/libvirt-qemu: allow owner read access to @{PROC}/*/auxv
+
+ -- Jamie Strandboge <[e-mail]>  Tue, 14 Aug 2012 16:44:30 -0500
+
+libvirt (0.9.13-0ubuntu6) quantal; urgency=low
+
+  * enable netcf support (LP: #520386)
+    - debian/control: build-dep on libnetcf-dev
+    - debian/rules: add --with-netcf to configure args
+  * add patch netcf-daemon-fix-wrong-macro-name from upstream so netcf support
+    can actually work.
+
+ -- Serge Hallyn <[e-mail]>  Wed, 08 Aug 2012 07:54:16 -0500
+
+libvirt (0.9.13-0ubuntu5) quantal; urgency=low
+
+  * add patch Reduce-udevadm-settle-timeout-to-10-seconds.patch (copied from
+    Debian tree) to fix 3 minute hang during pool-refresh when using LVM
+    backed pools.  (LP: #1027987)
+  * debian/control: add pm-utils to libvirt-bin Suggests.  (LP: #994476)
+
+ -- Serge Hallyn <[e-mail]>  Thu, 26 Jul 2012 11:05:18 -0500
+
+libvirt (0.9.13-0ubuntu4) quantal; urgency=low
+
+  * debian/patches/add-armhf-sysinfo-infomration.patch:
+    Provides cpuinfo for armhf cpus.
+  * debian/patches/add-armhf-cpuinfo-parser.patch:
+    Fixes compile time warning about armhf cpus.
+
+ -- Chuck Short <[e-mail]>  Thu, 19 Jul 2012 14:54:47 -0500
+
+libvirt (0.9.13-0ubuntu3) quantal; urgency=low
+
+  * debian/apparmor/libvirt-qemu: add ceph.conf (LP: #1026404)
+  * debian/patches: re-add 9002-better_default_uri_virsh.patch (LP: #1026515)
+
+ -- Serge Hallyn <[e-mail]>  Thu, 19 Jul 2012 07:58:39 -0500
+
+libvirt (0.9.13-0ubuntu2) quantal; urgency=low
+
+  * Apply upstream patch to switch default storage pool dir perms from 0700
+    to 0755.  Then push our own patch to change that to 0711.  We'll get the
+    upstream patch on 0.9.14 merge, but we'll want to keep our patch on top
+    of that.
+
+ -- Serge Hallyn <[e-mail]>  Mon, 16 Jul 2012 18:06:43 +0000
+
+libvirt (0.9.13-0ubuntu1) quantal; urgency=low
+
+  * New upstream version: 
+  * debian/rules: Remove .la files
+  * debian/control: Dropped debian vcs info.
+  * Dropped:
+    - debian/paches/9022-pass-the-virt-driver-name-into-security-drivers:
+      Already applied upstream.
+    - debian/patches/9023-dont-enable-apparmor-driver-with-lxc
+      Already applied upstream.
+    - debian/patches/9024-initialize-random-generator-in-lxc:
+      Already applied upstream.
+  * Re-diffed:
+    - debian/patches/9002-better_default_uri_virsh.patch
+  * Added:
+    - debian/patches/add-libvirt-highbank-support.patch: Add highbank 
+      CPU detection support.
+    - debian/patches/fix-lxc-container-unmounting.patch: Fix container
+      mounting.
+
+ -- Chuck Short <[e-mail]>  Wed, 11 Jul 2012 12:37:49 -0500
+
+>>>>>>> debian/changelog
 libvirt (0.9.13~rc2-1) experimental; urgency=low
 
   * [505f873] New upstream version 0.9.13~rc2
@@ -2115,7 +5718,10 @@ libvirt (0.9.12-4) unstable; urgency=low
 
  -- Guido Günther <[e-mail]>  Wed, 01 Aug 2012 21:12:13 +0200
 
+<<<<<<< debian/changelog
 
+=======
+>>>>>>> debian/changelog
 libvirt (0.9.12-3) unstable; urgency=low
 
   * [6b610b6] Include stdint.h for uint32_t to fix the build on kFreeBSD
@@ -2139,6 +5745,86 @@ libvirt (0.9.12-1) experimental; urgency=low
 
  -- Guido Günther <[e-mail]>  Tue, 15 May 2012 14:31:26 +0200
 
+<<<<<<< debian/changelog
+=======
+libvirt (0.9.12-0ubuntu5) quantal; urgency=low
+
+  * 9024-initialize-random-generator-in-lxc: invoke virRandomInitialize()
+    to prevent segfaults when lxc uses virRandomBits().  (LP: #1023205)
+
+ -- Serge Hallyn <[e-mail]>  Wed, 11 Jul 2012 07:59:03 -0500
+
+libvirt (0.9.12-0ubuntu4) quantal; urgency=low
+
+  * 9022-pass-the-virt-driver-name-into-security-drivers and
+    9023-dont-enable-apparmor-driver-with-lxc: fix libvirt-lxc breakages
+    due to incomplete apparmor security driver for lxc.
+
+ -- Serge Hallyn <[e-mail]>  Fri, 29 Jun 2012 18:15:04 -0500
+
+libvirt (0.9.12-0ubuntu3) quantal; urgency=low
+
+  * install apport hook as right name - libvirt-bin is the binary package,
+    the source package name is libvirt.  (LP: #1007405)
+  * install /etc/dnsmasq.d/libvirt to configure system wide dnsmasq to not
+    listen on the libvirt bridge.  (Following Stéphane's lxc example)
+    (LP: #928524) (LP: #231060)
+    - postinst: restart dnsmasq; postrm: remove dnsmasq.d/libvirt file and
+      restart dnsmasq;  rules, libvirt-bin.dirs and libvirt-bin.install:
+      install new debian/libvirt-bin.dnsmasq file.
+
+ -- Serge Hallyn <[e-mail]>  Fri, 01 Jun 2012 09:36:58 -0500
+
+libvirt (0.9.12-0ubuntu2) quantal; urgency=low
+
+  * Warn user about bad pc-0.12 machine type, and help user transition.
+    (LP: #1001625)
+    - qemu-warn-on-pc-0.12.patch: When defining or starting a VM which uses the
+      pc-0.12 machine type, warn in libvirtd.log. 
+    - debian/libvirt-migrate-qemu-machinetype: automatically migrate QEMU VMs
+      to newest machine type.  This is not done automatically as there will
+      be some users who have good reason to stay with pc-0.12.
+
+ -- Serge Hallyn <[e-mail]>  Mon, 28 May 2012 17:48:50 +0000
+
+libvirt (0.9.12-0ubuntu1) quantal; urgency=low
+
+  * New upstream version:
+    * Synchronize with debian packaging:
+      - debian/control: Update build depends.
+      - debian/libvirt-bin.postrm: Cleanup /var/log/libvirt
+        on purge.
+      - Bump standards verson (no changes).
+      - debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch: Added
+    * Dropped patches:
+      - debian/patches/Debianize-libvirt-guests.patch
+      - debian/patches/rewrite-lxc-controller-eof-handling-yet-again
+      - debian/patches/ubuntu/libnl13.patch
+      - debian/patches/ubuntu/fix-lxc-startup-error.patch
+      - debian/patches/ubuntu/fix-bridge-fd.patch
+      - debian/patches/ubuntu/skip-labelling-network-disks.patch
+      - debian/patches/ubuntu/xen-xend-shutdown-detection.patch
+      - debian/patches/ubuntu/xen-config-no-vfb-for-hvm.patch
+      - debian/patches/debian/Disable-daemon-start-test.patch
+      - debian/patches/debian/Disable-gnulib-s-test-nonplocking-pipe.sh.patch
+      - debian/patches/ubuntu/9006-default-config-test-case.patch
+      - debian/patches/fix-block-migration.patch
+      - debian/patches/ubuntu/9022-qemu-unescape-HMP-commands-before-converting-them-to.patch
+      - debian/patches/ubuntu/9023-qemu-change-rbd-auth_supported-separation-character-.patch
+      - debian/patches/ubuntu/9024-qemu-allow-snapshotting-of-sheepdog-and-rbd-disks.patch
+      - debian/patches/9025-qemu-change-rbd-auth_supported-separation-character-.patch
+      - debian/patches/ubuntu/arm-gcc-workaround.patch
+    * Rediffed:
+      - debian/patches/Allow-libvirt-group-to-access-the-socket.patch
+      - debian/patches/Disable-failing-virnetsockettest.patch
+      - debian/patches/dnsmasq-as-priv-user
+      - debian/patches/9002-better_default_uri_virsh.patch
+    * debian/control: Add libnl-route-3-dev ass a build depends.
+    * debian/patches/libnl3-build-fix.patch: Fix build with libnl3.
+
+ -- Chuck Short <[e-mail]>  Sun, 13 May 2012 15:44:12 -0400
+
+>>>>>>> debian/changelog
 libvirt (0.9.12~rc2-1) experimental; urgency=low
 
   * [721a2d8] New upstream version 0.9.12~rc2
@@ -2239,6 +5925,262 @@ libvirt (0.9.9-1) experimental; urgency=low
 
  -- Guido Günther <[e-mail]>  Tue, 10 Jan 2012 13:40:41 +0100
 
+<<<<<<< debian/changelog
+=======
+libvirt (0.9.8-2ubuntu18) quantal; urgency=low
+
+  * debian/apparmor/usr.sbin.libvirtd: allow execution of /lib/udev/scsi_id
+    (LP: #992378)
+
+ -- Serge Hallyn <[e-mail]>  Wed, 02 May 2012 14:02:32 -0500
+
+libvirt (0.9.8-2ubuntu17) precise; urgency=low
+
+  * debian/apparmor/usr.lib.libvirt.virt-aa-helper: add /**.qed r so qed
+    drives in non-standard locations can be used.  (LP: #981571)
+
+ -- Serge Hallyn <[e-mail]>  Mon, 16 Apr 2012 11:30:47 -0500
+
+libvirt (0.9.8-2ubuntu16) precise; urgency=low
+
+  [ Serge Hallyn ]
+  * Apply patches from Josh Durgin <[e-mail]> to make
+    attaching rbd volumes and taking snapshots of them work.
+    - ubuntu/9022-qemu-unescape-HMP-commands-before-converting-them-to.patch
+    - ubuntu/9023-qemu-change-rbd-auth_supported-separation-character-.patch
+    - ubuntu/9024-qemu-allow-snapshotting-of-sheepdog-and-rbd-disks.patch
+    - ubuntu/9025-qemu-change-rbd-auth_supported-separation-character-.patch
+
+  [ Stefan Bader ]
+  * Do not use vfb sections in HVM graphics definitions (side-
+    effect will create a vkbd device as well which causes error
+    messages in the HVM guest). (LP: #973529)
+
+ -- Serge Hallyn <[e-mail]>  Thu, 05 Apr 2012 11:43:15 -0500
+
+libvirt (0.9.8-2ubuntu15) precise; urgency=low
+
+  [ Stefan Bader ]
+  * Use domain/status to check for inactive domains in the xend sub-
+    driver. (LP: #929626)
+  * Prevent the hypervisor sub-driver from logging an internal error
+    just because it cannot find a certain domain when looking for
+    the number of vcpus. (LP: #963006)
+
+ -- Stefan Bader <[e-mail]>  Fri, 23 Mar 2012 11:38:24 +0100
+
+libvirt (0.9.8-2ubuntu14) precise; urgency=low
+
+  * re-enable numa (undo delta against debian)  (LP: #614322):
+    - debian/control: remove from dependencies
+    - debian/rules: turn it off
+
+ -- Serge Hallyn <[e-mail]>  Tue, 13 Mar 2012 11:25:53 -0500
+
+libvirt (0.9.8-2ubuntu13) precise; urgency=low
+
+  * ubuntu/skip-labelling-network-disks.patch: don't try to label network
+    drives with apparmor.  It fails.  (LP: #949428)
+
+ -- Serge Hallyn <[e-mail]>  Mon, 12 Mar 2012 14:20:05 -0500
+
+libvirt (0.9.8-2ubuntu12) precise; urgency=low
+
+  [ Stefan Bader ]
+  * Never use type=ioemu for NIC definitions. It is not needed
+    and actually breaks the paravirt interface which always gets
+    created in parallel.
+
+ -- Stefan Bader <[e-mail]>  Wed, 07 Mar 2012 15:08:55 +0100
+
+libvirt (0.9.8-2ubuntu11) precise; urgency=low
+
+  [ Serge Hallyn ]
+  * run dnsmasq as a new libvirt-dnsmasq user (LP: #938255)
+    - ubuntu/dnsmasq-as-priv-user: add '-u libvirt-dnsmasq' to dnsmasq args
+    - debian/libvirt-bin.postinst: create libvirt-dnsmasq user
+    - tests/networkxml2argvdata/*.argv: update expected dnsmasq command lines
+      to include '-u libvirt-dnsmasq'.
+
+  [ Chuck Short ]
+  * cherry-pick rewrite-lxc-controller-eof-handling-yet-again (commit
+    9130396214975ba2251082f943c9717281039050) from upstream.
+
+ -- Serge Hallyn <[e-mail]>  Fri, 02 Mar 2012 08:49:41 -0600
+
+libvirt (0.9.8-2ubuntu10) precise; urgency=low
+
+  * debian/control: add libgcrypt11-dev to build-depends (LP: #932889)
+
+ -- Serge Hallyn <[e-mail]>  Wed, 15 Feb 2012 13:13:09 -0600
+
+libvirt (0.9.8-2ubuntu9) precise; urgency=low
+
+  [ Stefan Bader ]
+  * xen_hypervisor: libvirtd can be started before xenfs has been loaded
+    as a module. A missing privcmd file is not necessarily a permanent
+    error. (LP: #922486)
+
+  [ Serge Hallyn ]
+  * debian/libvirt-bin.upstart: start on just 'runlevel [2345]'
+
+ -- Serge Hallyn <[e-mail]>  Wed, 08 Feb 2012 11:20:35 -0600
+
+libvirt (0.9.8-2ubuntu8) precise; urgency=low
+
+  * ubuntu/fix-bridge-fd.patch: cherrypick commit
+    2d5046d31f4f5c961fc4aa6b415a00bb9eadae2b from upstream to write the
+    bridge delay to the right file.  (LP: #924446)
+
+ -- Serge Hallyn <[e-mail]>  Wed, 01 Feb 2012 11:13:23 -0600
+
+libvirt (0.9.8-2ubuntu7) precise; urgency=low
+
+  [ David weber ]
+  * debian/patches/fix-block-migration.patch: Fix block-migration for large images.
+
+  [ Guilhem Lettron ]
+  * debian/apparmor/libvirt-qemu: add apparmor rule for mavtap  (LP: #921870)
+
+ -- Serge Hallyn <[e-mail]>  Thu, 26 Jan 2012 11:22:04 -0600
+
+libvirt (0.9.8-2ubuntu6) precise; urgency=low
+
+  * debian/patches/fix-lxc-startup-error.patch: Fix lxc start up error.
+    (LP: #921004)
+
+ -- Chuck Short <[e-mail]>  Tue, 24 Jan 2012 10:05:29 -0500
+
+libvirt (0.9.8-2ubuntu5) precise; urgency=low
+
+  * debian/libvirt-bin.postinst: even if we think it's a new install, don't
+    assume that /etc/libvirt/qemu/networks/autostart/default.xml doesn't
+    exist.
+
+ -- Serge Hallyn <[e-mail]>  Mon, 23 Jan 2012 12:43:02 -0600
+
+libvirt (0.9.8-2ubuntu4) precise; urgency=low
+
+  * debian/patches/fix-ubuntu-xen-qemu-dm-patch.patch:
+    Update patch due to failing tests. 
+
+ -- Chuck Short <[e-mail]>  Fri, 20 Jan 2012 16:05:45 -0500
+
+libvirt (0.9.8-2ubuntu3) precise; urgency=low
+
+  * debian/control: add dbus to libvirt-bin depends.  It fails to start
+    otherwise.  (LP: #918343)
+
+ -- Serge Hallyn <[e-mail]>  Thu, 19 Jan 2012 16:11:44 -0600
+
+libvirt (0.9.8-2ubuntu2) precise; urgency=low
+
+  * debian/patches/fix-ubuntu-xen-qemu-dm-path.patch:
+    Fix qemu-dm paths so Xen can be used with libvirt.
+    (LP: #914788)
+
+ -- Chuck Short <[e-mail]>  Wed, 18 Jan 2012 14:31:27 -0500
+
+libvirt (0.9.8-2ubuntu1) precise; urgency=low
+
+  * Merge from Debian Unstable, remaining changes are: 
+    - debian/control:
+      * set X-Python-Version to 2.7, as 2.6 is not in oneiric.
+      * set ubuntu maintainer
+      * Build-Depends:
+        - swap  open-iscsi to open-iscsi-utils
+        - remove virtualbox-ose
+        - add libapparmor-dev
+        - swap libnl-dev for libnl3-dev
+      * convert Vcs-Git to Xs-Debian-Vcs-Git
+      * libvirt-bin Depends: move netcat-openbsd, bridge-utils, dnsmasq-base
+        (>= 2.46-1), and iptables from Recommends to Depends
+      * libvirt-bin Recommends: move qemu to Suggests
+      * libvirt-bin Suggests: add apparmor
+      * libvirt0 Recommends: move lvm2 to Suggests
+      * Install cgroup-lite
+    - keep debian/libvirt-bin.apport
+    - keep debian/libvirt-bin.cron.daily
+    - debian/libvirt-bin.dirs:
+      * add apparmor, cron.daily, and apport dirs
+    - debian/libvirt-bin.examples:
+      * add debian/libvirt-suspendonreboot
+    - debian/libvirt-bin.install:
+      * add /etc/apparmor.d files
+      * add apport hook
+    - debian/libvirt-bin.postinst:
+      * replace libvirt groupname with libvirtd
+      * add each admin user to libvirtd group
+      * call apparmor_parser on usr.sbin.libvirtd and
+        usr.lib.libvirt.virt-aa-helper
+      * call 'libvirt-migrate-qemu-disks -a' after
+        libvirt-bin has started if migrating from
+        older than 0.8.3-1ubuntu1
+    - debian/libvirt-bin.postrm:
+      * replace libvirt groupname with libvirtd
+      * remove usr.sbin.libvirtd and
+        usr.lib.libvirt.virt-aa-helper
+    - keep added files under debian/:
+      * libvirt-bin.upstart
+      * libvirt-migrate-qemu-disks
+      * libvirt-migrate-qemu-disks.1
+      * libvirt-suspendonreboot
+      * apparmor profiles
+    - debian/README.Debian:
+      * add 'Apparmor Profile' section
+      * add 'Disk migration' section
+    - debian/rules:
+      * don't build with vbox since virtualbox-ose is in universe
+        - remove WITH_VBOX, add explicit --without-vbox
+      * add --with-apparmor to DEB_CONFIGURE_EXTRA_FLAGS
+      * set DEB_DH_INSTALLINIT_ARGS to '--upstart-only'
+      * remove unneeded clean:: section (they only deal with sysvinit stuff)
+      * comment out binary-install/libvirt-bin:: part dealing with sysvinit
+      * dont ship libvirt-guests init script for now.
+      * add build/libvirt-bin:: section to install
+        - apparmor files
+        - apport hooks
+        - libvirt-migrate-qemu-disks
+  * debian/patches/series:
+    - don't apply Debian-specific Debianize-libvirt-guests.patch (sysvinit only)
+    - don't apply Disable qemu-disable-network.diff.patch
+  * debian/patches(/ubuntu):
+    - Disable-gnulib-s-test-nonplocking-pipe.sh.patch is in sid's debian/patches
+    - drop patches:
+      * 9000-delayed_iff_up_bridge.patch
+      * 9011-move-ebtables-script.patch
+      * apparmor-allow-tunnelled-migration.patch
+      * apparmor-allow-tunnelled-migration-2.patch
+      * fix-qemu-1.0.patch
+      * conf-dont-drop-console-def-ondomain-restart.patch
+    - keep (and refreshed) patches:
+      * 9002-better_default_uri_virsh.patch
+      * 9003-better-default-arch.patch
+      * 9004-libvirtd-group-name.patch
+      * 9005-increase-unix-socket-timeout.patch
+      * 9006-default-config-test-case.patch
+      * 9020-lp545795.patch
+      * 9021-fix-uint64_t.patch
+      * libnl3.patch
+      * arm-gcc-workaround.patch
+  * disable numa - until the MIR for numa is done
+    - debian/control: remove from dependencies
+    - debian/rules: turn it off
+  * Fix default network autostart symlink disappearing on upgrade (LP: #901298)
+    - debian/libvirt-bin.preinst: note if the symlink exists
+    - debian/libvirt-bin.postinst: if symlink existed, OR if we are upgrading
+      from one of the broken versions, then recreate the symlink.  (Continue
+      to create the symlink on new installs.)
+   * enable use of libvirt with kvm-spice (LP: #903962):
+    . src/qemu/qemu_capabilities.c: search for 'kvm-spice' before
+      'kvm' (debian/patches/ubuntu/enable-kvm-spice.patch)
+    . debian/apparmor/libvirt-qemu:
+      * prepend 'owner' to /run/shm/spice.* rule
+      * add more needed spice perms 
+
+ -- Chuck Short <[e-mail]>  Fri, 13 Jan 2012 15:11:48 +0100
+
+>>>>>>> debian/changelog
 libvirt (0.9.8-2) unstable; urgency=low
 
   * Upload to unstable. Works with qemu-kvm and qemu 1.0.
@@ -2267,17 +6209,240 @@ libvirt (0.9.8~rc2-1) experimental; urgency=low
 
  -- Guido Günther <[e-mail]>  Sun, 04 Dec 2011 13:58:31 +0100
 
-libvirt (0.9.8~rc1-1) experimental; urgency=low
+libvirt (0.9.8~rc1-1) experimental; urgency=low
+
+  * [99476ba] New upstream version 0.9.8~rc1
+  * [3bdcf07] Make radvd a linux-any build-dep (Closes: #649635)
+  * [7546785] Drop patch storage-forbid-rebuilding-existing-disk-storage-pool
+    applied upstream.
+  * [0c2afdb] Rediff remaining patches
+  * [3d121b2] Update symbols file
+
+ -- Guido Günther <[e-mail]>  Sat, 03 Dec 2011 14:49:49 +0100
+
+<<<<<<< debian/changelog
+=======
+libvirt (0.9.7-2ubuntu16) precise; urgency=low
+
+  * Don't apply ubuntu/conf-dont-drop-console-def-ondomain-restart.patch:
+    it breaks virt-manager.
+
+ -- Serge Hallyn <[e-mail]>  Fri, 13 Jan 2012 14:59:03 +0100
+
+libvirt (0.9.7-2ubuntu15) precise; urgency=low
+
+  * debian/patches/ubuntu/conf-dont-drop-console-def-ondomain-restart.patch:
+    cherrypicked from upstream to fix 'virsh console'.  (LP: #915355)
+
+ -- Serge Hallyn <[e-mail]>  Thu, 12 Jan 2012 23:47:09 +0100
+
+libvirt (0.9.7-2ubuntu14) precise; urgency=low
+
+  * debian/apparmor/usr.lib.libvirt.virt-aa-helper: Update for nova.
+    (LP: #907269) 
+
+ -- Chuck Short <[e-mail]>  Wed, 11 Jan 2012 09:50:26 -0500
+
+libvirt (0.9.7-2ubuntu13) precise; urgency=low
+
+  * move cgroup-lite | cgroup-bin to depends, now that cgroup-lite is in
+    main.
+
+ -- Serge Hallyn <[e-mail]>  Wed, 11 Jan 2012 14:02:40 +0100
+
+libvirt (0.9.7-2ubuntu12) precise; urgency=low
+
+  * enable use of libvirt with kvm-spice (LP: #903962):
+    . src/qemu/qemu_capabilities.c: search for 'kvm-spice' before
+      'kvm' (debian/patches/ubuntu/enable-kvm-spice.patch)
+    . debian/apparmor/libvirt-qemu:
+      * prepend 'owner' to /run/shm/spice.* rule
+      * add more needed spice perms
+  * move cgroup-lite | cgroup-bin to depends, now that cgroup-lite is in
+    main.
+
+ -- Serge Hallyn <[e-mail]>  Tue, 10 Jan 2012 12:06:13 +0100
+
+libvirt (0.9.7-2ubuntu11) precise; urgency=low
+
+  * debian/control: Revert cgroup-lite | cgroup-bin move from suggests to
+    depends: cgroup-lite is not in main.
+
+ -- Serge Hallyn <[e-mail]>  Mon, 09 Jan 2012 12:16:17 +0100
+
+libvirt (0.9.7-2ubuntu10) precise; urgency=low
+
+  * debian/control: move (cgroup-lite | cgroup-bin) from Suggests to Depends.
+    Libvirt-lxc is broken without it.
+  * apparmor/usr.lib.libvirt.virt-aa-helper: add 'deny /dev/dm-*' to silence
+    warnings about lvm backing stores (LP: #912007)
+  [ Peter Silva ]
+  * apparmor/libvirt-qemu: add rules to enable spice audio
+    (LP: #913023)
+
+ -- Serge Hallyn <[e-mail]>  Mon, 09 Jan 2012 10:15:57 +0100
+
+libvirt (0.9.7-2ubuntu9) precise; urgency=low
+
+  * Build-Depend on libnl-3-dev. (LP: #908581)
+  * Update libnl3 patch to also pass LIBNL_CFLAGS in the LXC target.
+
+ -- Andreas Moog <[e-mail]>  Wed, 04 Jan 2012 21:56:55 +0000
+
+libvirt (0.9.7-2ubuntu8) precise; urgency=low
+
+  * debian/apparmor/libvirt-qemu: add /etc/pki/CA/* and /etc/pki/libvirt/**
+    (LP: #901272)
+
+ -- Serge Hallyn <[e-mail]>  Wed, 04 Jan 2012 13:18:50 -0600
+
+libvirt (0.9.7-2ubuntu7) precise; urgency=low
+
+  * Fix default network autostart symlink disappearing on upgrade (LP: #901298)
+    - debian/libvirt-bin.preinst: note if the symlink exists
+    - debian/libvirt-bin.postinst: if symlink existed, OR if we are upgrading
+      from one of the broken versions, then recreate the symlink.  (Continue
+      to create the symlink on new installs.)
+  * debian/patches/fix-qemu-1.0.patch: without this patch, libvirt fails
+    when trying to parse the version # from qemu 1.0.
 
-  * [99476ba] New upstream version 0.9.8~rc1
-  * [3bdcf07] Make radvd a linux-any build-dep (Closes: #649635)
-  * [7546785] Drop patch storage-forbid-rebuilding-existing-disk-storage-pool
-    applied upstream.
-  * [0c2afdb] Rediff remaining patches
-  * [3d121b2] Update symbols file
+ -- Serge Hallyn <[e-mail]>  Wed, 07 Dec 2011 10:26:05 -0600
 
- -- Guido Günther <[e-mail]>  Sat, 03 Dec 2011 14:49:49 +0100
+libvirt (0.9.7-2ubuntu6) precise; urgency=low
 
+  * debian/rules, libvirt-bin.dirs and libvirt-bin.install: put
+    /etc/apparmor.d/local/usr.sbin.libvirtd into place.  (fixes break since
+    0.9.7-2ubuntu4)  (LP: #900857)
+
+ -- Serge Hallyn <[e-mail]>  Tue, 06 Dec 2011 11:03:16 -0600
+
+libvirt (0.9.7-2ubuntu5) precise; urgency=low
+
+  * Fix compile failure (VIR_WARN needs logging.h)
+
+ -- Serge Hallyn <[e-mail]>  Fri, 02 Dec 2011 13:50:12 -0600
+
+libvirt (0.9.7-2ubuntu4) precise; urgency=low
+
+  * debian/apparmor/usr.sbin.libvirtd:
+    - allow access to /etc/libvirt/hooks/** (LP: #891472)
+    - #include <local/usr.sbin.libvirtd> for site-local customizations
+  * debian/control: Suggest cgroup-lite | cgroup-bin (LP: #544146)
+  * debian/patches/ubuntu/apparmor-allow-tunnelled-migration-2.patch:
+    Warn but don't error out when we can't find a pathname for a file.
+    This is needed to support tunnelled migration.  (LP: #869553)
+
+ -- Serge Hallyn <[e-mail]>  Fri, 02 Dec 2011 11:50:47 -0600
+
+libvirt (0.9.7-2ubuntu3) precise; urgency=low
+
+  * Don't override local removal of default network autostart on upgrades
+    (LP: #372001)
+    - re-enable debian/Don-t-enable-default-network-on-boot.patch
+    - debian/libvirt-bin.postinst: create default network autostart symlink
+      for new installs only.
+
+ -- Serge Hallyn <[e-mail]>  Thu, 01 Dec 2011 21:55:01 +0000
+
+libvirt (0.9.7-2ubuntu2) precise; urgency=low
+
+  * apparmor-allow-tunnelled-migration.patch: adjust virt-aa-helper to
+    allow tunnelled migration (LP: #869553)
+    (Thanks to Simon Deziel <[e-mail]>)
+  * fix break in last upload: *really* don't apply patch
+    debian/Don-t-enable-default-network-on-boot.patch
+
+ -- Serge Hallyn <[e-mail]>  Fri, 18 Nov 2011 15:52:38 -0600
+
+libvirt (0.9.7-2ubuntu1) precise; urgency=low
+
+  * Merged from debian unstable (LP: #889104) (LP: #890036).
+    Remaining changes are:
+    - debian/control:
+      * set X-Python-Version to 2.7, as 2.6 is not in oneiric.
+      * set ubuntu maintainer
+      * Build-Depends:
+        - swap  open-iscsi to open-iscsi-utils
+        - remove virtualbox-ose
+        - add libapparmor-dev
+        - swap libnl-dev for libnl3-dev
+      * convert Vcs-Git to Xs-Debian-Vcs-Git
+      * libvirt-bin Depends: move netcat-openbsd, bridge-utils, dnsmasq-base
+        (>= 2.46-1), and iptables from Recommends to Depends
+      * libvirt-bin Recommends: move qemu to Suggests
+      * libvirt-bin Suggests: add apparmor
+      * libvirt0 Recommends: move lvm2 to Suggests
+    - keep debian/libvirt-bin.apport
+    - keep debian/libvirt-bin.cron.daily
+    - debian/libvirt-bin.dirs:
+      * add apparmor, cron.daily, and apport dirs
+    - debian/libvirt-bin.examples:
+      * add debian/libvirt-suspendonreboot
+    - debian/libvirt-bin.install:
+      * add /etc/apparmor.d files
+      * add apport hook
+    - debian/libvirt-bin.postinst:
+      * replace libvirt groupname with libvirtd
+      * add each admin user to libvirtd group
+      * call apparmor_parser on usr.sbin.libvirtd and
+        usr.lib.libvirt.virt-aa-helper
+      * call 'libvirt-migrate-qemu-disks -a' after
+        libvirt-bin has started if migrating from
+        older than 0.8.3-1ubuntu1
+    - debian/libvirt-bin.postrm:
+      * replace libvirt groupname with libvirtd
+      * remove usr.sbin.libvirtd and
+        usr.lib.libvirt.virt-aa-helper
+    - keep added files under debian/:
+      * libvirt-bin.upstart
+      * libvirt-migrate-qemu-disks
+      * libvirt-migrate-qemu-disks.1
+      * libvirt-suspendonreboot
+      * apparmor profiles
+    - debian/README.Debian:
+      * add 'Apparmor Profile' section
+      * add 'Disk migration' section
+    - debian/rules:
+      * don't build with vbox since virtualbox-ose is in universe
+        - remove WITH_VBOX, add explicit --without-vbox
+      * add --with-apparmor to DEB_CONFIGURE_EXTRA_FLAGS
+      * set DEB_DH_INSTALLINIT_ARGS to '--upstart-only'
+      * remove unneeded clean:: section (they only deal with sysvinit stuff)
+      * comment out binary-install/libvirt-bin:: part dealing with sysvinit
+      * dont ship libvirt-guests init script for now.
+      * add build/libvirt-bin:: section to install
+        - apparmor files
+        - apport hooks
+        - libvirt-migrate-qemu-disks
+  * debian/patches/series:
+    - don't apply Debian-specific Debianize-libvirt-guests.patch (sysvinit only)
+    - don't apply Disable qemu-disable-network.diff.patch
+  * debian/patches(/ubuntu):
+    - Disable-gnulib-s-test-nonplocking-pipe.sh.patch is in sid's debian/patches
+    - drop patches:
+      * 9014-skip-nodeinfotest.patch # should this be dropped?
+      * lp832507.patch (applied upstream)
+      * 9029-skip-tests.patch
+      * lxc-use-own-ptyfns.patch (applied upstream)
+    - keep (and refreshed) patches:
+      * 9000-delayed_iff_up_bridge.patch
+      * 9002-better_default_uri_virsh.patch
+      * 9003-better-default-arch.patch
+      * 9004-libvirtd-group-name.patch
+      * 9005-increase-unix-socket-timeout.patch
+      * 9006-default-config-test-case.patch
+      * 9011-move-ebtables-script.patch
+      * 9020-lp545795.patch
+      * 9021-fix-uint64_t.patch
+      * libnl3.patch
+      * arm-gcc-workaround.patch
+  * disable numa - until the MIR for numa is done
+    - debian/control: remove from dependencies
+    - debian/rules: turn it off
+
+ -- Serge Hallyn <[e-mail]>  Tue, 15 Nov 2011 21:33:16 -0600
+
+>>>>>>> debian/changelog
 libvirt (0.9.7-2) unstable; urgency=low
 
   * [b0bdb13] Enable numa support. (Closes: #648323)
@@ -2326,7 +6491,28 @@ libvirt (0.9.7~rc1-1) experimental; urgency=low
   * [fb8aed9] Update remaining patches
   * [1f841c0] Move Debian specific patches to debian/patches/debian
 
+<<<<<<< debian/changelog
  -- Guido Günther <[e-mail]>  Wed, 02 Nov 2011 10:04:40 +0100
+=======
+ -- Guido Günther <[e-mail]>  Wed, 02 Nov 2011 10:04:40 +0100
+
+libvirt (0.9.6-2ubuntu2) precise; urgency=low
+
+  * Move creation of /var/log/libvirt/{lxc,uml,qemu} dirs from libvirt-bin.dirs
+    to libvirt-bin.postinst.  Otherwise after a 'apt-get remove libvirt-bin',
+    that dir will be removed (if empty) but /etc/logrotate.d/libvirtd will 
+    still try to rotate it and raise errors. (LP: #886770)
+  * debian/rules: Fix a bug in the new logic for installing upstream-supplied
+    logrotate files.  (LP: #887312)
+
+ -- Serge Hallyn <[e-mail]>  Mon, 07 Nov 2011 12:58:49 -0600
+
+libvirt (0.9.6-2ubuntu1) precise; urgency=low
+
+  * Sync changes from 0.9.6-2 to install the libvirtd manpage (LP: #522710)
+
+ -- Serge Hallyn <[e-mail]>  Mon, 31 Oct 2011 22:22:27 -0400
+>>>>>>> debian/changelog
 
 libvirt (0.9.6-2) unstable; urgency=low
 
@@ -2341,6 +6527,124 @@ libvirt (0.9.6-2) unstable; urgency=low
 
  -- Guido Günther <[e-mail]>  Sun, 30 Oct 2011 17:14:21 +0100
 
+<<<<<<< debian/changelog
+=======
+libvirt (0.9.6-1ubuntu3) precise; urgency=low
+
+  * debian/control: - add radvd to build-depends (LP: #862136)
+  * debian/control: remove moved relations from original:
+    - libvirt-bin Depends: move netcat-openbsd, bridge-utils, dnsmasq-base
+      (>= 2.46-1), and iptables from Recommends to Depends
+    - libvirt-bin Recommends: move qemu to Suggests
+
+ -- Serge Hallyn <[e-mail]>  Mon, 24 Oct 2011 08:54:14 -0500
+
+libvirt (0.9.6-1ubuntu2) precise; urgency=low
+
+  * debian/patches/lxc-use-own-ptyfns.patch: Re-add dropped patch. 
+
+ -- Chuck Short <[e-mail]>  Fri, 21 Oct 2011 10:30:36 -0400
+
+libvirt (0.9.6-1ubuntu1) precise; urgency=low
+
+  * Merged from debian unstable, remaning changes are:
+    - debian/control:
+      * set X-Python-Version to 2.7, as 2.6 is not in oneiric.
+      * set ubuntu maintainer
+      * Build-Depends:
+        - remove [linux-any] from all dependencies
+        - remove [!linux-any] deps
+        - swap  qemu to qemu-kvm and open-iscsi to
+          open-iscsi-utils in Build-Depends
+        - remove virtualbox-ose Build-Depends
+        - add parted and libapparmor-dev Build-Depends
+      * convert Vcs-Git to Xs-Debian-Vcs-Git
+      * libvirt-bin Depends: move netcat-openbsd, bridge-utils, dnsmasq-base
+        (>= 2.46-1), and iptables from Recommends to Depends
+      * libvirt-bin Recommends: move qemu to Suggests
+      * libvirt-bin Suggests: add apparmor
+      * libvirt0 Recommands: move lvm2 to Suggests
+    - keep debian/libvirt-bin.apport
+    - keep debian/libvirt-bin.cron.daily
+    - debian/libvirt-bin.dirs:
+      * add apparmor, cron.daily, and apport dirs
+    - debian/libvirt-bin.examples:
+      * add debian/libvirt-suspendonreboot
+    - debian/libvirt-bin.install:
+      * add /etc/apparmor.d files
+      * add apport hook
+    - debian/libvirt-bin.manpages:
+      * add debian/libvirt-migrate-qemu-disks.1
+    - debian/libvirt-bin.postinst:
+      * replace libvirt groupname with libvirtd
+      * add each admin user to libvirtd group
+      * call apparmor_parser on usr.sbin.libvirtd and
+        usr.lib.libvirt.virt-aa-helper
+      * call 'libvirt-migrate-qemu-disks -a' after
+        libvirt-bin has started if migrating from
+        older than 0.8.3-1ubuntu1
+    - debian/libvirt-bin.postrm:
+      * replace libvirt groupname with libvirtd
+      * remove usr.sbin.libvirtd and
+        usr.lib.libvirt.virt-aa-helper
+    - keep added files under debian/:
+      * libvirt-bin.upstart
+      * libvirt-migrate-qemu-disks
+      * libvirt-migrate-qemu-disks.1
+      * libvirt-suspendonreboot
+      * apparmor profiles
+    - debian/README.Debian:
+      * add 'Apparmor Profile' section
+      * add 'Disk migration' section
+    - debian/rules:
+      * move include of debhelper.mk to top of file so DEB_HOST_ARCH_OS
+        is defined.
+      * don't build with vbox since virtualbox-ose is in universe
+        - remove WITH_VBOX, add explicit --without-vbox
+      * add --with-apparmor to DEB_CONFIGURE_EXTRA_FLAGS
+      * set DEB_DH_INSTALLINIT_ARGS to '--upstart-only'
+      * remove unneeded binary-install/libvirt-bin:: and clean::
+        sections (they only deal with sysvinit stuff)
+      * add build/libvirt-bin:: section to install
+        - apparmor files
+        - apport hooks
+        - libvirt-migrate-qemu-disks
+      * dont ship libvirt-guests init script for now.
+  * debian/patches/9029-skip-tests.patch: Skip broken tests on ubuntu.
+  * debian/patches/series:
+    - don't apply Debian-specific Debianize-libvirt-guests.patch (sysvinit only)
+    - don't apply Disable qemu-disable-network.diff.patch
+  * debian/patches:
+    - dropped patches:
+      * 9001-dont_clobber_existing_bridges.patch
+      * 9026-lp795800.patch
+      * 9027-move-apparmor-load-to-genlabel.patch
+      * 9028-linux-3-0-no-micro.patch
+      * lp810270.patch
+      * CVE-2011-2511.patch
+      * lxc-do-not-require-ifconfig-or-ip-commands-in-guest.patch
+      * 0001-make-ptmx-a-bind-mount-rather-than-symlink.patch
+      * arm-startup-fixes.patch
+    - keep patches:
+      * 9000-delayed_iff_up_bridge.patch
+      * 9001-dont_clobber_existing_bridges.patch
+      * 9002-better_default_uri_virsh.patch
+      * 9003-better-default-arch.patch
+      * 9004-libvirtd-group-name.patch
+      * 9005-increase-unix-socket-timeout.patch
+      * 9006-default-config-test-case.patch
+      * 9011-move-ebtables-script.patch
+      * 9014-skip-nodeinfotest.patch
+      * 9020-lp545795.patch
+      * 9021-fix-uint64_t.patch
+      * 9026-lp795800.patch
+      * libnl3.patch
+      * arm-gcc-workaround.patch
+      * Disable-gnulib-s-test-nonplocking-pipe.sh.patch
+
+ -- Chuck Short <[e-mail]>  Mon, 17 Oct 2011 12:19:15 +0000
+
+>>>>>>> debian/changelog
 libvirt (0.9.6-1) unstable; urgency=low
 
   * [828e4e3] New upstream version 0.9.6
@@ -2457,6 +6761,228 @@ libvirt (0.9.2-5) unstable; urgency=low
 
  -- Guido Günther <[e-mail]>  Sun, 26 Jun 2011 15:57:24 +0200
 
+<<<<<<< debian/changelog
+=======
+libvirt (0.9.2-4ubuntu16) precise; urgency=low
+
+  * lxc_controller: use our own unlocpt+grantpt rather than glibc's, which
+    can't handle opening a pty in a devpts not mounted at /dev/pts.
+    (LP: #863629)
+
+ -- Serge Hallyn <[e-mail]>  Fri, 14 Oct 2011 10:47:57 -0500
+
+libvirt (0.9.2-4ubuntu15) oneiric; urgency=low
+
+  * Pull patches from upstream which prevent a race between lxc driver and
+    controller while a container is started, easily exposed by nova.
+    (LP: #842845)
+
+ -- Serge Hallyn <[e-mail]>  Mon, 03 Oct 2011 14:39:05 -0500
+
+libvirt (0.9.2-4ubuntu14) oneiric; urgency=low
+
+  * debian/patches/lp832507.patch: update virt-aa-helper to use the correct
+    paths for character devices that are pipes. This can be removed in
+    0.9.7. (LP: #832507)
+
+ -- Jamie Strandboge <[e-mail]>  Tue, 27 Sep 2011 13:18:28 -0500
+
+libvirt (0.9.2-4ubuntu13) oneiric; urgency=low
+
+  * debian/patches/arm-startup-fies.patch: Fix typo in patch. 
+    (LP: #845764) 
+
+ -- Chuck Short <[e-mail]>  Fri, 09 Sep 2011 14:41:53 -0400
+
+libvirt (0.9.2-4ubuntu12) oneiric; urgency=low
+
+  [Serge Hallyn]
+  * do not rely on 'ip' or 'ifconfig' commands inside container (LP: #828211)
+    Reported and fixed by Scott Moser <[e-mail]>.
+  * make ptmx a bind mount rather than a symlink (LP: #832123)
+
+  [Chuck Short]
+  * debian/arm-startup-fixes.patch: Dont detect DMI information on non-intel
+    compatible arches.
+
+ -- Serge Hallyn <[e-mail]>  Thu, 01 Sep 2011 09:25:51 -0500
+
+libvirt (0.9.2-4ubuntu11) oneiric; urgency=low
+
+  * debian/patches/Autodetect-if-the-remote-nc-command-supports-the-q-o.patch:
+    updated to support target systems where the grep utility has no -q
+    option. (LP: #792985)
+
+ -- Marc Deslauriers <[e-mail]>  Tue, 16 Aug 2011 13:30:14 -0400
+
+libvirt (0.9.2-4ubuntu10) oneiric; urgency=low
+
+  * Source /etc/default/libvirt-bin at the upstart 'start' section (LP: #823638)
+
+ -- Serge Hallyn <[e-mail]>  Mon, 15 Aug 2011 13:00:41 -0500
+
+libvirt (0.9.2-4ubuntu9) oneiric; urgency=low
+
+  * Fix build failure on ARM, working around a GCC issue. LP: #823711.
+
+ -- Matthias Klose <[e-mail]>  Mon, 15 Aug 2011 16:00:53 +0200
+
+libvirt (0.9.2-4ubuntu8) oneiric; urgency=low
+
+  * Port to libnl3.
+
+ -- Colin Watson <[e-mail]>  Tue, 09 Aug 2011 11:36:08 +0100
+
+libvirt (0.9.2-4ubuntu7) oneiric; urgency=low
+
+  * libvirt-bin.upstart: add a pre-stop script to shut down running VMs
+    before the host shuts down.  (LP: #350936)
+
+ -- Serge Hallyn <[e-mail]>  Tue, 02 Aug 2011 19:49:40 -0500
+
+libvirt (0.9.2-4ubuntu6) oneiric; urgency=low
+
+  * SECURITY UPDATE: integer overflow in virDomainGetVcpus()
+    - debian/patches/CVE-2011-2511.patch: use INT_MULTIPLY_OVERFLOW() to
+      verify maxinfo * maplen < REMOTE_CPUMAPS_MAX
+    - this can be dropped in 0.9.2-7/0.9.3
+    - CVE-2011-2511
+
+ -- Jamie Strandboge <[e-mail]>  Tue, 19 Jul 2011 08:20:20 -0500
+
+libvirt (0.9.2-4ubuntu5) oneiric; urgency=low
+
+  * debian/libvirt-bin.apport: use new apport MAC function instead of
+    parsing and attaching AppArmor events here.
+
+ -- Marc Deslauriers <[e-mail]>  Fri, 15 Jul 2011 08:36:56 -0400
+
+libvirt (0.9.2-4ubuntu4) oneiric; urgency=low
+
+  * debian/apparmor/libvirt-qemu: adjust for /dev/shm -> /run/shm transition
+  * debian/patches/lp810270.patch: adjust AppArmor profile for /var/run ->
+    /run
+    - LP: #810270
+
+ -- Jamie Strandboge <[e-mail]>  Thu, 14 Jul 2011 08:46:32 -0500
+
+libvirt (0.9.2-4ubuntu3) oneiric; urgency=low
+
+  * Fix /etc/init/libvirt-bin.conf start on to wait until networking.conf
+    has stopped with success, meaning ifup -a completed successfully and
+    all auto-started network devices are up.  (LP: #495394)
+
+ -- Serge Hallyn <[e-mail]>  Thu, 07 Jul 2011 10:23:25 -0500
+
+libvirt (0.9.2-4ubuntu2) oneiric; urgency=low
+
+  [ Scott Moser ]
+  * 9028-linux-3-0-no-micro.patch: support running libvirt with lxc on linux
+    3.0 (LP: #802977)
+
+  [ Jamie Strandboge ]
+  * debian/apparmor/usr.sbin.libvirtd: allow ipc_lock
+
+ -- Scott Moser <[e-mail]>  Tue, 28 Jun 2011 10:00:54 -0400
+
+libvirt (0.9.2-4ubuntu1) oneiric; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    - debian/control:
+      * set X-Python-Version to 2.7, as 2.6 is not in oneiric.
+      * set ubuntu maintainer
+      * Build-Depends:
+        - remove [linux-any] from all dependencies
+        - remove [!linux-any] deps
+        - swap  qemu to qemu-kvm and open-iscsi to
+          open-iscsi-utils in Build-Depends
+        - remove virtualbox-ose Build-Depends
+        - add parted and libapparmor-dev Build-Depends
+      * convert Vcs-Git to Xs-Debian-Vcs-Git
+      * libvirt-bin Depends: move netcat-openbsd, bridge-utils, dnsmasq-base
+        (>= 2.46-1), and iptables from Recommends to Depends
+      * libvirt-bin Recommends: move qemu to Suggests
+      * libvirt-bin Suggests: add apparmor
+      * libvirt0 Recommands: move lvm2 to Suggests
+    - keep debian/libvirt-bin.apport
+    - keep debian/libvirt-bin.cron.daily
+    - debian/libvirt-bin.dirs:
+      * add apparmor, cron.daily, and apport dirs
+    - debian/libvirt-bin.examples:
+      * add debian/libvirt-suspendonreboot
+    - debian/libvirt-bin.install:
+      * add /etc/apparmor.d files
+      * add apport hook
+    - debian/libvirt-bin.manpages:
+      * add debian/libvirt-migrate-qemu-disks.1
+    - debian/libvirt-bin.postinst:
+      * replace libvirt groupname with libvirtd
+      * add each admin user to libvirtd group
+      * call apparmor_parser on usr.sbin.libvirtd and
+        usr.lib.libvirt.virt-aa-helper
+      * call 'libvirt-migrate-qemu-disks -a' after
+        libvirt-bin has started if migrating from
+        older than 0.8.3-1ubuntu1
+    - debian/libvirt-bin.postrm:
+      * replace libvirt groupname with libvirtd
+      * remove usr.sbin.libvirtd and
+        usr.lib.libvirt.virt-aa-helper
+    - keep added files under debian/:
+      * libvirt-bin.upstart
+      * libvirt-migrate-qemu-disks
+      * libvirt-migrate-qemu-disks.1
+      * libvirt-suspendonreboot
+      * apparmor profiles
+    - debian/README.Debian:
+      * add 'Apparmor Profile' section
+      * add 'Disk migration' section
+    - debian/rules:
+      * move include of debhelper.mk to top of file so DEB_HOST_ARCH_OS
+        is defined.
+      * don't build with vbox since virtualbox-ose is in universe
+        - remove WITH_VBOX, add explicit --without-vbox
+      * add --with-apparmor to DEB_CONFIGURE_EXTRA_FLAGS
+      * set DEB_DH_INSTALLINIT_ARGS to '--upstart-only'
+      * remove unneeded binary-install/libvirt-bin:: and clean::
+        sections (they only deal with sysvinit stuff)
+      * add build/libvirt-bin:: section to install
+        - apparmor files
+        - apport hooks
+        - libvirt-migrate-qemu-disks
+  * debian/patches/series:
+    - don't apply Debian-specific Debianize-libvirt-guests.patch (sysvinit only)
+    - don't apply Disable qemu-disable-network.diff.patch
+  * debian/patches:
+    - dropped patches:
+      * 9022-allows-lxc-containers-with-lxcguest.patch (applied upstream)
+      * 9023-disable-test-poll.patch
+      * 9024-ftbfs-with-arm.patch (doesnt really fix arm just yet)
+      * 9025-CVE-2011-2178.patch (applied upstream)
+    - keep patches:
+      * 9000-delayed_iff_up_bridge.patch
+      * 9001-dont_clobber_existing_bridges.patch
+      * 9002-better_default_uri_virsh.patch
+      * 9003-better-default-arch.patch
+      * 9004-libvirtd-group-name.patch
+      * 9005-increase-unix-socket-timeout.patch
+      * 9006-default-config-test-case.patch
+      * 9011-move-ebtables-script.patch
+      * 9014-skip-nodeinfotest.patch
+      * 9020-lp545795.patch
+      * 9021-fix-uint64_t.patch
+      * 9026-lp795800.patch
+
+  [ Jamie Strandboge ]
+  * 9027-move-apparmor-load-to-genlabel.patch: 0.9.2 introduced a change that
+    caused aa_change_profile() to be called before the profile was loaded into
+    the kernel. Adjust AppArmorGenSecurityLabel() in
+    src/security/security_apparmor.c to load the profile itself, and adjust
+    AppArmorSetSecurityAllLabel() to reload the profile when stdin_fn is
+    specified. This patch can be removed in 0.9.3. (LP: #801569)
+
+ -- Chuck Short <[e-mail]>  Wed, 22 Jun 2011 11:09:15 -0400
+
+>>>>>>> debian/changelog
 libvirt (0.9.2-4) unstable; urgency=low
 
   * [398a4dd] New patch Split-out-dlopen-detection.patch.  Explicitly pass
@@ -2505,6 +7031,133 @@ libvirt (0.9.1-2) unstable; urgency=high
 
  -- Laurent Léonard <[e-mail]>  Sat, 04 Jun 2011 01:53:43 +0200
 
+<<<<<<< debian/changelog
+=======
+libvirt (0.9.1-1ubuntu4) oneiric; urgency=low
+
+  * SECURITY UPDATE: 0.8.8 regression which reopens disk probing
+    (CVE-2010-2238). This can be dropped in 0.9.2.
+    - 9025-CVE-2011-2178.patch: use correct pointer address in
+      virSecurityManagerGetPrivateData()
+    - CVE-2011-2178
+  * fix virsh save when AppArmor driver is enabled
+    - 9026-lp795800.patch: src/security/security_apparmor.c: implement
+      AppArmorSetFDLabel(), which is now used by qemuMigrationToFile() if
+      our version of qemu supports fd migraton. This can be dropped in 0.9.3.
+    - LP: #795800
+
+ -- Jamie Strandboge <[e-mail]>  Thu, 16 Jun 2011 14:16:00 -0500
+
+libvirt (0.9.1-1ubuntu3) oneiric; urgency=low
+
+  * debian/patches/9024-ftbfs-with-arm.patch: Fix FTBFS with arm.
+
+ -- Chuck Short <[e-mail]>  Tue, 14 Jun 2011 21:33:15 -0400
+
+libvirt (0.9.1-1ubuntu2) oneiric; urgency=low
+
+  * Depend on libxen-dev rather than libxen3-dev. 
+
+ -- Chuck Short <[e-mail]>  Mon, 13 Jun 2011 12:48:52 -0400
+
+libvirt (0.9.1-1ubuntu1) oneiric; urgency=low
+
+  * Resynchronize and merge from Debian unstable (LP: #794378). Remaining
+    changes:
+    - debian/control:
+      * set X-Python-Version to 2.7, as 2.6 is not in oneiric.
+      * set ubuntu maintainer
+      * Build-Depends:
+        - remove [linux-any] from all dependencies
+        - remove [!linux-any] deps
+        - swap libxen to libxen3, qemu to qemu-kvm, and open-iscsi to
+          open-iscsi-utils in Build-Depends
+        - remove virtualbox-ose Build-Depends
+        - add parted and libapparmor-dev Build-Depends
+      * convert Vcs-Git to Xs-Debian-Vcs-Git
+      * libvirt-bin Depends: move netcat-openbsd, bridge-utils, dnsmasq-base
+        (>= 2.46-1), and iptables from Recommends to Depends
+      * libvirt-bin Recommends: move qemu to Suggests
+      * libvirt-bin Suggests: add apparmor
+      * libvirt0 Recommands: move lvm2 to Suggests
+    - keep debian/libvirt-bin.apport
+    - keep debian/libvirt-bin.cron.daily
+    - debian/libvirt-bin.dirs:
+      * add apparmor, cron.daily, and apport dirs
+    - debian/libvirt-bin.examples:
+      * add debian/libvirt-suspendonreboot
+    - debian/libvirt-bin.install:
+      * add /etc/apparmor.d files
+      * add apport hook
+    - debian/libvirt-bin.manpages:
+      * add debian/libvirt-migrate-qemu-disks.1
+    - debian/libvirt-bin.postinst:
+      * replace libvirt groupname with libvirtd
+      * add each admin user to libvirtd group
+      * call apparmor_parser on usr.sbin.libvirtd and
+        usr.lib.libvirt.virt-aa-helper
+      * call 'libvirt-migrate-qemu-disks -a' after
+        libvirt-bin has started if migrating from
+        older than 0.8.3-1ubuntu1
+    - debian/libvirt-bin.postrm:
+      * replace libvirt groupname with libvirtd
+      * remove usr.sbin.libvirtd and
+        usr.lib.libvirt.virt-aa-helper
+    - keep added files under debian/:
+      * libvirt-bin.upstart
+      * libvirt-migrate-qemu-disks
+      * libvirt-migrate-qemu-disks.1
+      * libvirt-suspendonreboot
+      * apparmor profiles
+    - debian/README.Debian:
+      * add 'Apparmor Profile' section
+      * add 'Disk migration' section
+    - debian/rules:
+      * move include of debhelper.mk to top of file so DEB_HOST_ARCH_OS
+        is defined.
+      * don't build with vbox since virtualbox-ose is in universe
+        - remove WITH_VBOX, add explicit --without-vbox
+      * add --with-apparmor to DEB_CONFIGURE_EXTRA_FLAGS
+      * set DEB_DH_INSTALLINIT_ARGS to '--upstart-only'
+      * remove unneeded binary-install/libvirt-bin:: and clean::
+        sections (they only deal with sysvinit stuff)
+      * add build/libvirt-bin:: section to install
+        - apparmor files
+        - apport hooks