[Pkg-libvirt-commits] [SCM] libgtk-vnc Debian packaging branch, master, updated. debian/0.3.10-1-3-g3827821

[Guido Günther]

The following commit has been merged in the master branch:
commit 5974baec9886bd639ba7450526aa84662905646a
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sun Nov 15 14:18:51 2009 +0100

    Use xulrunner-dev instead of iceape-dev
    
    Closes: #555908

diff --git a/debian/control b/debian/control
index 16c8494..e006aed 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Maintainer: Guido Günther <agx at sigxcpu.org>
 Standards-Version: 3.8.3
 Build-Depends: cdbs, debhelper (>= 7), python-central, libgtk2.0-dev,
  python-all-dev, libgnutls-dev (>= 1.4.0), python-gtk2-dev (>= 2.0),
- libcairo2-dev, iceape-dev (>= 1.1.9-5), autotools-dev, quilt,
+ libcairo2-dev, xulrunner-dev, autotools-dev, quilt,
  automake, autoconf, libffi-dev, libtool, libsasl2-dev, intltool
 Build-Conflicts: libffi4-dev
 Vcs-Git: git://git.debian.org/git/pkg-libvirt/gtk-vnc.git
diff --git a/debian/patches/0001-use-xulrunner-not-mozilla.patch b/debian/patches/0001-use-xulrunner-not-mozilla.patch
deleted file mode 100644
index 68fca43..0000000
--- a/debian/patches/0001-use-xulrunner-not-mozilla.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Sat, 3 Jan 2009 18:25:03 +0100
-Subject: [PATCH] use xulrunner not mozilla
-
----
- configure.ac |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2131706..78b554b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -30,7 +30,7 @@ PYTHON_REQUIRED=2.4
- 
- NSPR_REQUIRED=4.0.0
- FIREFOX_PLUGIN_REQUIRED=2.0.0
--MOZILLA_PLUGIN_REQUIRED=1.8
-+MOZILLA_PLUGIN_REQUIRED=1.0
- 
- dnl *******************************************************************************
- dnl Setup GNULIB - must be before anything else in this file
-@@ -266,7 +266,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
index e9b5a30..9a2f958 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-0001-use-xulrunner-not-mozilla.patch
 0002-say-disconnected-from-server-only-once-connected.patch
 0003-remove-WERROR_CFLAGS.patch

-- 
libgtk-vnc Debian packaging