[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.8, updated. eclipse/3.8.0_rc3-1-4-g7e34096

[Jakub Adam]

The following commit has been merged in the master-3.8 branch:
commit 4b400651a279fbf512b5e761bad3e73626173f09
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Tue Jun 5 22:06:03 2012 +0200

    Install libgnomeproxy to system JNI directory.
    
    Prevents the .so file from being copied in to user's ~/.eclipse

diff --git a/debian/changelog b/debian/changelog
index 370e6bb..ba11598 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 eclipse (3.8.0~rc3-2) UNRELEASED; urgency=low
 
   * Fix FTBFS on most architectures.
+  * Install libgnomeproxy-1.0.0.so to system JNI directory.
+   - Prevents the library from being copied in to user's ~/.eclipse
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Tue, 05 Jun 2012 22:34:51 +0200
 
diff --git a/debian/patches/install-libgnomeproxy-to-jni-directory.patch b/debian/patches/install-libgnomeproxy-to-jni-directory.patch
new file mode 100644
index 0000000..2fe5ab9
--- /dev/null
+++ b/debian/patches/install-libgnomeproxy-to-jni-directory.patch
@@ -0,0 +1,37 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Tue, 5 Jun 2012 22:04:23 +0200
+Subject: install-libgnomeproxy-to-jni-directory
+
+---
+ eclipse/plugins/org.eclipse.core.net.linux.x86/build.properties    |    3 +--
+ eclipse/plugins/org.eclipse.core.net.linux.x86_64/build.properties |    3 +--
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/eclipse/plugins/org.eclipse.core.net.linux.x86/build.properties b/eclipse/plugins/org.eclipse.core.net.linux.x86/build.properties
+index a698f05..39b538f 100644
+--- a/eclipse/plugins/org.eclipse.core.net.linux.x86/build.properties
++++ b/eclipse/plugins/org.eclipse.core.net.linux.x86/build.properties
+@@ -12,8 +12,7 @@ bin.includes = fragment.properties,\
+                .,\
+                META-INF/,\
+                about.html,\
+-               bin/,\
+-               libgnomeproxy-1.0.0.so
++               bin/
+ src.includes = about.html
+ generateSourceBundle=false
+ source.. = src/
+diff --git a/eclipse/plugins/org.eclipse.core.net.linux.x86_64/build.properties b/eclipse/plugins/org.eclipse.core.net.linux.x86_64/build.properties
+index b43277d..83d7877 100644
+--- a/eclipse/plugins/org.eclipse.core.net.linux.x86_64/build.properties
++++ b/eclipse/plugins/org.eclipse.core.net.linux.x86_64/build.properties
+@@ -12,8 +12,7 @@ bin.includes = fragment.properties,\
+                .,\
+                META-INF/,\
+                about.html,\
+-               bin/,\
+-               libgnomeproxy-1.0.0.so
++               bin
+ src.includes = about.html
+ generateSourceBundle=false
+ source.. = src/
diff --git a/debian/patches/series b/debian/patches/series
index 777e538..959940a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -34,3 +34,4 @@ install-new-icons.patch
 disable-useless-patches.patch
 generate-additional-archs.patch
 eclipse-add-archs-net.patch
+install-libgnomeproxy-to-jni-directory.patch
diff --git a/debian/rules b/debian/rules
index c557dc9..d316a6e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -74,6 +74,8 @@ override_dh_install:
 	dh_install --list-missing
 	$(if $(wildcard debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.net.linux.*.jar),dh_install -peclipse-platform debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.net.linux.*.jar /usr/lib/eclipse/plugins)
 	$(if $(wildcard debian/tmp/usr/lib/eclipse/plugins/org.eclipse.update.core.linux*.jar),dh_install -peclipse-platform debian/tmp/usr/lib/eclipse/plugins/org.eclipse.update.core.linux*.jar /usr/lib/eclipse/plugins)
+	dh_install -peclipse-platform build/*/plugins/org.eclipse.core.net/fragments/*/libgnomeproxy*.so \
+		usr/lib/$(DEB_HOST_MULTIARCH)/jni
 	find $(CFG_OSGI_BUNDLES_PATH) -depth -type d -a -empty -delete
 	# Check if we are doing a -B build
 	[ ! -d debian/eclipse-platform-data ] || debian/rules override_dh_install_indep

-- 
eclipse - Powerful IDE written in java - Debian package.