Merge ~paelzer/ubuntu/+source/virt-manager:merge-virt-manager-2.2.1-focal into ubuntu/+source/virt-manager:debian/sid

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA:
https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3854
Tests: https://bileto.ubuntu.com/excuses/3854/focal.html

I also retested Icons to be ok in Focal (was a problem in the past) and they are good now including XML edit.

Now that much less is left I also took the chance to start upstreaming the remaining delta.
Upstream:
- https://github.com/virt-manager/virt-manager/pull/67
Debian:
- https://salsa.debian.org/libvirt-team/virt-manager/merge_requests/2

Pushed tags to help review:
To ssh://git.launchpad.net/~paelzer/ubuntu/+source/virt-manager
 * [new tag] lp1855256/logical/1%2.2.1-0ubuntu2 -> lp1855256/logical/1%2.2.1-0ubuntu2
 * [new tag] lp1855256/new/debian -> lp1855256/new/debian
 * [new tag] lp1855256/old/debian -> lp1855256/old/debian
 * [new tag] lp1855256/old/ubuntu -> lp1855256/old/ubuntu
 * [new tag] lp1855256/reconstruct/1%2.2.1-0ubuntu2 -> lp1855256/reconstruct/1%2.2.1-0ubuntu2
 * [new tag] lp1855256/split/1%2.2.1-0ubuntu2 -> lp1855256/split/1%2.2.1-0ubuntu2

[Christian Ehrhardt  (paelzer)]

Tests are good, i386 is the usual removal of i386 we see recently.

[Andreas Hasenack (ahasenack)]

I was a bit in doubt about dropping d/p/prefer-qemu.patch. That was added for xenial, 4 years ago, maybe back then those files which would make the default URI be xen were present by default, and nowadays aren't anymore? Maybe just if you install a xen kernel, something a desktop users (where virt-manager runs) wouldn't be doing?

Maybe add a Forwarded dep3 header to mark-libvirt-lxc.patch with https://github.com/virt-manager/virt-manager/pull/67 and update the timestamp?

+1

review: Approve

c5efef4... by Christian Ehrhardt  on 2019-12-06

d/p/mark-libvirt-lxc.patch: update Dep3 header

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

[Christian Ehrhardt  (paelzer)]

Good hint on the updated header, done

Also the upstream PR doesn't look so bad atm, so maybe we can drop it next time.

[Christian Ehrhardt  (paelzer)]

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/virt-manager
 * [new tag] upload/1%2.2.1-3ubuntu1 -> upload/1%2.2.1-3ubuntu1

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading virt-manager_2.2.1-3ubuntu1.dsc: done.
  Uploading virt-manager_2.2.1-3ubuntu1.debian.tar.xz: done.
  Uploading virt-manager_2.2.1-3ubuntu1_source.buildinfo: done.
  Uploading virt-manager_2.2.1-3ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index acbaefe..057bd42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,32 @@
