[Pkg-libvirt-commits] [SCM] Virt Manager packaging branch, master, updated. debian/0.6.1-4-5-gca0d950
Guido Günther
agx at sigxcpu.org
Mon Mar 23 10:56:58 UTC 2009
The following commit has been merged in the master branch:
commit 4b493f6a2bd9ab963e756bbbc7407d24a21ba430
Author: Guido Günther <agx at sigxcpu.org>
Date: Sun Mar 22 20:12:21 2009 +0100
drop patches applied upstream
0002-remove-disambiguity-in-storage-dialog.patch,
0003-hint-to-ssh-askpass.patch,
0004-make-fullscreen-mode-more-useful.patch,
0005-gtk-vnc-0.3.8-handles-rescaling-with-compiz.patch
diff --git a/debian/patches/0002-remove-disambiguity-in-storage-dialog.patch b/debian/patches/0002-remove-disambiguity-in-storage-dialog.patch
deleted file mode 100644
index 71d62ca..0000000
--- a/debian/patches/0002-remove-disambiguity-in-storage-dialog.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Sat, 7 Feb 2009 21:35:20 +0100
-Subject: [PATCH] remove disambiguity in storage dialog
-
-Closes: #514324
----
- src/virtManager/addhardware.py | 2 +-
- src/virtManager/create.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/virtManager/addhardware.py b/src/virtManager/addhardware.py
-index ecf013d..db35d1d 100644
---- a/src/virtManager/addhardware.py
-+++ b/src/virtManager/addhardware.py
-@@ -800,7 +800,7 @@ class vmmAddHardware(gobject.GObject):
-
- ret = self._dev.is_size_conflict()
- if not ret[0] and ret[1]:
-- res = self.err.yes_no(_("Not Enough Free Space"), ret[1])
-+ res = self.err.yes_no(_("Not Enough Free Space"), _("%s. Continue anyway?") % ret[1])
- if not res:
- return False
-
-diff --git a/src/virtManager/create.py b/src/virtManager/create.py
-index 63df1c8..903ff36 100644
---- a/src/virtManager/create.py
-+++ b/src/virtManager/create.py
-@@ -1018,7 +1018,7 @@ class vmmCreate(gobject.GObject):
-
- ret = self._disk.is_size_conflict()
- if not ret[0] and ret[1]:
-- res = self.err.yes_no(_("Not Enough Free Space"), ret[1])
-+ res = self.err.yes_no(_("Not Enough Free Space"), _("%s. Continue anyway?") % ret[1])
- if not res:
- return False
-
---
diff --git a/debian/patches/0003-hint-to-ssh-askpass.patch b/debian/patches/0003-hint-to-ssh-askpass.patch
deleted file mode 100644
index 83722dc..0000000
--- a/debian/patches/0003-hint-to-ssh-askpass.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
-Date: Fri, 13 Feb 2009 14:56:01 +0100
-Subject: [PATCH] hint to ssh-askpass
-
-if ssh authentication fails
-
-Closes: #513599
----
- src/virtManager/connection.py | 8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
-
-diff --git a/src/virtManager/connection.py b/src/virtManager/connection.py
-index 011dd4c..1440f08 100644
---- a/src/virtManager/connection.py
-+++ b/src/virtManager/connection.py
-@@ -431,13 +431,19 @@ class vmmConnection(gobject.GObject):
- else:
- self.state = self.STATE_DISCONNECTED
-
-+ if self.uri.find("+ssh://") > 0:
-+ hint = "\nMaybe you need to install ssh-askpass " + \
-+ "in order to authenticate."
-+ else:
-+ hint = ""
-+
- (_type, value, stacktrace) = open_error
- # Detailed error message, in English so it can be Googled.
- self.connectError = \
- ("Unable to open connection to hypervisor URI '%s':\n" %
- str(self.uri)) + \
- str(_type) + " " + str(value) + "\n" + \
-- traceback.format_exc (stacktrace)
-+ traceback.format_exc (stacktrace) + hint
- logging.error(self.connectError)
-
- # We want to kill off this thread asap, so schedule a gobject
---
diff --git a/debian/patches/0004-make-fullscreen-mode-more-useful.patch b/debian/patches/0004-make-fullscreen-mode-more-useful.patch
deleted file mode 100644
index e308b05..0000000
--- a/debian/patches/0004-make-fullscreen-mode-more-useful.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Thu, 19 Feb 2009 16:11:34 +0100
-Subject: [PATCH] make fullscreen mode more useful
-
-when a VM uses a video mode that is larger than the mode of the host
-running virt-manager fullscreen mode isn't particular useful at the
-moment. Since there are no scroll bars (due to _force_resize), parts of
-the screen simply get cut off. This patch sets the size of the vnc
-widget to the actual screen size (minus the height of the menu bar) when
-switching to fullscreen mode with scaling enabled.
----
- src/virtManager/details.py | 10 ++++++++++
- 1 files changed, 10 insertions(+), 0 deletions(-)
-
-diff --git a/src/virtManager/details.py b/src/virtManager/details.py
-index 2337516..94a31c8 100644
---- a/src/virtManager/details.py
-+++ b/src/virtManager/details.py
-@@ -438,6 +438,16 @@ class vmmDetails(gobject.GObject):
- def toggle_fullscreen(self, src):
- self.window.get_widget("control-fullscreen").set_active(src.get_active())
- if src.get_active():
-+
-+ # if scaling is enabled make sure we fit onto the root window
-+ if self.vncViewer.get_scaling():
-+ w, h = self.window.get_widget("menubar3").size_request()
-+ rootw = src.get_screen().get_width()
-+ rooth = src.get_screen().get_height() - h
-+ self.vncViewer.set_size_request(rootw, rooth)
-+ else:
-+ self.vncViewer.set_size_request(-1, -1)
-+
- self.window.get_widget("vmm-details").fullscreen()
- if self.config.get_console_keygrab() == 1:
- gtk.gdk.keyboard_grab(self.vncViewer.window, False, 0L)
---
diff --git a/debian/patches/0005-gtk-vnc-0.3.8-handles-rescaling-with-compiz.patch b/debian/patches/0005-gtk-vnc-0.3.8-handles-rescaling-with-compiz.patch
deleted file mode 100644
index 2b8aba9..0000000
--- a/debian/patches/0005-gtk-vnc-0.3.8-handles-rescaling-with-compiz.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Thu, 19 Feb 2009 16:18:13 +0100
-Subject: [PATCH] gtk-vnc 0.3.8 handles rescaling with compiz
-
-gtk-vnc 0.3.8 handle compositioning so scaling can be used in that case too.
----
- src/virtManager/details.py | 5 ++---
- 1 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/virtManager/details.py b/src/virtManager/details.py
-index 94a31c8..95e0696 100644
---- a/src/virtManager/details.py
-+++ b/src/virtManager/details.py
-@@ -222,9 +222,8 @@ class vmmDetails(gobject.GObject):
- else:
- self.vncViewer.set_keyboard_grab(False)
- self.vncViewer.set_pointer_grab(True)
-- if not topwin.is_composited():
-- self.vncViewer.set_scaling(True)
-- self.window.get_widget("details-menu-view-scale-display").set_active(True)
-+ self.vncViewer.set_scaling(True)
-+ self.window.get_widget("details-menu-view-scale-display").set_active(True)
-
- self.vncViewer.connect("vnc-pointer-grab", self.notify_grabbed)
- self.vncViewer.connect("vnc-pointer-ungrab", self.notify_ungrabbed)
---
diff --git a/debian/patches/series b/debian/patches/series
index 10ded7a..dacd57a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1 @@
0001-use-usr-share-gconf-for-schema-data.patch
-0002-remove-disambiguity-in-storage-dialog.patch
-0003-hint-to-ssh-askpass.patch
-0004-make-fullscreen-mode-more-useful.patch
-0005-gtk-vnc-0.3.8-handles-rescaling-with-compiz.patch
--
Virt Manager packaging
More information about the Pkg-libvirt-commits
mailing list