[Pkg-libvirt-commits] [virt-manager] 03/04: Rediff patches

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to annotated tag debian/1%1.4.0-1
in repository virt-manager.

commit 4ce6025101acdcd301084179057fc59daee3d8bd
Author: Guido Günther <agx at sigxcpu.org>
Date:   Mon Jun 20 19:41:40 2016 +0200

    Rediff patches
    
    Dropped Make-SpiceClientGtk-optional.patch: Applied upstream
---
 debian/patches/Make-SpiceClientGtk-optional.patch  | 58 ----------------------
 debian/patches/series                              |  1 -
 debian/patches/virtinst/Fix-patch-to-pygrub.patch  |  4 +-
 .../patches/virtinst/fix-path-to-hvmloader.patch   |  4 +-
 4 files changed, 4 insertions(+), 63 deletions(-)

diff --git a/debian/patches/Make-SpiceClientGtk-optional.patch b/debian/patches/Make-SpiceClientGtk-optional.patch
deleted file mode 100644
index 18a1c38..0000000
--- a/debian/patches/Make-SpiceClientGtk-optional.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From: =?utf-8?q?Guido_G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Thu, 13 Aug 2015 22:00:33 +0200
-Subject: Make SpiceClientGtk optional
-
-Not all architectures have it
----
- virtManager/console.py |  9 +++++++--
- virtManager/viewers.py | 10 +++++++---
- 2 files changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/virtManager/console.py b/virtManager/console.py
-index 217df3d..7cbb385 100644
---- a/virtManager/console.py
-+++ b/virtManager/console.py
-@@ -29,7 +29,7 @@ from .baseclass import vmmGObjectUI
- from .details import DETAILS_PAGE_CONSOLE
- from .serialcon import vmmSerialConsole
- from .sshtunnels import ConnectionInfo
--from .viewers import SpiceViewer, VNCViewer
-+from .viewers import SpiceViewer, VNCViewer, have_spice_gtk
- 
- 
- # console-pages IDs
-@@ -665,7 +665,12 @@ class vmmConsolePages(vmmGObjectUI):
-             if ginfo.gtype == "vnc":
-                 viewer_class = VNCViewer
-             elif ginfo.gtype == "spice":
--                viewer_class = SpiceViewer
-+                if have_spice_gtk:
-+                    viewer_class = SpiceViewer
-+                else:
-+                    raise RuntimeError("Error opening Spice console, "
-+                                       "SpiceClientGtk missing")
-+
- 
-             self._viewer = viewer_class(ginfo)
-             self._connect_viewer_signals()
-diff --git a/virtManager/viewers.py b/virtManager/viewers.py
-index b424e90..b9c7512 100644
---- a/virtManager/viewers.py
-+++ b/virtManager/viewers.py
-@@ -25,9 +25,13 @@ from gi.repository import Gdk
- import gi
- gi.require_version('GtkVnc', '2.0')
- from gi.repository import GtkVnc
--gi.require_version('SpiceClientGtk', '3.0')
--from gi.repository import SpiceClientGtk
--from gi.repository import SpiceClientGLib
-+try:
-+    gi.require_version('SpiceClientGtk', '3.0')
-+    from gi.repository import SpiceClientGtk
-+    from gi.repository import SpiceClientGLib
-+    have_spice_gtk = True
-+except (ValueError, ImportError):
-+    have_spice_gtk = False
- 
- import logging
- import socket
diff --git a/debian/patches/series b/debian/patches/series
index 6eec59d..f4f4f00 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 virtinst/fix-path-to-hvmloader.patch
 virtinst/Fix-patch-to-pygrub.patch
-Make-SpiceClientGtk-optional.patch
diff --git a/debian/patches/virtinst/Fix-patch-to-pygrub.patch b/debian/patches/virtinst/Fix-patch-to-pygrub.patch
index 9e917b4..963b0c4 100644
--- a/debian/patches/virtinst/Fix-patch-to-pygrub.patch
+++ b/debian/patches/virtinst/Fix-patch-to-pygrub.patch
@@ -8,10 +8,10 @@ Closes: #685749
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/virtinst/guest.py b/virtinst/guest.py
-index c41efab..0b86907 100644
+index 14be763..957e818 100644
 --- a/virtinst/guest.py
 +++ b/virtinst/guest.py
-@@ -365,7 +365,7 @@ class Guest(XMLBuilder):
+@@ -362,7 +362,7 @@ class Guest(XMLBuilder):
          if (not install and
              self.os.is_xenpv() and
              not self.os.kernel):
diff --git a/debian/patches/virtinst/fix-path-to-hvmloader.patch b/debian/patches/virtinst/fix-path-to-hvmloader.patch
index 1454fee..dd55aa4 100644
--- a/debian/patches/virtinst/fix-path-to-hvmloader.patch
+++ b/debian/patches/virtinst/fix-path-to-hvmloader.patch
@@ -8,10 +8,10 @@ Closes: #685749
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/virtinst/guest.py b/virtinst/guest.py
-index f36a09d..c41efab 100644
+index 6a42536..14be763 100644
 --- a/virtinst/guest.py
 +++ b/virtinst/guest.py
-@@ -752,7 +752,7 @@ class Guest(XMLBuilder):
+@@ -694,7 +694,7 @@ class Guest(XMLBuilder):
              self.os.init = self.os.init or "/bin/sh"
  
          if not self.os.loader and self.os.is_hvm() and self.type == "xen":

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/virt-manager.git