diff --git a/debian/patches/0001-iceape-not-mozilla.diff.patch b/debian/patches/0001-iceape-not-mozilla.diff.patch new file mode 100644 index 0000000..30941ba --- /dev/null +++ b/debian/patches/0001-iceape-not-mozilla.diff.patch @@ -0,0 +1,31 @@ +From: =?utf-8?q?Guido=20G=C3=BCnther?= +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/iceape-not-mozilla.diff b/debian/patches/iceape-not-mozilla.diff deleted file mode 100644 index f902fac..0000000 --- a/debian/patches/iceape-not-mozilla.diff +++ /dev/null @@ -1,22 +0,0 @@ -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/rm-in-plugindir.diff b/debian/patches/rm-in-plugindir.diff deleted file mode 100644 index 6e0e47b..0000000 --- a/debian/patches/rm-in-plugindir.diff +++ /dev/null @@ -1,13 +0,0 @@ -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 - diff --git a/debian/patches/series b/debian/patches/series index b348cdb..9fad473 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -iceape-not-mozilla.diff -rm-in-plugindir.diff +0001-iceape-not-mozilla.diff.patch