[SCM] Debian packaging for swt-gtk. branch, master, updated. debian/3.8.0_rc2-3-10-gbec5fa4

[Jakub Adam]

The following commit has been merged in the master branch:
commit c4fe7237fef825b2643993a7cf5e4b8cc1dc0285
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sun Apr 29 16:51:48 2012 +0200

    Search for JNI libraries in Debian location /usr/lib/jni
    
    This allows Sun/Oracle JRE to find the libraries.

diff --git a/debian/changelog b/debian/changelog
index 423ad6d..bc8347f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ swt-gtk (3.8.0~m6-1) UNRELEASED; urgency=low
     swt-gtk-$(RELEASE).jar
   * Updated 01-as-needed.diff patch for new upstream release.
   * Updated arch64.diff patch for new upstream release.
+  * Search for JNI libraries in Debian location /usr/lib/jni
+    (Closes: #663734 #665195 #668002)
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Sun, 18 Mar 2012 19:44:15 +0100
 
diff --git a/debian/patches/common/search-usr-lib-jni.diff b/debian/patches/common/search-usr-lib-jni.diff
new file mode 100644
index 0000000..407b685
--- /dev/null
+++ b/debian/patches/common/search-usr-lib-jni.diff
@@ -0,0 +1,28 @@
+From 67941dbb88d763bfbd62825d893c4ed676800ec3 Mon Sep 17 00:00:00 2001
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Sun, 29 Apr 2012 16:46:01 +0200
+Subject: [PATCH] Search for JNI libraries in Debian location /usr/lib/jni
+
+This allows Sun/Oracle JRE to find the libraries.
+---
+ org/eclipse/swt/internal/Library.java |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/org/eclipse/swt/internal/Library.java b/org/eclipse/swt/internal/Library.java
+index d76b39a..12374a2 100644
+--- a/org/eclipse/swt/internal/Library.java
++++ b/org/eclipse/swt/internal/Library.java
+@@ -302,6 +302,10 @@ public static void loadLibrary (String name, boolean mapName) {
+ 	if (load (libName1, message)) return;
+ 	if (mapName && load (libName2, message)) return;
+ 
++	/* Try the Debian location /usr/lib/jni/ */
++	if (load ("/usr/lib/jni" + SEPARATOR + mappedName1, message)) return;
++	if (mapName && load ("/usr/lib/jni" + SEPARATOR + mappedName2, message)) return;
++
+ 	/* Try loading library from the tmp directory if swt library path is not specified */
+ 	String fileName1 = mappedName1;
+ 	String fileName2 = mappedName2;
+-- 
+1.7.10
+

-- 
Debian packaging for swt-gtk.