--- virt-viewer-0.0.3.orig/debian/compat +++ virt-viewer-0.0.3/debian/compat @@ -0,0 +1 @@ +5 --- virt-viewer-0.0.3.orig/debian/copyright +++ virt-viewer-0.0.3/debian/copyright @@ -0,0 +1,21 @@ +This package was debianized by Guido Guenther on +Fri, 23 Nov 2007 00:20:13 +0100. + +It was downloaded from http://virt-manager.et.redhat.com/download.html + +Upstream Author: + + Daniel P. Berrange + +Copyright: + + 2007 Red Hat + +License: + + You are free to distribute this software under the terms of the GNU General + Public License Version 2. The full text of this license can be found in the + file /usr/share/common-licenses/GPL-2 + +The Debian packaging is (C) 2007, Guido Guenther and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. --- virt-viewer-0.0.3.orig/debian/docs +++ virt-viewer-0.0.3/debian/docs @@ -0,0 +1,2 @@ +NEWS +README --- virt-viewer-0.0.3.orig/debian/watch +++ virt-viewer-0.0.3/debian/watch @@ -0,0 +1,3 @@ +# format version number, currently 3; this line is compulsory! +version=3 +http://virt-manager.et.redhat.com/download/sources/virt-viewer/virt-viewer-([\d\.]*)\.tar\.gz --- virt-viewer-0.0.3.orig/debian/mozilla-virt-viewer.install +++ virt-viewer-0.0.3/debian/mozilla-virt-viewer.install @@ -0,0 +1 @@ +usr/lib/mozilla/plugins/*.so usr/lib/virt-viewer/plugins/ --- virt-viewer-0.0.3.orig/debian/rules +++ virt-viewer-0.0.3/debian/rules @@ -0,0 +1,16 @@ +#!/usr/bin/make -f + +LDFLAGS+="-Wl,--as-needed" + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +DEB_CONFIGURE_EXTRA_FLAGS += --enable-plugin=yes +DEB_DH_INSTALL_SOURCEDIR = debian/tmp/ + +clean:: + rm -f man/virt-viewer.1 + +post-patches:: + autoreconf --- virt-viewer-0.0.3.orig/debian/README.source +++ virt-viewer-0.0.3/debian/README.source @@ -0,0 +1,6 @@ +Building virt-viewer for Debian +------------------------------- + +The virt-viewer source package uses quilt to apply and remove its patches. +Please refer to /usr/share/doc/quilt/README.source for information about how to +use quilt for source packages. --- virt-viewer-0.0.3.orig/debian/virt-viewer.install +++ virt-viewer-0.0.3/debian/virt-viewer.install @@ -0,0 +1,2 @@ +usr/bin/ +usr/share/man/ --- virt-viewer-0.0.3.orig/debian/mozilla-virt-viewer.links +++ virt-viewer-0.0.3/debian/mozilla-virt-viewer.links @@ -0,0 +1,3 @@ +/usr/lib/virt-viewer/plugins/virt-viewer-plugin.so /usr/lib/xulrunner-addons/plugins/virt-viewer-plugin.so +/usr/lib/virt-viewer/plugins/virt-viewer-plugin.so /usr/lib/mozilla/plugins/virt-viewer-plugin.so +/usr/lib/virt-viewer/plugins/virt-viewer-plugin.so /usr/lib/firefox/plugins/virt-viewer-plugin.so --- virt-viewer-0.0.3.orig/debian/control +++ virt-viewer-0.0.3/debian/control @@ -0,0 +1,40 @@ +Source: virt-viewer +Section: admin +Priority: extra +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian Libvirt Maintainers +Uploaders: Guido Günther +Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libvirt-dev, libgtk-vnc-1.0-dev (>= 0.3.4), libxml2-dev, + libgtk2.0-dev (>= 2.10), xulrunner-1.9-dev, autotools-dev, quilt, automake, autoconf, libffi-dev, libtool +Standards-Version: 3.7.3 +XS-Debian-Vcs-Git: git://git.debian.org/git/pkg-libvirt/virt-viewer.git +XS-Debian-Vcs-Browser: http://git.debian.org/?p=pkg-libvirt/virt-viewer.git;a=summary +Homepage: http://virt-manager.et.redhat.com/ + +Package: virt-viewer +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: netcat +Description: Displaying the graphical console of a virtual machine + The console is accessed using the VNC protocol. The guest can be referred to + based on its name, ID, or UUID. If the guest is not already running, then the + viewer can be told to wait until is starts before attempting to connect to the + console The viewer can connect to remote hosts to lookup the console + information and then also connect to the remote console using the same network + transport. + +Package: mozilla-virt-viewer +Architecture: any +Section: web +Depends: ${shlibs:Depends}, ${misc:Depends} + firefox | seamonkey +Description: A virt-viewer widget for GTK+ (mozilla plugin) + The console is accessed using the VNC protocol. The guest can be referred to + based on its name, ID, or UUID. If the guest is not already running, then the + viewer can be told to wait until is starts before attempting to connect to the + console The viewer can connect to remote hosts to lookup the console + information and then also connect to the remote console using the same network + transport. + . + This package contains the experimental mozilla plugin. + --- virt-viewer-0.0.3.orig/debian/changelog +++ virt-viewer-0.0.3/debian/changelog @@ -0,0 +1,122 @@ +virt-viewer (0.0.3-6ubuntu4) jaunty; urgency=low + + * Fix faulty better-default-uri.diff patch. + + -- Soren Hansen Mon, 05 Jan 2009 00:31:59 +0100 + +virt-viewer (0.0.3-6ubuntu3) jaunty; urgency=low + + * Apply same heuristics as virsh when choosing the default connection uri: + If we have write access to the libvirt UNIX socket, use qemu:///system. + If not, use qemu:///session. + + -- Soren Hansen Sun, 04 Jan 2009 17:14:12 +0100 + +virt-viewer (0.0.3-6ubuntu2) jaunty; urgency=low + + * The version formerly known as 0.0.3-6ubuntu1. Now, with .install files. + + -- Soren Hansen Fri, 12 Dec 2008 16:25:55 -0800 + +virt-viewer (0.0.3-6ubuntu1) jaunty; urgency=low + + * Merge from Debian experimental (to get the mozilla plugin). + * Build against xulrunner instead of iceape (update build-dependency, and + don't apply the iceape-not-mozilla patch) + * Put plugins in /usr/lib/{xulrunner-addons,mozilla,firefox}/plugins instead + of the iceape and iceweasel equivalents. + + -- Soren Hansen Fri, 12 Dec 2008 09:56:22 -0800 + +virt-viewer (0.0.3-6) experimental; urgency=low + + * [1f49897] install missing binary (Closes: #507549) + + -- Guido Günther Thu, 04 Dec 2008 12:41:50 +0100 + +virt-viewer (0.0.3-5) experimental; urgency=low + + * [a645d5c] really look into destdir (Closes: #504287) + + -- Guido Günther Mon, 03 Nov 2008 19:36:55 +0100 + +virt-viewer (0.0.3-4) experimental; urgency=low + + * [fc7c0aa] rm files in plugindir - same bug as in gtk-vnc so use the + same fix (Closes: #504287) + + -- Guido Günther Sun, 02 Nov 2008 18:20:49 +0100 + +virt-viewer (0.0.3-3) experimental; urgency=low + + * [24287e3] set maintainer to pkg-libvirt-maintainers + * [314c1a9] build the mozilla-plugin + * [0749e02] add README.source + * [937201b] bump standards version + * [02cf615] add Vcs-{Git,Browser} and Homepage fields + + -- Guido Günther Mon, 27 Oct 2008 20:59:02 +0100 + +virt-viewer (0.0.3-2ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - DebianMaintainerField. + - Add Ctrl-Alt-F9 to list of keystrokes to send. + - Add libxen3-dev to Build-Depends. + + -- Andres Rodriguez Mon, 05 May 2008 14:49:14 -0500 + +virt-viewer (0.0.3-2) unstable; urgency=low + + * debian/control: depend on gtk that has gtk_widget_is_composited + * debian/copyright: make copyright match what's in main.c + + -- Guido Guenther Tue, 25 Mar 2008 11:53:23 +0100 + +virt-viewer (0.0.3-1) unstable; urgency=low + + * new upstream version 0.0.3 + * remove upstream author(s) template + * add watch file + * build depend on recent libgtk-vnc (>= 0.3.4) since we need some new + symbols out of it + * remove superflous debian/dirs + * bump standards version + + -- Guido Guenther Wed, 12 Mar 2008 10:48:19 +0100 + +virt-viewer (0.0.2-1ubuntu1) hardy; urgency=low + + * Merge with Debian unstable. Remaining changes: + - DebianMaintainerField. + - Add Ctrl-Alt-F9 to list of keystrokes to send. + - Add libxen3-dev to Build-Depends. + + -- Soren Hansen Sat, 09 Feb 2008 00:57:37 +0100 + +virt-viewer (0.0.2-1) unstable; urgency=low + + * Initial release (Closes: #452514) + + -- Guido Guenther Fri, 23 Nov 2007 00:20:13 +0100 + +virt-viewer (0.0.2-0ubuntu3) hardy; urgency=low + + * Modified Depends to use libxen3.2-dev + * Changed standards to version 3.7.3 + + -- Rick Clark Thu, 07 Feb 2008 14:49:49 -0500 + +virt-viewer (0.0.2-0ubuntu2) hardy; urgency=low + + * Added Ctrl-Alt-F9 to list of keys you can send to the vm. + + -- Soren Hansen Sat, 12 Jan 2008 23:45:33 +0100 + +virt-viewer (0.0.2-0ubuntu1) hardy; urgency=low + + * Initial release. Based on work by Richard W.M. Jones . + Thanks! + + -- Soren Hansen Sat, 12 Jan 2008 23:35:43 +0100 + --- virt-viewer-0.0.3.orig/debian/patches/iceape-not-mozilla.diff +++ virt-viewer-0.0.3/debian/patches/iceape-not-mozilla.diff @@ -0,0 +1,22 @@ +diff --git a/configure.ac b/configure.ac +index b4676d5..77c8542 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -22,7 +22,7 @@ PKG_CHECK_MODULES(GTKVNC, gtk-vnc-1.0 >= 0.0.1) + dnl --enable-plugin to enable the browser plugin. + NSPR_REQUIRED=4.0.0 + FIREFOX_PLUGIN_REQUIRED=1.5.0 +-MOZILLA_PLUGIN_REQUIRED=1.8 ++MOZILLA_PLUGIN_REQUIRED=1.0 + AC_ARG_ENABLE(plugin, + [ --enable-plugin=[no/yes] enable browser plugin [default=no]],, + enable_plugin=no) +@@ -33,7 +33,7 @@ if test "x$enable_plugin" = "xyes"; then + PKG_CHECK_MODULES(FIREFOX_PLUGIN, + firefox-plugin >= $FIREFOX_PLUGIN_REQUIRED, ,[ + PKG_CHECK_MODULES(MOZILLA_PLUGIN, +- mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED) ++ iceape-plugin >= $MOZILLA_PLUGIN_REQUIRED) + FIREFOX_PLUGIN_CFLAGS="$MOZILLA_PLUGIN_CFLAGS" + FIREFOX_PLUGIN_LIBS="$MOZILLA_PLUGIN_LIBS" + ]) --- virt-viewer-0.0.3.orig/debian/patches/rm-in-plugindir.diff +++ virt-viewer-0.0.3/debian/patches/rm-in-plugindir.diff @@ -0,0 +1,13 @@ +diff --git a/plugin/Makefile.am b/plugin/Makefile.am +index ff1536e..2ccffe6 100644 +--- a/plugin/Makefile.am ++++ b/plugin/Makefile.am +@@ -26,7 +26,7 @@ virt-viewer-plugin.so: virt-viewer-plugin.la + + # Only leave the .so file in the plugins directory. + install-data-hook: +- rm -f $(plugindir)/virt-viewer-plugin.a $(plugindir)/virt-viewer-plugin.la ++ rm -f $(DESTDIR)$(plugindir)/virt-viewer-plugin.a $(DESTDIR)$(plugindir)/virt-viewer-plugin.la + + CLEANFILES = virt-viewer-plugin.so + --- virt-viewer-0.0.3.orig/debian/patches/ctrl-alt-f9.diff +++ virt-viewer-0.0.3/debian/patches/ctrl-alt-f9.diff @@ -0,0 +1,12 @@ +diff -urNad virt-viewer-0.0.2~/src/main.c virt-viewer-0.0.2/src/main.c +--- virt-viewer-0.0.2~/src/main.c 2007-08-29 02:33:27.000000000 +0200 ++++ virt-viewer-0.0.2/src/main.c 2008-02-09 00:33:06.006274772 +0100 +@@ -62,6 +62,8 @@ + { { GDK_Control_L, GDK_Alt_L, GDK_F6 }, 3, "Ctrl+Alt+F_6"}, + { { GDK_Control_L, GDK_Alt_L, GDK_F7 }, 3, "Ctrl+Alt+F_7"}, + { { GDK_Control_L, GDK_Alt_L, GDK_F8 }, 3, "Ctrl+Alt+F_8"}, ++ { { GDK_Control_L, GDK_Alt_L, GDK_F9 }, 3, "Ctrl+Alt+F_9"}, ++ + { {}, 0, "" }, + { { GDK_Print }, 1, "_PrintScreen"}, + }; --- virt-viewer-0.0.3.orig/debian/patches/series +++ virt-viewer-0.0.3/debian/patches/series @@ -0,0 +1,4 @@ +#iceape-not-mozilla.diff +rm-in-plugindir.diff +ctrl-alt-f9.diff +better-default-uri.diff --- virt-viewer-0.0.3.orig/debian/patches/better-default-uri.diff +++ virt-viewer-0.0.3/debian/patches/better-default-uri.diff @@ -0,0 +1,33 @@ +Index: virt-viewer-0.0.3/src/main.c +=================================================================== +--- virt-viewer-0.0.3.orig/src/main.c 2009-01-05 00:29:03.372881883 +0100 ++++ virt-viewer-0.0.3/src/main.c 2009-01-05 00:30:37.280850983 +0100 +@@ -44,6 +44,8 @@ + #define DEBUG_LOG(s, ...) do {} while (0) + #endif + ++#define LIBVIRTD_PRIV_UNIX_SOCKET "/var/run/libvirt/libvirt-sock" ++ + static char *domname = NULL; + static int verbose = 0; + #define MAX_KEY_COMBO 3 +@@ -797,10 +799,18 @@ + + verbose = set_verbose; + ++ if (uri == NULL) { ++ if (!access(LIBVIRTD_PRIV_UNIX_SOCKET, W_OK)) ++ uri = strdup("qemu:///system"); ++ else ++ uri = strdup("qemu:///session"); ++ } else if (strcasecmp(uri, "xen")) ++ uri = strdup("xen:///"); ++ + conn = virConnectOpenReadOnly(uri); + if (!conn) { + fprintf(stderr, "unable to connect to libvirt %s\n", +- uri ? uri : "xen"); ++ uri); + return 2; + } +