[Pkg-libvirt-commits] [SCM] VirtViewer Debian packaging branch, master, updated. debian/0.2.1-1

Guido Günther agx at sigxcpu.org
Tue Feb 2 20:40:14 UTC 2010


The following commit has been merged in the master branch:
commit b6fa2e236f83bdfea1521b634b06fbafcc2403c2
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Feb 2 20:10:45 2010 +0100

    Use xulrunner-dev instead of iceape-dev

diff --git a/debian/control b/debian/control
index bcc99d1..4e3f05e 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 Günther <agx at sigxcpu.org>, Laurent Léonard <laurent at open-minds.org>
 Build-Depends: cdbs, debhelper (>= 7), autotools-dev, libvirt-dev, libgtk-vnc-1.0-dev (>= 0.3.4), libxml2-dev, 
- libgtk2.0-dev (>= 2.10), iceape-dev (>= 1.1.9-5), autotools-dev, quilt, automake, autoconf, libffi-dev, libtool,
+ libgtk2.0-dev (>= 2.10), xulrunner-dev, autotools-dev, quilt, automake, autoconf, libffi-dev, libtool,
  libglade2-dev, intltool
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-libvirt/virt-viewer.git
diff --git a/debian/patches/0001-iceape-not-mozilla.diff.patch b/debian/patches/0001-iceape-not-mozilla.diff.patch
deleted file mode 100644
index 30941ba..0000000
--- a/debian/patches/0001-iceape-not-mozilla.diff.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Thu, 30 Jul 2009 15:20:30 +0200
-Subject: [PATCH] iceape-not-mozilla.diff
-
----
- configure.ac |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 79cad96..190c984 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -29,7 +29,7 @@ AC_CHECK_FUNCS([fork socketpair])
- 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)
-@@ -40,7 +40,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
deleted file mode 100644
index 9fad473..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-iceape-not-mozilla.diff.patch

-- 
VirtViewer Debian packaging



More information about the Pkg-libvirt-commits mailing list