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

Guido Guenther agx at moszumanska.debian.org
Thu Feb 4 11:15:54 UTC 2016


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

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

commit 203bfe9edb7336120c7fc7e37f730b49b1a1721b
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Feb 4 11:23:21 2016 +0100

    Rediff patches
---
 debian/patches/Make-SpiceClientGtk-optional.patch   | 8 ++++----
 debian/patches/virtinst/Fix-patch-to-pygrub.patch   | 4 ++--
 debian/patches/virtinst/fix-path-to-hvmloader.patch | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/patches/Make-SpiceClientGtk-optional.patch b/debian/patches/Make-SpiceClientGtk-optional.patch
index 33364bd..b1d92e9 100644
--- a/debian/patches/Make-SpiceClientGtk-optional.patch
+++ b/debian/patches/Make-SpiceClientGtk-optional.patch
@@ -9,7 +9,7 @@ Not all architectures have it
  2 files changed, 14 insertions(+), 5 deletions(-)
 
 diff --git a/virtManager/console.py b/virtManager/console.py
-index ab13d7b..689773e 100644
+index 217df3d..7cbb385 100644
 --- a/virtManager/console.py
 +++ b/virtManager/console.py
 @@ -29,7 +29,7 @@ from .baseclass import vmmGObjectUI
@@ -20,8 +20,8 @@ index ab13d7b..689773e 100644
 +from .viewers import SpiceViewer, VNCViewer, have_spice_gtk
  
  
- class vmmConsolePages(vmmGObjectUI):
-@@ -652,7 +652,12 @@ class vmmConsolePages(vmmGObjectUI):
+ # console-pages IDs
+@@ -665,7 +665,12 @@ class vmmConsolePages(vmmGObjectUI):
              if ginfo.gtype == "vnc":
                  viewer_class = VNCViewer
              elif ginfo.gtype == "spice":
@@ -36,7 +36,7 @@ index ab13d7b..689773e 100644
              self._viewer = viewer_class(ginfo)
              self._connect_viewer_signals()
 diff --git a/virtManager/viewers.py b/virtManager/viewers.py
-index f2b6d69..3000378 100644
+index b424e90..b9c7512 100644
 --- a/virtManager/viewers.py
 +++ b/virtManager/viewers.py
 @@ -25,9 +25,13 @@ from gi.repository import Gdk
diff --git a/debian/patches/virtinst/Fix-patch-to-pygrub.patch b/debian/patches/virtinst/Fix-patch-to-pygrub.patch
index 3e030e7..9e917b4 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 b0f14b0..5c33e71 100644
+index c41efab..0b86907 100644
 --- a/virtinst/guest.py
 +++ b/virtinst/guest.py
-@@ -358,7 +358,7 @@ class Guest(XMLBuilder):
+@@ -365,7 +365,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 3eb0eab..1454fee 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 bf4b70b..b0f14b0 100644
+index f36a09d..c41efab 100644
 --- a/virtinst/guest.py
 +++ b/virtinst/guest.py
-@@ -715,7 +715,7 @@ class Guest(XMLBuilder):
+@@ -752,7 +752,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



More information about the Pkg-libvirt-commits mailing list