+virt-manager (1:2.2.1-3ubuntu1) focal; urgency=medium
+
+  * Merge with Debian unstable (LP: #1855256). Remaining changes:
+    - Depend on gir1.2-appindicator3-0.1 for appindicator support.
+    - d/p/mark-libvirt-lxc: Clearly mark the LXC connections as being
+      libvirt-lxc, to avoid confusion due to differing features and
+      configurations.
+  * Dropped changes
+    - d/p/add_qemu_binaries.patch: add the actual binary name from the qemu
+      packages so default hypervisor detection works properly on first run.
+      [no more needed, works as-is]
+    - d/p/prefer-qemu.patch: Prefer QEMU as the default URI, even if it's
+      not installed.
+      [no more needed, only affects xen hosts]
+    - d/control: add missing gir1.2-gtksource-4 dependency (LP 1840677)
+      [ in Debian 1:2.2.1-2 ]
+    - update patches for context changes in 2.2
+      [ in Debian 1:2.2.1-1 ]
+    - d/virtinst.install: virtcli got merged with virtinst
+      [ in Debian 1:2.2.1-1 ]
+    - d/control: Drop superfluous python-requests dependency (LP 1825666)
+      [ in Debian 1:2.2.1-1 ]
+    - Merge with new upstream release v2.2
+      [ in Debian 1:2.2.1-1 ]
+    - Merge with new upstream release v2.2.1
+      [ in Debian 1:2.2.1-1 ]
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 05 Dec 2019 12:12:07 +0100
+
 virt-manager (1:2.2.1-3) unstable; urgency=medium
 
   * Add salsa-ci
@@ -26,6 +55,73 @@ virt-manager (1:2.2.1-1) unstable; urgency=medium
 
  -- Guido Günther <[e-mail]>  Thu, 26 Sep 2019 17:30:36 +0200
 
+virt-manager (1:2.2.1-0ubuntu2) eoan; urgency=medium
+
+  * d/control: Drop superfluous python-requests dependency (LP: #1825666)
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 19 Sep 2019 12:14:56 +0200
+
+virt-manager (1:2.2.1-0ubuntu1) eoan; urgency=medium
+
+  * Merge with new upstream release v2.2.1
+    - d/control: add missing gir1.2-gtksource-4 dependency (LP: #1840677)
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 20 Aug 2019 08:39:44 +0200
+
+virt-manager (1:2.2.0-0ubuntu1) eoan; urgency=medium
+
+  * Merge with new upstream release v2.2
+    Amonth other fixes and improvements this fixes
+    LP: #1826856 - KVM: Boot Configuration Override
+    - update patches for context changes in 2.2
+      - d/p/Use-usr-bin-python.patch
+      - d/p/add_qemu_binaries.patch
+      - d/p/mark-libvirt-lxc.patch
+      - d/p/prefer-qemu.patch
+    - d/virtinst.install: virtcli got merged with virtinst
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 26 Jun 2019 14:18:34 +0200
+
+virt-manager (1:2.0.0-3ubuntu1) disco; urgency=medium
+
+  * Merge with Debian unstable (LP: #1784424). Remaining changes:
+    - Depend on gir1.2-appindicator3-0.1 for appindicator support.
+    - d/p/mark-libvirt-lxc: Clearly mark the LXC connections as being
+      libvirt-lxc, to avoid confusion due to differing features and
+      configurations.
+    - d/p/add_qemu_binaries.patch: add the actual binary name from the qemu
+      packages so default hypervisor detection works properly on first run.
+    - d/p/prefer-qemu.patch: Prefer QEMU as the default URI, even if it's
+      not installed.
+  * Dropped changes:
+    - d/control: virtinst needs isoinfo to introspect images. To fix that
+      add a dependency to genisoimage to virtinst (LP: 1763609)
+      [accepted in Debian]
+    - Merge with latest upstream stable release (LP: 1763618):
+      - Fixes potential crash with libxml2 error callbacks
+      - Fixes disk/net/mem VM graphs
+      [part of upstream 2.0.0 release]
+    - d/p/lp-1794315-connection-avoid-failing-on-NoneType.patch: fix a race
+      (worse on slow remote connections) that would break connecting to a
+      remote (LP: 1794315)
+      [accepted upstream]
+    - d/p/lp-1796932-tests-osdict-fix-ordering-issue-with-new-osinfo.patch:
+      fix FTBFS due to self-tests failing with new osinfo (LP: 1796932)
+      [accepted upstream]
+    - d/p/virtinst/9006_fix_path_to_qemu-dm.patch: drop the full path from
+      qemu-dm as already done for hvmloader and pygrub. The Xen tools will
+      handle this and add the missing path.
+      [no more needed as pygrub and hvmloader aren't hardcoded anymore]
+    - d/rules: Set qemu user to libvirt-qemu so appropriate permissions get set.
+      [now fetched as libvirt capability]
+    - Add lsb-release to Build-Depends so we can detect whether we're running
+      on Ubuntu or Debian.
+      [no more needed]
+    - d/rules: Set the preferred distro so we appear first in the list.
+      [upstream dropped the option to prefer, due to the search based OS list]
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 23 Jan 2019 11:47:54 +0100
+
 virt-manager (1:2.0.0-3) unstable; urgency=medium
 
   * Mark autopkgtest scripts executable
@@ -68,6 +164,62 @@ virt-manager (1:1.5.1-1) unstable; urgency=medium
 
  -- Guido Günther <[e-mail]>  Wed, 27 Jun 2018 11:38:12 +0200
 
+virt-manager (1:1.5.1-0ubuntu2) cosmic; urgency=medium
+
+  * d/p/lp-1794315-connection-avoid-failing-on-NoneType.patch: fix a race
+    (worse on slow remote connections) that would break connecting to a
+    remote (LP: #1794315)
+  * d/p/lp-1796932-tests-osdict-fix-ordering-issue-with-new-osinfo.patch:
+    fix FTBFS due to self-tests failing with new osinfo (LP: #1796932)
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 09 Oct 2018 16:57:42 +0200
+
+virt-manager (1:1.5.1-0ubuntu1) bionic; urgency=medium
+
+  * d/control: virtinst needs isoinfo to introspect images. To fix that
+    add a dependency to genisoimage to virtinst (LP: #1763609)
+  * Merge with latest upstream stable release (LP: #1763618):
+    - Fixes potential crash with libxml2 error callbacks
+    - Fixes disk/net/mem VM graphs
+
+ -- Christian Ehrhardt <[e-mail]>  Fri, 13 Apr 2018 09:36:46 +0200
+
+virt-manager (1:1.5.0-0ubuntu1) bionic; urgency=medium
+
+  * Merge with Debian unstable 1:1.4.3-1 (LP: #1747907 LP: #1741861)
+    and latest upstream 1.5.0 (Closes: #888133); Remaining changes:
+    - Depend on gir1.2-appindicator3-0.1 for appindicator support.
+    - Add lsb-release to Build-Depends so we can detect whether we're running
+      on Ubuntu or Debian.
+    - d/rules: Set the preferred distro so we appear first in the list.
+    - d/rules: Set qemu user to libvirt-qemu so appropriate permissions get set.
+    - d/p/virtinst/9006_fix_path_to_qemu-dm.patch: drop the full path from
+      qemu-dm as already done for hvmloader and pygrub. The Xen tools will
+      handle this and add the missing path.
+    - d/p/mark-libvirt-lxc: Clearly mark the LXC connections as being
+      libvirt-lxc, to avoid confusion due to differing features and
+      configurations.
+    - d/p/add_qemu_binaries.patch: add the actual binary name from the qemu
+      packages so default hypervisor detection works properly on first run.
+    - d/p/prefer-qemu.patch: Prefer QEMU as the default URI, even if it's
+      not installed.
+  * Dropped changes (upstream)
+    - d/p/use_qxl_for_ubuntu.patch: use qxl by default for Ubuntu VMs, it
+      seems to work better than vmvga now.
+    - Fix virt-install so that it can install 16.04 and newer images.
+      Error message is 'Couldn't find hvm kernel for Ubuntu tree
+      Closes (LP 1634304)
+    - d/p/virt-manager-generates-invalid-guest-XML.patch: fix generation of
+      invalid xml when a spapr-vio SCSI model controller is changed to a
+      virtio-scsi model controller (LP 1649520).
+    - Fix window size issues under Wayland
+    - d/p/virtinst-adjust-media-paths-for-s390x.patch: fix virtinst on
+      s390x (LP 1713990)
+  * Added Changes:
+    - refresh d/p/mark-libvirt-lxc.patch to match 1.4.3
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 07 Feb 2018 16:13:38 +0100
+
 virt-manager (1:1.4.3-1) unstable; urgency=medium
 
   * Depend on gir1.2-spiceclientglib-2.0 (Closes: #873597)
@@ -121,6 +273,78 @@ virt-manager (1:1.4.0-6) unstable; urgency=medium
 
  -- Guido Günther <[e-mail]>  Wed, 19 Jul 2017 19:19:10 +0200
 
+virt-manager (1:1.4.0-5ubuntu3) bionic; urgency=medium
+
+  * Fix window size issues under Wayland
+    - d/p/wayland-window-size-1.patch: fix window size tracking in
+      virtManager/details.py, virtManager/manager.py.
+    - d/p/wayland-window-size-2.patch: fix resize to VM in
+      virtManager/console.py.
+
+ -- Marc Deslauriers <[e-mail]>  Wed, 13 Dec 2017 11:30:27 -0500
+
+virt-manager (1:1.4.0-5ubuntu2) artful; urgency=medium
+
+  * - d/p/virtinst-adjust-media-paths-for-s390x.patch: fix virtinst on
+      s390x (LP: #1713990)
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 30 Aug 2017 14:48:17 +0200
+
+virt-manager (1:1.4.0-5ubuntu1) artful; urgency=medium
+
+  * Merge with Debian unstable (LP: #1667114 LP: #1683747). Remaining changes:
+    - Depend on gir1.2-appindicator3-0.1 for appindicator support.
+    - Add lsb-release to Build-Depends so we can detect whether we're running
+      on Ubuntu or Debian.
+    - d/rules: Set the preferred distro so we appear first in the list.
+    - d/rules: Set qemu user to libvirt-qemu so appropriate permissions get set.
+    - d/p/virtinst/9006_fix_path_to_qemu-dm.patch: drop the full path from
+      qemu-dm as already done for hvmloader and pygrub. The Xen tools will
+      handle this and add the missing path.
+    - d/p/mark-libvirt-lxc: Clearly mark the LXC connections as being
+      libvirt-lxc, to avoid confusion due to differing features and
+      configurations.
+    - d/p/add_qemu_binaries.patch: add the actual binary name from the qemu
+      packages so default hypervisor detection works properly on first run.
+    - d/p/use_qxl_for_ubuntu.patch: use qxl by default for Ubuntu VMs, it
+      seems to work better than vmvga now.
+    - d/p/prefer-qemu.patch: Prefer QEMU as the default URI, even if it's
+      not installed.
+    - Fix virt-install so that it can install 16.04 and newer images.
+      Error message is 'Couldn't find hvm kernel for Ubuntu tree
+      Closes (LP 1634304)
+  * Dropped changes:
+    - d/rules: Remove data/gschemas.compiled generated by clean (in Debian).
+    - d/p/0001-details-Fix-screenshot-on-F24-rawhide-bz-1297988.patch:
+      Cherry-pick from upstream. Fix screenshot capture with newer
+      gdk-pixbuf/pygobject. (LP 1571702) (now Upstream)
+    - d/p/use_virtio_for_pseries_disks.patch: virtinst: Use virtio bus type for
+      disks on pSeries machines.  Closes LP 1597610. (now Upstream)
+    - Change Recommends to libvirt-bin instead of libvirt-daemon-system
+      which isn't available in Ubuntu (Debian and Ubuntu share names again).
+    - With package names now matching delta would be wrong, calling kvm
+      leads to the right suggestive apt install message. Remaining messages
+      are considered good enough (or should be fixed upstream)
+      - d/p/more_helpful_error_message.patch: explain to the user why
+        connecting to qemu:///system failed and how to fix it.
+      - d/p/use_ubuntu_package_names.patch: Suggest installing the packages
+        that are actually available in Ubuntu.
+    - d/p/virtinst/dont_disable_vmport.patch: Don't disable vmport even if
+      we're using spice, as this prevents having a seamless mouse when
+      using Ubuntu as a guest (Seamless mouse was reported ok without).
+    - d/p/leave-mnemonics-alone-on-focus-change.patch: Leave
+      gtk-enable-mnemonics setting alone under Unity when windows change
+      focus (No Unity supporte anymore).
+  * Added changes:
+    - Refreshed patches to match new version:
+      - d/p/mark-libvirt-lxc.patch
+      - d/p/virtinst/use_qxl_for_ubuntu.patch
+    - d/p/virt-manager-generates-invalid-guest-XML.patch: fix generation of
+      invalid xml when a spapr-vio SCSI model controller is changed to a
+      virtio-scsi model controller (LP: #1649520).
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 09 Aug 2017 17:07:59 +0200
+
 virt-manager (1:1.4.0-5) unstable; urgency=medium
 
   * Reupload with virtinst (Closes: #849293)
@@ -175,6 +399,67 @@ virt-manager (1:1.3.2-4) unstable; urgency=medium
 
  -- Guido Günther <[e-mail]>  Sat, 16 Apr 2016 10:54:46 +0200
 
+virt-manager (1:1.3.2-3ubuntu4) zesty; urgency=medium
+
+  * Fix virt-install so that it can install 16.04 and newer images.
+    Error message is 'Couldn't find hvm kernel for Ubuntu tree
+    Closes (LP: #1634304)
+
+ -- Dave Chiluk <[e-mail]>  Tue, 29 Nov 2016 12:52:23 -0600
+
+virt-manager (1:1.3.2-3ubuntu3) yakkety; urgency=medium
+
+  * debian/patches/use_virtio_for_pseries_disks.patch: virtinst: Use
+    virtio bus type for disks on pSeries machines.  Closes LP: #1597610.
+
+ -- Nishanth Aravamudan <[e-mail]>  Wed, 20 Jul 2016 16:36:12 -0700
+
+virt-manager (1:1.3.2-3ubuntu2) yakkety; urgency=medium
+
+  * debian/patches/0001-details-Fix-screenshot-on-F24-rawhide-bz-1297988.patch:
+    Cherry-pick from upstream. Fix screenshot capture with newer
+    gdk-pixbuf/pygobject. (LP: #1571702)
+
+ -- Iain Lane <[e-mail]>  Wed, 18 May 2016 11:08:46 +0100
+
+virt-manager (1:1.3.2-3ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian. Remaining changes: (LP: #1556671)
+    - debian/control:
+        + Depend on gir1.2-appindicator3-0.1 for appindicator support.
+        + Add lsb-release to Build-Depends so we can detect whether we're
+          running on Ubuntu or Debian.
+        + Change Recommends to libvirt-bin instead of libvirt-daemon-system
+          which isn't available in Ubuntu
+    - debian/rules:
+        + Set qemu user to libvirt-qemu so appropriate permissions get set.
+        + Set the preferred distro so we appear first in the list.
+        + Remove data/gschemas.compiled generated by clean.
+    - d/p/virtinst/9006_fix_path_to_qemu-dm.patch: drop the full path from
+      qemu-dm as already done for hvmloader and pygrub. The Xen tools will
+      handle this and add the missing path.
+    - d/p/more_helpful_error_message.patch: explain to the user why
+      connecting to qemu:///system failed and how to fix it.
+    - d/p/use_ubuntu_package_names.patch: Suggest installing the packages
+      that are actually available in Ubuntu.
+    - d/p/leave-mnemonics-alone-on-focus-change.patch: Leave
+      gtk-enable-mnemonics setting alone under Unity when windows change
+      focus.
+    - d/p/mark-libvirt-lxc: Clearly mark the LXC connections as being
+      libvirt-lxc, to avoid confusion due to differing features and
+      configurations.
+    - d/p/add_qemu_binaries.patch: add the actual binary name from the qemu
+      packages so default hypervisor detection works properly on first run.
+    - d/p/use_qxl_for_ubuntu.patch: use qxl by default for Ubuntu VMs, it
+      seems to work better than vmvga now.
+    - d/p/prefer-qemu.patch: Prefer QEMU as the default URI, even if it's
+      not installed.
+    - d/p/virtinst/dont_disable_vmport.patch: Don't disable vmport even if
+      we're using spice, as this prevents having a seamless mouse when
+      using Ubuntu as a guest.
+
+ -- Marc Deslauriers <[e-mail]>  Thu, 31 Mar 2016 17:32:42 -0400
+
 virt-manager (1:1.3.2-3) unstable; urgency=medium
 
   * [2ebfe49] Switch from urlgrabber to requests.
@@ -212,6 +497,90 @@ virt-manager (1:1.3.2-1) experimental; urgency=medium
 
  -- Guido Günther <[e-mail]>  Thu, 04 Feb 2016 12:11:04 +0100
 
+virt-manager (1:1.3.2-0ubuntu2) xenial; urgency=medium
+
+  * debian/patches/virtinst/dont_disable_vmport.patch: Don't disable
+    vmport even if we're using spice, as this prevents having a seamless
+    mouse when using Ubuntu as a guest.
+
+ -- Marc Deslauriers <[e-mail]>  Fri, 25 Mar 2016 14:35:57 -0400
+
+virt-manager (1:1.3.2-0ubuntu1) xenial; urgency=medium
+
+  * Updated to upstream 1.3.2 release. (LP: #1533004)
+    - d/p/Make-sure-we-use-a-binary-compatible-version-of-vte.patch:
+      removed, no longer required.
+    - d/p/leave-mnemonics-alone-on-focus-change.patch: updated to fix bug.
+    - d/p/virtinst/use_qxl_for_ubuntu.patch: updated for new version.
+    - debian/rules: remove data/gschemas.compiled generated by clean,
+      pass --no-update-icon-cache --no-compile-schemas to install.
+    - debian/control: added python-requests to Depends.
+
+ -- Marc Deslauriers <[e-mail]>  Thu, 28 Jan 2016 13:11:39 -0500
+
+virt-manager (1:1.2.1-4ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian. Remaining changes: (LP: #1409309)
+    - debian/control:
+        + Depend on gir1.2-appindicator3-0.1 for appindicator support.
+        + Add lsb-release to Build-Depends so we can detect whether we're
+          running on Ubuntu or Debian.
+        + Change Recommends to libvirt-bin instead of libvirt-daemon-system
+          which isn't available in Ubuntu
+        + Bump standards version to 3.9.6.
+    - debian/rules:
+        + Set qemu user to libvirt-qemu so appropriate permissions get set.
+        + Set the preferred distro so we appear first in the list.
+    - d/p/virtinst/9006_fix_path_to_qemu-dm.patch: drop the full path from
+      qemu-dm as already done for hvmloader and pygrub. The Xen tools will
+      handle this and add the missing path.
+    - d/p/more_helpful_error_message.patch: explain to the user why
+      connecting to qemu:///system failed and how to fix it.
+    - d/p/use_ubuntu_package_names.patch: Suggest installing the packages
+      that are actually available in Ubuntu.
+    - d/p/leave-mnemonics-alone-on-focus-change.patch: Leave
+      gtk-enable-mnemonics setting alone under Unity when windows change
+      focus.
+    - d/p/mark-libvirt-lxc: Clearly mark the LXC connections as being
+      libvirt-lxc, to avoid confusion due to differing features and
+      configurations.
+    - d/p/add_qemu_binaries.patch: add the actual binary name from the qemu
+      packages so default hypervisor detection works properly on first run.
+    - d/p/Make-sure-we-use-a-binary-compatible-version-of-vte.patch: Use
+      vte 2.91.
+  * Dropped patches included upstream:
+    - d/p/0001-serialcon-Drop-use-of-yet-more-removed-API.patch,
+    - d/p/0001-serialcon-Remove-some-redundant-VTE-API-calls.patch: Cherry-
+      pick two patches from upstream to stop using API removed in VTE 2.91.
+    - d/p/dont-force-keyboard-grabs.patch: don't force keyboarb grab before
+      widget is realized
+    - d/p/prevent-access-to-deleted-objects.patch: prevent access to
+      deleted objects
+    - d/p/fix_changing_graphics_type.patch: fix changing the graphics type
+      in the details dialog.
+    - d/p/hook_into_domain_balloon_event.patch: properly hook into hotplug
+      events so memory size gets updated.
+    - d/p/fix_showing_vcpus.patch: display the right number of vcpus in the
+      customize dialog.
+    - d/p/fix_whitespace_in_storage_name.patch: Fix using storage when the
+      directory name contains whitespace
+    - d/p/add-support-for-ppc64le: cherrypick two patches to fix
+      virt-install for ppc64le
+    - d/p/fix-page-visibilities.patch: fix a page visibility issue
+      resulting in stuck grabs.
+  * Other dropped patches:
+    - d/p/uefi_support.patch: upstream now has built in support.
+    - d/p/virtinst/9004_ubuntu_fix_tree_support.patch: this patch is
+      broken, needs fixing.
+    - d/p/virtinst/9005_ubuntu_releases.patch: virt-manager no longer
+      handles release information directly.
+  * debian/patches/use_qxl_for_ubuntu.patch: use qxl by default for Ubuntu
+    VMs, it seems to work better than vmvga now.
+  * debian/patches/prefer-qemu.patch: Prefer QEMU as the default URI, even
+    if it's not installed.
+
+ -- Marc Deslauriers <[e-mail]>  Tue, 08 Dec 2015 13:14:50 -0500
+
 virt-manager (1:1.2.1-4) unstable; urgency=medium
 
   [ Andreas Henriksson ]
diff --git a/debian/control b/debian/control
index afb2ea6..a08ef32 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: virt-manager
 Section: admin
 Priority: optional
-Maintainer: Debian Libvirt Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Libvirt Maintainers <[e-mail]>
 Uploaders:
  Guido Günther <[e-mail]>,
  Laurent Léonard <[e-mail]>,
@@ -29,6 +30,7 @@ Build-Depends:
 Package: virt-manager
 Architecture: all
 Depends:
+ gir1.2-appindicator3-0.1,
  gir1.2-gtk-3.0 (>= 3.10),
  gir1.2-gtk-vnc-2.0,
  gir1.2-gtksource-4,
diff --git a/debian/patches/mark-libvirt-lxc.patch b/debian/patches/mark-libvirt-lxc.patch
new file mode 100644
index 0000000..cd978ed
--- /dev/null
+++ b/debian/patches/mark-libvirt-lxc.patch
@@ -0,0 +1,29 @@
+Description: Clearly mark the LXC connections as being libvirt-lxc, to
+ avoid confusion due to differing features and configurations.
+Written: 2015-08-22
+Author: Serge Hallyn <[e-mail]>
+Updated: 2019-12-06
+Forwarded: https://github.com/virt-manager/virt-manager/pull/67
+
+--- a/virtManager/createconn.py
++++ b/virtManager/createconn.py
+@@ -171,7 +171,7 @@ class vmmConnect(vmmGObjectUI):
+         _add_hv_row(HV_QEMU, "qemu", "QEMU/KVM")
+         _add_hv_row(HV_QEMU_SESSION, "qemu", "QEMU/KVM " + _("user session"))
+         _add_hv_row(HV_XEN, "xen", "Xen")
+-        _add_hv_row(HV_LXC, "lxc", "LXC (" + _("Linux Containers") + ")")
++        _add_hv_row(HV_LXC, "lxc", "Libvirt-LXC (Linux Containers)")
+         _add_hv_row(HV_BHYVE, "bhyve", "Bhyve")
+         _add_hv_row(HV_VZ, "vz", "Virtuozzo")
+         _add_hv_row(-1, None, "")
+--- a/virtManager/connection.py
++++ b/virtManager/connection.py
+@@ -433,7 +433,7 @@ class vmmConnection(vmmGObject):
+             "esx":        "ESX",
+             "gsx":        "GSX",
+             "libxl":      "libxl",
+-            "lxc":        "LXC",
++            "lxc":        "Libvirt-LXC",
+             "openvz":     "OpenVZ",
+             "phyp":       "phyp",
+             "qemu":       "QEMU/KVM",
diff --git a/debian/patches/series b/debian/patches/series
index 07c986c..cf8df6a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 Use-usr-bin-python.patch
+mark-libvirt-lxc.patch