[pkg-java] r16356 - in trunk/gluegen2/debian: . patches
Sylvestre Ledru
sylvestre at alioth.debian.org
Thu Nov 8 16:23:14 UTC 2012
Author: sylvestre
Date: 2012-11-08 16:23:14 +0000 (Thu, 08 Nov 2012)
New Revision: 16356
Modified:
trunk/gluegen2/debian/changelog
trunk/gluegen2/debian/patches/disable-test-zip-archive.diff
trunk/gluegen2/debian/patches/disableArchive7z.diff
trunk/gluegen2/debian/patches/hideException.diff
trunk/gluegen2/debian/patches/jarPath.diff
trunk/gluegen2/debian/patches/linker.diff
trunk/gluegen2/debian/patches/renamedLibrary.diff
Log:
New upstream release
Modified: trunk/gluegen2/debian/changelog
===================================================================
--- trunk/gluegen2/debian/changelog 2012-11-08 15:19:13 UTC (rev 16355)
+++ trunk/gluegen2/debian/changelog 2012-11-08 16:23:14 UTC (rev 16356)
@@ -1,3 +1,9 @@
+gluegen2 (2.0-rc11-1~exp1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Thu, 08 Nov 2012 16:21:32 +0100
+
gluegen2 (2.0-rc10-1~exp1) experimental; urgency=low
* New upstream release
Modified: trunk/gluegen2/debian/patches/disable-test-zip-archive.diff
===================================================================
--- trunk/gluegen2/debian/patches/disable-test-zip-archive.diff 2012-11-08 15:19:13 UTC (rev 16355)
+++ trunk/gluegen2/debian/patches/disable-test-zip-archive.diff 2012-11-08 16:23:14 UTC (rev 16356)
@@ -1,8 +1,8 @@
-Index: gluegen-v2.0-rc8/make/build-test.xml
+Index: gluegen-v2.0-rc11/make/build-test.xml
===================================================================
---- gluegen-v2.0-rc8.orig/make/build-test.xml 2012-04-25 13:09:30.000000000 +0200
-+++ gluegen-v2.0-rc8/make/build-test.xml 2012-05-15 14:26:50.000000000 +0200
-@@ -442,7 +442,7 @@
+--- gluegen-v2.0-rc11.orig/make/build-test.xml 2012-10-31 19:42:42.000000000 +0100
++++ gluegen-v2.0-rc11/make/build-test.xml 2012-11-08 16:25:24.000000000 +0100
+@@ -443,7 +443,7 @@
</target>
<target name="junit.run" depends="junit.run.settings, junit.run.if.enabled, junit.run.if.disabled">
Modified: trunk/gluegen2/debian/patches/disableArchive7z.diff
===================================================================
--- trunk/gluegen2/debian/patches/disableArchive7z.diff 2012-11-08 15:19:13 UTC (rev 16355)
+++ trunk/gluegen2/debian/patches/disableArchive7z.diff 2012-11-08 16:23:14 UTC (rev 16356)
@@ -1,8 +1,8 @@
-Index: gluegen-v2.0-rc9/make/build.xml
+Index: gluegen-v2.0-rc11/make/build.xml
===================================================================
---- gluegen-v2.0-rc9.orig/make/build.xml 2012-06-20 03:09:50.000000000 +0200
-+++ gluegen-v2.0-rc9/make/build.xml 2012-07-02 02:53:25.966571707 +0200
-@@ -933,9 +933,9 @@
+--- gluegen-v2.0-rc11.orig/make/build.xml 2012-10-31 19:42:42.000000000 +0100
++++ gluegen-v2.0-rc11/make/build.xml 2012-11-08 16:25:22.000000000 +0100
+@@ -936,9 +936,9 @@
<classpath path="${classes}"/>
<link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" />
</javadoc>
Modified: trunk/gluegen2/debian/patches/hideException.diff
===================================================================
--- trunk/gluegen2/debian/patches/hideException.diff 2012-11-08 15:19:13 UTC (rev 16355)
+++ trunk/gluegen2/debian/patches/hideException.diff 2012-11-08 16:23:14 UTC (rev 16356)
@@ -1,43 +1,27 @@
-Index: gluegen-v2.0-rc10/src/java/com/jogamp/common/os/Platform.java
+Index: gluegen-v2.0-rc11/src/java/com/jogamp/common/os/Platform.java
===================================================================
---- gluegen-v2.0-rc10.orig/src/java/com/jogamp/common/os/Platform.java 2012-09-02 14:56:25.000000000 +0200
-+++ gluegen-v2.0-rc10/src/java/com/jogamp/common/os/Platform.java 2012-09-02 14:58:12.222431352 +0200
-@@ -230,22 +230,22 @@
+--- gluegen-v2.0-rc11.orig/src/java/com/jogamp/common/os/Platform.java 2012-11-08 16:25:14.000000000 +0100
++++ gluegen-v2.0-rc11/src/java/com/jogamp/common/os/Platform.java 2012-11-08 16:29:46.000000000 +0100
+@@ -232,22 +232,6 @@
+ }
+
private static final void loadGlueGenRTImpl() {
- AccessController.doPrivileged(new PrivilegedAction<Object>() {
- public Object run() {
-- if(USE_TEMP_JAR_CACHE && TempJarCache.initSingleton()) {
-- String nativeJarName = null;
-- URL jarUrlRoot = null;
-- URL nativeJarURL = null;
-- try {
-- final String jarName = JarUtil.getJarBasename(platformClassJarURL);
-- final String nativeJarBasename = jarName.substring(0, jarName.indexOf(".jar")); // ".jar" already validated w/ JarUtil.getJarBasename(..)
-- nativeJarName = nativeJarBasename+"-natives-"+PlatformPropsImpl.os_and_arch+".jar";
-- jarUrlRoot = JarUtil.getURLDirname( JarUtil.getJarSubURL(platformClassJarURL) );
-- nativeJarURL = JarUtil.getJarFileURL(jarUrlRoot, nativeJarName);
-- TempJarCache.bootstrapNativeLib(Platform.class, libBaseName, nativeJarURL);
-- } catch (Exception e0) {
-- // IllegalArgumentException, IOException
-- System.err.println("Catched "+e0.getClass().getSimpleName()+": "+e0.getMessage()+", while TempJarCache.bootstrapNativeLib() of "+nativeJarURL+" ("+jarUrlRoot+" + "+nativeJarName+")");
-- }
-- }
-+ // if(USE_TEMP_JAR_CACHE && TempJarCache.initSingleton()) {
-+ // String nativeJarName = null;
-+ // URL jarUrlRoot = null;
-+ // URL nativeJarURL = null;
-+ // try {
-+ // final String jarName = JarUtil.getJarBasename(platformClassJarURL);
-+ // final String nativeJarBasename = jarName.substring(0, jarName.indexOf(".jar")); // ".jar" already validated w/ JarUtil.getJarBasename(..)
-+ // nativeJarName = nativeJarBasename+"-natives-"+PlatformPropsImpl.os_and_arch+".jar";
-+ // jarUrlRoot = JarUtil.getURLDirname( JarUtil.getJarSubURL(platformClassJarURL) );
-+ // nativeJarURL = JarUtil.getJarFileURL(jarUrlRoot, nativeJarName);
-+ // TempJarCache.bootstrapNativeLib(Platform.class, libBaseName, nativeJarURL);
-+ // } catch (Exception e0) {
-+ // // IllegalArgumentException, IOException
-+ // System.err.println("Catched "+e0.getClass().getSimpleName()+": "+e0.getMessage()+", while TempJarCache.bootstrapNativeLib() of "+nativeJarURL+" ("+jarUrlRoot+" + "+nativeJarName+")");
-+ // }
-+ // }
- DynamicLibraryBundle.GlueJNILibLoader.loadLibrary(libBaseName, false, Platform.class.getClassLoader());
- return null;
- }
+- if(USE_TEMP_JAR_CACHE && TempJarCache.initSingleton()) {
+- String nativeJarName = null;
+- URL jarUrlRoot = null;
+- URL nativeJarURL = null;
+- try {
+- final String jarName = JarUtil.getJarBasename(platformClassJarURL);
+- final String nativeJarBasename = jarName.substring(0, jarName.indexOf(".jar")); // ".jar" already validated w/ JarUtil.getJarBasename(..)
+- nativeJarName = nativeJarBasename+"-natives-"+PlatformPropsImpl.os_and_arch+".jar";
+- jarUrlRoot = JarUtil.getURLDirname( JarUtil.getJarSubURL(platformClassJarURL) );
+- nativeJarURL = JarUtil.getJarFileURL(jarUrlRoot, nativeJarName);
+- TempJarCache.bootstrapNativeLib(Platform.class, libBaseName, nativeJarURL);
+- } catch (Exception e0) {
+- // IllegalArgumentException, IOException
+- System.err.println("Catched "+e0.getClass().getSimpleName()+": "+e0.getMessage()+", while TempJarCache.bootstrapNativeLib() of "+nativeJarURL+" ("+jarUrlRoot+" + "+nativeJarName+")");
+- }
+- }
+ DynamicLibraryBundle.GlueJNILibLoader.loadLibrary(libBaseName, false, Platform.class.getClassLoader());
+ }
+
Modified: trunk/gluegen2/debian/patches/jarPath.diff
===================================================================
--- trunk/gluegen2/debian/patches/jarPath.diff 2012-11-08 15:19:13 UTC (rev 16355)
+++ trunk/gluegen2/debian/patches/jarPath.diff 2012-11-08 16:23:14 UTC (rev 16356)
@@ -1,8 +1,8 @@
-Index: gluegen-v2.0-rc9/make/gluegen-properties.xml
+Index: gluegen-v2.0-rc11/make/gluegen-properties.xml
===================================================================
---- gluegen-v2.0-rc9.orig/make/gluegen-properties.xml 2012-06-20 03:09:50.000000000 +0200
-+++ gluegen-v2.0-rc9/make/gluegen-properties.xml 2012-07-02 02:47:03.304555233 +0200
-@@ -39,10 +39,10 @@
+--- gluegen-v2.0-rc11.orig/make/gluegen-properties.xml 2012-10-31 19:42:42.000000000 +0100
++++ gluegen-v2.0-rc11/make/gluegen-properties.xml 2012-11-08 16:23:52.000000000 +0100
+@@ -46,10 +46,10 @@
<property name="gluegen.user.properties.file.set" value="${gluegen.user.properties.file}"/>
<property file="${gluegen.user.properties.file.set}" />
<echo message="Loaded ${gluegen.user.properties.file.set}." />
Modified: trunk/gluegen2/debian/patches/linker.diff
===================================================================
--- trunk/gluegen2/debian/patches/linker.diff 2012-11-08 15:19:13 UTC (rev 16355)
+++ trunk/gluegen2/debian/patches/linker.diff 2012-11-08 16:23:14 UTC (rev 16356)
@@ -1,8 +1,8 @@
-Index: gluegen-v2.0-rc8/make/gluegen-cpptasks-base.xml
+Index: gluegen-v2.0-rc11/make/gluegen-cpptasks-base.xml
===================================================================
---- gluegen-v2.0-rc8.orig/make/gluegen-cpptasks-base.xml 2012-05-15 14:27:17.000000000 +0200
-+++ gluegen-v2.0-rc8/make/gluegen-cpptasks-base.xml 2012-05-15 14:29:24.000000000 +0200
-@@ -1133,6 +1133,27 @@
+--- gluegen-v2.0-rc11.orig/make/gluegen-cpptasks-base.xml 2012-10-31 19:42:42.000000000 +0100
++++ gluegen-v2.0-rc11/make/gluegen-cpptasks-base.xml 2012-11-08 16:25:28.000000000 +0100
+@@ -1149,6 +1149,27 @@
<linker id="linker.cfg.linux.sparc" name="gcc">
</linker>
Modified: trunk/gluegen2/debian/patches/renamedLibrary.diff
===================================================================
--- trunk/gluegen2/debian/patches/renamedLibrary.diff 2012-11-08 15:19:13 UTC (rev 16355)
+++ trunk/gluegen2/debian/patches/renamedLibrary.diff 2012-11-08 16:23:14 UTC (rev 16356)
@@ -1,7 +1,7 @@
-Index: gluegen-v2.0-rc10/src/junit/com/jogamp/common/util/TestTempJarCache.java
+Index: gluegen-v2.0-rc11/src/junit/com/jogamp/common/util/TestTempJarCache.java
===================================================================
---- gluegen-v2.0-rc10.orig/src/junit/com/jogamp/common/util/TestTempJarCache.java 2012-07-19 21:16:38.000000000 +0200
-+++ gluegen-v2.0-rc10/src/junit/com/jogamp/common/util/TestTempJarCache.java 2012-09-02 14:56:25.886433725 +0200
+--- gluegen-v2.0-rc11.orig/src/junit/com/jogamp/common/util/TestTempJarCache.java 2012-10-31 19:42:42.000000000 +0100
++++ gluegen-v2.0-rc11/src/junit/com/jogamp/common/util/TestTempJarCache.java 2012-11-08 16:24:17.000000000 +0100
@@ -192,8 +192,8 @@
@Test
public void testTempJarCache02AddNativeLibs() throws IOException {
@@ -22,10 +22,10 @@
JNILibLoaderBase.addNativeJarLibs(TempJarCache.class, libBaseName);
Assert.assertTrue(JNILibLoaderBase.isLoaded(libBaseName));
-Index: gluegen-v2.0-rc10/src/java/com/jogamp/common/os/Platform.java
+Index: gluegen-v2.0-rc11/src/java/com/jogamp/common/os/Platform.java
===================================================================
---- gluegen-v2.0-rc10.orig/src/java/com/jogamp/common/os/Platform.java 2012-07-19 21:16:38.000000000 +0200
-+++ gluegen-v2.0-rc10/src/java/com/jogamp/common/os/Platform.java 2012-09-02 14:56:25.886433725 +0200
+--- gluegen-v2.0-rc11.orig/src/java/com/jogamp/common/os/Platform.java 2012-10-31 19:42:42.000000000 +0100
++++ gluegen-v2.0-rc11/src/java/com/jogamp/common/os/Platform.java 2012-11-08 16:25:14.000000000 +0100
@@ -139,7 +139,7 @@
private static final String useTempJarCachePropName = "jogamp.gluegen.UseTempJarCache";
@@ -35,16 +35,16 @@
//
// static initialization order:
-@@ -182,7 +182,7 @@
+@@ -186,7 +186,7 @@
+ loadGlueGenRTImpl();
- loadGlueGenRTImpl();
-
-- JVMUtil.initSingleton(); // requires gluegen-rt, one-time init.
-+ JVMUtil.initSingleton(); // requires gluegen2-rt, one-time init.
-
- MachineDescription md = MachineDescriptionRuntime.getRuntime();
- if(null == md) {
-@@ -253,7 +253,7 @@
+ // JVM bug workaround
+- JVMUtil.initSingleton(); // requires gluegen-rt, one-time init.
++ JVMUtil.initSingleton(); // requires gluegen2-rt, one-time init.
+
+ // detect AWT availability
+ boolean awtAvailable = false;
+@@ -252,7 +252,7 @@
}
/**
More information about the pkg-java-commits
mailing list