Merge branch 'experimental'
Guido Günther
10 years ago
|
0 |
virt-viewer (0.5.5-4) experimental; urgency=low
|
|
1 |
|
|
2 |
* Upload to experimental since recent libvirt and spice-gtk aren't
|
|
3 |
available in sid/wheezy.
|
|
4 |
* [1ed354b] Depend on newer libvirt (Closes: #701684)
|
|
5 |
* [450bfec] Depend on newer spice-gtk
|
|
6 |
|
|
7 |
-- Guido Günther <agx@sigxcpu.org> Sat, 02 Mar 2013 12:31:06 +0100
|
|
8 |
|
0 | 9 |
virt-viewer (0.5.5-3) unstable; urgency=low
|
1 | 10 |
|
2 | 11 |
* New upload
|
|
14 | 23 |
* [5bf850a] Imported Upstream version 0.5.5 (Closes: #684725)
|
15 | 24 |
|
16 | 25 |
-- Laurent Léonard <laurent@open-minds.org> Wed, 20 Feb 2013 23:20:54 +0100
|
|
26 |
|
|
27 |
virt-viewer (0.5.4-3) experimental; urgency=low
|
|
28 |
|
|
29 |
* [af14ec8] Fix ssh connection tunneling
|
|
30 |
|
|
31 |
-- Guido Günther <agx@sigxcpu.org> Mon, 22 Oct 2012 22:40:32 +0200
|
|
32 |
|
|
33 |
virt-viewer (0.5.4-2) experimental; urgency=low
|
|
34 |
|
|
35 |
* Upload to experimental
|
|
36 |
* [0029b1c] Enable spice support (Closes: #667565)
|
|
37 |
* [b139b7c] Drop unneeded build-deps
|
|
38 |
|
|
39 |
-- Guido Günther <agx@sigxcpu.org> Wed, 26 Sep 2012 08:59:19 +0200
|
17 | 40 |
|
18 | 41 |
virt-viewer (0.5.4-1) unstable; urgency=low
|
19 | 42 |
|
|
56 | 79 |
upstream
|
57 | 80 |
|
58 | 81 |
-- Laurent Léonard <laurent@open-minds.org> Thu, 10 Nov 2011 09:01:35 +0100
|
|
82 |
|
|
83 |
virt-viewer (0.4.1-4) experimental; urgency=low
|
|
84 |
|
|
85 |
* [0029b1c] Enable spice support
|
|
86 |
|
|
87 |
-- Guido Günther <agx@sigxcpu.org> Fri, 02 Sep 2011 21:04:44 +0200
|
59 | 88 |
|
60 | 89 |
virt-viewer (0.4.1-3) unstable; urgency=low
|
61 | 90 |
|
5 | 5 |
Build-Depends: cdbs,
|
6 | 6 |
debhelper (>= 7),
|
7 | 7 |
autotools-dev,
|
8 | |
libvirt-dev (>= 0.8.1),
|
|
8 |
libvirt-dev (>= 0.10),
|
9 | 9 |
libgtk-vnc-2.0-dev,
|
|
10 |
libspice-client-gtk-3.0-dev (>= 0.17),
|
10 | 11 |
libxml2-dev,
|
11 | 12 |
libgtk-3-dev,
|
12 | 13 |
autotools-dev,
|
|
0 |
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
|
|
1 |
Date: Mon, 22 Oct 2012 20:05:24 +0200
|
|
2 |
Subject: Fail if opening the connection fails
|
|
3 |
|
|
4 |
instead of returning True. Which then fails with the misleading error
|
|
5 |
|
|
6 |
(virt-viewer:18631): Gtk-WARNING **: Attempting to add a widget with type
|
|
7 |
VncDisplay to a container of type VirtViewerDisplayVnc, but the widget is
|
|
8 |
already inside a container of type VirtViewerDisplayVnc, please use
|
|
9 |
gtk_widget_reparent()
|
|
10 |
---
|
|
11 |
src/virt-viewer.c | 2 +-
|
|
12 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
13 |
|
|
14 |
diff --git a/src/virt-viewer.c b/src/virt-viewer.c
|
|
15 |
index 3143104..572e9e6 100644
|
|
16 |
--- a/src/virt-viewer.c
|
|
17 |
+++ b/src/virt-viewer.c
|
|
18 |
@@ -425,7 +425,7 @@ virt_viewer_open_connection(VirtViewerApp *self G_GNUC_UNUSED, int *fd)
|
|
19 |
DEBUG_LOG("Error %s", err && err->message ? err->message : "Unknown");
|
|
20 |
close(pair[0]);
|
|
21 |
close(pair[1]);
|
|
22 |
- return TRUE;
|
|
23 |
+ return FALSE;
|
|
24 |
}
|
|
25 |
close(pair[0]);
|
|
26 |
*fd = pair[1];
|
|
0 |
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
|
|
1 |
Date: Mon, 22 Oct 2012 21:56:07 +0200
|
|
2 |
Subject: Don't fail early if virDomainOpenGraphics fails
|
|
3 |
|
|
4 |
virt_viewer_app_open_connection invokes virDomainOpenGraphics which only works
|
|
5 |
for local connections. Returning after this failure makes us never reach the
|
|
6 |
ssh part so this unbreaks connections tunneled over ssh.
|
|
7 |
---
|
|
8 |
src/virt-viewer-app.c | 3 +--
|
|
9 |
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
10 |
|
|
11 |
diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c
|
|
12 |
index def52c5..28dc8cb 100644
|
|
13 |
--- a/src/virt-viewer-app.c
|
|
14 |
+++ b/src/virt-viewer-app.c
|
|
15 |
@@ -820,8 +820,7 @@ virt_viewer_app_default_activate(VirtViewerApp *self)
|
|
16 |
VirtViewerAppPrivate *priv = self->priv;
|
|
17 |
int fd = -1;
|
|
18 |
|
|
19 |
- if (!virt_viewer_app_open_connection(self, &fd))
|
|
20 |
- return -1;
|
|
21 |
+ virt_viewer_app_open_connection(self, &fd);
|
|
22 |
|
|
23 |
DEBUG_LOG("After open connection callback fd=%d", fd);
|
|
24 |
|
|
0 |
0001-Fail-if-opening-the-connection-fails.patch
|
|
1 |
0002-Don-t-fail-early-if-virDomainOpenGraphics-fails.patch
|
0 | 0 |
#!/usr/bin/make -f
|
1 | 1 |
|
2 | |
DEB_CONFIGURE_EXTRA_FLAGS := --with-gtk=3.0
|
|
2 |
DEB_CONFIGURE_EXTRA_FLAGS := --with-gtk=3.0 --with-spice-gtk
|
3 | 3 |
|
4 | 4 |
include /usr/share/cdbs/1/rules/debhelper.mk
|
5 | 5 |
include /usr/share/cdbs/1/class/autotools.mk
|