[pkg-java] r13487 - in trunk/libjogl-java/debian: . patches source

[Sylvestre Ledru]

Author: sylvestre
Date: 2011-04-01 09:47:57 +0000 (Fri, 01 Apr 2011)
New Revision: 13487

Added:
   trunk/libjogl-java/debian/source/
   trunk/libjogl-java/debian/source/format
Modified:
   trunk/libjogl-java/debian/changelog
   trunk/libjogl-java/debian/control
   trunk/libjogl-java/debian/patches/defaultDebianPath.diff
   trunk/libjogl-java/debian/patches/series
Log:
  * Update the patch to set java.library.path (using static instead of doing
    this into the method). Thanks to Aidan Delaney.
  * Standards-Version updated to version 3.9.1
  * Switch to dpkg-source 3.0 (quilt) format


Modified: trunk/libjogl-java/debian/changelog
===================================================================
--- trunk/libjogl-java/debian/changelog	2011-04-01 05:20:53 UTC (rev 13486)
+++ trunk/libjogl-java/debian/changelog	2011-04-01 09:47:57 UTC (rev 13487)
@@ -1,3 +1,12 @@
+libjogl-java (1.1.1+dak1-10) unstable; urgency=low
+
+  * Update the patch to set java.library.path (using static instead of doing
+    this into the method). Thanks to Aidan Delaney.
+  * Standards-Version updated to version 3.9.1
+  * Switch to dpkg-source 3.0 (quilt) format
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 01 Apr 2011 11:10:54 +0200
+
 libjogl-java (1.1.1+dak1-9) unstable; urgency=low
 
   * Change Build-Depends: ant1.7-optional because it FTBFS with ant 1.8.

Modified: trunk/libjogl-java/debian/control
===================================================================
--- trunk/libjogl-java/debian/control	2011-04-01 05:20:53 UTC (rev 13486)
+++ trunk/libjogl-java/debian/control	2011-04-01 09:47:57 UTC (rev 13487)
@@ -10,7 +10,7 @@
 # antlr java packages started to exist at version 2.7.7-8. Before, it 
 # was included in the antlr package
  libantlr-java | antlr ( <= 2.7.7-7 )
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
 Homepage: http://jogl.dev.java.net
 Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/libjogl-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjogl-java/

Modified: trunk/libjogl-java/debian/patches/defaultDebianPath.diff
===================================================================
--- trunk/libjogl-java/debian/patches/defaultDebianPath.diff	2011-04-01 05:20:53 UTC (rev 13486)
+++ trunk/libjogl-java/debian/patches/defaultDebianPath.diff	2011-04-01 09:47:57 UTC (rev 13487)
@@ -1,13 +1,30 @@
---- jogl-1.1.1.orig/jogl/src/classes/com/sun/opengl/impl/NativeLibLoader.java	2007-07-20 17:06:04.000000000 +0200
-+++ jogl-1.1.1/jogl/src/classes/com/sun/opengl/impl/NativeLibLoader.java	2008-12-29 13:42:13.000000000 +0100
-@@ -186,7 +186,9 @@
-           throw (UnsatisfiedLinkError) new UnsatisfiedLinkError().initCause(e);
-         }
-     } else {
--      System.loadLibrary(libraryName);
-+		String javaLibPath = System.getProperty("java.library.path") + File.pathSeparator + "/usr/lib/jni" + File.pathSeparator + "/usr/lib64/jni";
-+		System.setProperty("java.library.path", javaLibPath);
-+		System.loadLibrary(libraryName);
-     }
-   }
- }
+diff -ur libjogl-java-1.1.1+dak1.orig//gluegen/src/java/com/sun/gluegen/runtime/NativeLibLoader.java libjogl-java-1.1.1+dak1//gluegen/src/java/com/sun/gluegen/runtime/NativeLibLoader.java
+--- libjogl-java-1.1.1+dak1.orig//gluegen/src/java/com/sun/gluegen/runtime/NativeLibLoader.java	2007-07-20 17:04:48.000000000 +0200
++++ libjogl-java-1.1.1+dak1//gluegen/src/java/com/sun/gluegen/runtime/NativeLibLoader.java	2011-04-01 11:30:51.000000000 +0200
+@@ -49,6 +49,11 @@
+     this default loading behavior and load the native code via another
+     (manual) mechanism. */
+ public class NativeLibLoader {
++    static {                                                                                                                                                          
++	System.setProperty("java.library.path", System.getProperty("java.library.path") + java.io.File.pathSeparator + "/usr/lib/jni/" + java.io.File.pathSeparator
++			   + "/usr/lib64/jni/");
++    }  
++
+   private static volatile boolean loadingEnabled = true;
+   private static volatile boolean didLoading;
+ 
+diff -ur libjogl-java-1.1.1+dak1.orig//jogl/src/classes/com/sun/opengl/impl/NativeLibLoader.java libjogl-java-1.1.1+dak1//jogl/src/classes/com/sun/opengl/impl/NativeLibLoader.java
+--- libjogl-java-1.1.1+dak1.orig//jogl/src/classes/com/sun/opengl/impl/NativeLibLoader.java	2007-07-20 17:06:04.000000000 +0200
++++ libjogl-java-1.1.1+dak1//jogl/src/classes/com/sun/opengl/impl/NativeLibLoader.java	2011-04-01 11:30:22.000000000 +0200
+@@ -47,6 +47,11 @@
+ import java.util.HashSet;
+ 
+ public class NativeLibLoader {
++    // Update java.library.path as early as possible
++    static {
++	System.setProperty("java.library.path", System.getProperty("java.library.path") + java.io.File.pathSeparator + "/usr/lib/jni" + java.io.File.pathSeparator + "/usr/lib64/jni");
++    }
++
+   public interface LoaderAction {
+     /**
+      * Loads the library specified by libname. Optionally preloads the libraries specified by

Modified: trunk/libjogl-java/debian/patches/series
===================================================================
--- trunk/libjogl-java/debian/patches/series	2011-04-01 05:20:53 UTC (rev 13486)
+++ trunk/libjogl-java/debian/patches/series	2011-04-01 09:47:57 UTC (rev 13487)
@@ -3,3 +3,4 @@
 cg-common.cfg.diff
 
 
+defaultDebianPath.diff

Added: trunk/libjogl-java/debian/source/format
===================================================================
--- trunk/libjogl-java/debian/source/format	                        (rev 0)
+++ trunk/libjogl-java/debian/source/format	2011-04-01 09:47:57 UTC (rev 13487)
@@ -0,0 +1 @@
+3.0 (quilt)