diff -Nru virt-manager-1.3.2/debian/changelog virt-manager-1.3.2/debian/changelog --- virt-manager-1.3.2/debian/changelog 2016-11-29 18:52:23.000000000 +0000 +++ virt-manager-1.3.2/debian/changelog 2017-05-30 11:39:32.000000000 +0000 @@ -1,3 +1,16 @@ +virt-manager (1:1.3.2-3ubuntu5) artful; urgency=medium + + * Update Dependencies to match new libvirt package names (LP: #1694159) + This aligns with Debian and effectively drops the former change: + "Change Recommends to libvirt-bin instead of libvirt-daemon-system + which isn't available in Ubuntu" and modifies a few texts the ubuntu + delta to match. + - debian/control: drop dependency change + - debian/patches/more_helpful_error_message.patch: help text update + - debian/patches/use_ubuntu_package_names.patch: help text update + + -- Christian Ehrhardt Tue, 30 May 2017 13:25:02 +0200 + virt-manager (1:1.3.2-3ubuntu4) zesty; urgency=medium * Fix virt-install so that it can install 16.04 and newer images. diff -Nru virt-manager-1.3.2/debian/control virt-manager-1.3.2/debian/control --- virt-manager-1.3.2/debian/control 2016-07-20 23:28:24.000000000 +0000 +++ virt-manager-1.3.2/debian/control 2017-05-30 11:38:22.000000000 +0000 @@ -32,7 +32,7 @@ virtinst (>= ${binary:Version}), # For gsettings-data-convert gconf2, -Recommends: libvirt-bin (>= 1.2.7), gnome-icon-theme, +Recommends: libvirt-daemon-system (>= 1.2.7), gnome-icon-theme, gir1.2-spice-client-gtk-3.0, Suggests: virt-viewer, ssh-askpass, gnome-keyring, python-gnomekeyring, python-guestfs diff -Nru virt-manager-1.3.2/debian/patches/more_helpful_error_message.patch virt-manager-1.3.2/debian/patches/more_helpful_error_message.patch --- virt-manager-1.3.2/debian/patches/more_helpful_error_message.patch 2016-07-20 23:28:24.000000000 +0000 +++ virt-manager-1.3.2/debian/patches/more_helpful_error_message.patch 2017-05-30 11:41:59.000000000 +0000 @@ -1,18 +1,16 @@ Description: make the error message more helpful on Ubuntu Forwarded: no -Updated: 2014-02-17 +Updated: 2017-05-30 -Index: virt-manager-1.3.2/virtManager/engine.py -=================================================================== ---- virt-manager-1.3.2.orig/virtManager/engine.py 2016-03-31 17:43:53.351722160 -0400 -+++ virt-manager-1.3.2/virtManager/engine.py 2016-03-31 17:43:53.351722160 -0400 +--- a/virtManager/engine.py ++++ b/virtManager/engine.py @@ -672,7 +672,10 @@ "regular user. Try running as root.") show_errmsg = False elif re.search(r"libvirt-sock", tb): - hint += _("Verify that the 'libvirtd' daemon is running.") + hint += _("Verify that:\n" + -+ " - The 'libvirt-bin' package is installed\n" + ++ " - The 'libvirt-daemon-system' package is installed\n" + + " - The 'libvirtd' daemon has been started" + + (conn.is_qemu_system() and "\n - You are member of the 'libvirtd' group" or '')) show_errmsg = False diff -Nru virt-manager-1.3.2/debian/patches/use_ubuntu_package_names.patch virt-manager-1.3.2/debian/patches/use_ubuntu_package_names.patch --- virt-manager-1.3.2/debian/patches/use_ubuntu_package_names.patch 2016-07-20 23:28:24.000000000 +0000 +++ virt-manager-1.3.2/debian/patches/use_ubuntu_package_names.patch 2017-05-30 11:40:49.000000000 +0000 @@ -1,18 +1,18 @@ Description: Suggest installing the packages that are actually available in Ubuntu. Author: Marc Deslauriers Forwarded: no, Ubuntu-specific -Updated: 2014-02-17 +Updated: 2017-05-30 -Index: virt-manager-1.3.2/virtManager/engine.py -=================================================================== ---- virt-manager-1.3.2.orig/virtManager/engine.py 2016-03-31 17:44:08.827883979 -0400 -+++ virt-manager-1.3.2/virtManager/engine.py 2016-03-31 17:44:08.827883979 -0400 -@@ -217,7 +217,7 @@ +--- a/virtManager/engine.py ++++ b/virtManager/engine.py +@@ -217,8 +217,8 @@ # Manager fail message msg = _("Could not detect a default hypervisor. Make\n" "sure the appropriate virtualization packages\n" - "are installed (kvm, qemu, libvirt, etc.), and\n" -+ "are installed (qemu-system, libvirt-bin), and\n" - "that libvirtd is running.\n\n" +- "that libvirtd is running.\n\n" ++ "are installed (libvirt-daemon-system,\n" ++ "qemu-system) and that libvirtd is running.\n\n" "A hypervisor connection can be manually\n" "added via File->Add Connection") +