[Pkg-libvirt-commits] [SCM] VirtViewer Debian packaging branch, master, updated. debian/0.0.3-7-6-gffb0efa

[Guido Günther]

The following commit has been merged in the master branch:
commit 6152ea0199aa8ca8740bdb5909b852406cabe7b9
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Jul 30 15:24:17 2009 +0200

    drop patch applied upstream
    
    rm-in-plugindir.diff

diff --git a/debian/patches/iceape-not-mozilla.diff b/debian/patches/0001-iceape-not-mozilla.diff.patch
similarity index 68%
rename from debian/patches/iceape-not-mozilla.diff
rename to debian/patches/0001-iceape-not-mozilla.diff.patch
index f902fac..30941ba 100644
--- a/debian/patches/iceape-not-mozilla.diff
+++ b/debian/patches/0001-iceape-not-mozilla.diff.patch
@@ -1,8 +1,16 @@
+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 b4676d5..77c8542 100644
+index 79cad96..190c984 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -22,7 +22,7 @@ PKG_CHECK_MODULES(GTKVNC, gtk-vnc-1.0 >= 0.0.1)
+@@ -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
@@ -11,7 +19,7 @@ index b4676d5..77c8542 100644
  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
+@@ -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,
@@ -20,3 +28,4 @@ index b4676d5..77c8542 100644
          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

-- 
VirtViewer Debian packaging