[Pkg-libvirt-commits] [SCM] Virt Viewer packaging branch, master, updated. debian/0.0.3-2-8-g2b48c69

[Guido Guenther]

The following commit has been merged in the master branch:
commit 314c1a9af1b4283d10a87c29bd94bab4b79e7325
Author: Guido Günther <agx at sigxcpu.org>
Date:   Mon Oct 27 20:13:26 2008 +0100

    build the mozilla-plugin

diff --git a/debian/control b/debian/control
index bc01421..d2a9a75 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian Libvirt Maintainers <pkg-libvirt-maintainers at lists.alioth.debian.org>
 Uploaders: Guido Guenther <agx at sigxcpu.org>
 Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libvirt-dev, libgtk-vnc-1.0-dev (>= 0.3.4), libxml2-dev, 
- libgtk2.0-dev (>= 2.10)
+ libgtk2.0-dev (>= 2.10), iceape-dev (>= 1.1.9-5), autotools-dev, quilt, automake, autoconf, libffi-dev
 Standards-Version: 3.7.3
 
 Package: virt-viewer
@@ -18,3 +18,19 @@ Description: Displaying the graphical console of a virtual machine
  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}
+ iceweasel | iceape-browser
+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.
+
diff --git a/debian/mozilla-virt-viewer.install b/debian/mozilla-virt-viewer.install
new file mode 100644
index 0000000..f42627e
--- /dev/null
+++ b/debian/mozilla-virt-viewer.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/mozilla/plugins/*.so usr/lib/virt-viewer/plugins/
diff --git a/debian/mozilla-virt-viewer.links b/debian/mozilla-virt-viewer.links
new file mode 100644
index 0000000..6666974
--- /dev/null
+++ b/debian/mozilla-virt-viewer.links
@@ -0,0 +1,2 @@
+/usr/lib/virt-viewer/plugins/virt-viewer-plugin.so /usr/lib/iceweasel/plugins/virt-viewer-plugin.so
+/usr/lib/virt-viewer/plugins/virt-viewer-plugin.so /usr/lib/iceape/plugins/virt-viewer-plugin.so
diff --git a/debian/patches/iceape-not-mozilla.diff b/debian/patches/iceape-not-mozilla.diff
new file mode 100644
index 0000000..f902fac
--- /dev/null
+++ b/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"
+     ])
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..59fb3d7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+iceape-not-mozilla.diff
diff --git a/debian/rules b/debian/rules
index 7a8b219..f6055dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,12 @@ 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
 
 clean::
 	rm -f man/virt-viewer.1
+
+post-patches::
+	autoreconf

-- 
Virt Viewer packaging