Author: sylvestre Date: 2013-07-01 16:29:01 +0000 (Mon, 01 Jul 2013) New Revision: 16953
Modified: trunk/gluegen2/debian/changelog trunk/gluegen2/debian/patches/disable-test-zip-archive.diff trunk/gluegen2/debian/patches/disableArchive7z.diff trunk/gluegen2/debian/patches/disable_git_call.diff trunk/gluegen2/debian/patches/hideException.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 2013-07-01 15:50:01 UTC (rev 16952) +++ trunk/gluegen2/debian/changelog 2013-07-01 16:29:01 UTC (rev 16953) @@ -1,3 +1,9 @@ +gluegen2 (2.0-rc12-1) unstable; urgency=low + + * New upstream release + + -- Sylvestre Ledru <[email protected]> Mon, 01 Jul 2013 14:01:11 +0200 + gluegen2 (2.0-rc11-1) unstable; urgency=low * Upload to unstable Modified: trunk/gluegen2/debian/patches/disable-test-zip-archive.diff =================================================================== --- trunk/gluegen2/debian/patches/disable-test-zip-archive.diff 2013-07-01 15:50:01 UTC (rev 16952) +++ trunk/gluegen2/debian/patches/disable-test-zip-archive.diff 2013-07-01 16:29:01 UTC (rev 16953) @@ -1,8 +1,8 @@ -Index: gluegen-v2.0-rc11/make/build-test.xml +Index: gluegen-v2.0-rc12/make/build-test.xml =================================================================== ---- 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 @@ +--- gluegen-v2.0-rc12.orig/make/build-test.xml 2013-07-01 14:02:17.000000000 +0200 ++++ gluegen-v2.0-rc12/make/build-test.xml 2013-07-01 14:02:17.000000000 +0200 +@@ -466,7 +466,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 2013-07-01 15:50:01 UTC (rev 16952) +++ trunk/gluegen2/debian/patches/disableArchive7z.diff 2013-07-01 16:29:01 UTC (rev 16953) @@ -1,8 +1,8 @@ -Index: gluegen-v2.0-rc11/make/build.xml +Index: gluegen-v2.0-rc12/make/build.xml =================================================================== ---- 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 @@ +--- gluegen-v2.0-rc12.orig/make/build.xml 2013-07-01 14:02:13.000000000 +0200 ++++ gluegen-v2.0-rc12/make/build.xml 2013-07-01 14:02:13.000000000 +0200 +@@ -1002,9 +1002,9 @@ <classpath path="${classes}"/> <link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" /> </javadoc> Modified: trunk/gluegen2/debian/patches/disable_git_call.diff =================================================================== --- trunk/gluegen2/debian/patches/disable_git_call.diff 2013-07-01 15:50:01 UTC (rev 16952) +++ trunk/gluegen2/debian/patches/disable_git_call.diff 2013-07-01 16:29:01 UTC (rev 16953) @@ -1,8 +1,8 @@ -Index: gluegen-v2.0-rc9/make/build.xml +Index: gluegen-v2.0-rc12/make/build.xml =================================================================== ---- gluegen-v2.0-rc9.orig/make/build.xml 2012-07-02 02:53:25.966571707 +0200 -+++ gluegen-v2.0-rc9/make/build.xml 2012-07-02 02:53:31.606571580 +0200 -@@ -70,14 +70,6 @@ +--- gluegen-v2.0-rc12.orig/make/build.xml 2013-07-01 14:02:19.000000000 +0200 ++++ gluegen-v2.0-rc12/make/build.xml 2013-07-01 14:02:19.000000000 +0200 +@@ -66,14 +66,6 @@ <property name="gluegen.build.number" value="manual"/> <property name="gluegen.build.id" value="${version.timestamp}"/> <mkdir dir="${build}" /> Modified: trunk/gluegen2/debian/patches/hideException.diff =================================================================== --- trunk/gluegen2/debian/patches/hideException.diff 2013-07-01 15:50:01 UTC (rev 16952) +++ trunk/gluegen2/debian/patches/hideException.diff 2013-07-01 16:29:01 UTC (rev 16953) @@ -1,27 +1,27 @@ -Index: gluegen-v2.0-rc11/src/java/com/jogamp/common/os/Platform.java +Index: gluegen-v2.0-rc12/src/java/com/jogamp/common/os/Platform.java =================================================================== ---- 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() { -- 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()); - } - +--- gluegen-v2.0-rc12.orig/src/java/com/jogamp/common/os/Platform.java 2013-07-01 14:02:26.000000000 +0200 ++++ gluegen-v2.0-rc12/src/java/com/jogamp/common/os/Platform.java 2013-07-01 14:03:01.000000000 +0200 +@@ -191,22 +191,6 @@ + Debug.getBooleanProperty(useTempJarCachePropName, true, true); + + // load GluegenRT native library +- if(_USE_TEMP_JAR_CACHE[0] && TempJarCache.initSingleton()) { +- String nativeJarName = null; +- URI jarUriRoot = null; +- URI nativeJarURI = null; +- try { +- final String jarName = JarUtil.getJarBasename( platformClassJarURI ); +- final String nativeJarBasename = jarName.substring(0, jarName.indexOf(".jar")); // ".jar" already validated w/ JarUtil.getJarBasename(..) +- nativeJarName = nativeJarBasename+"-natives-"+PlatformPropsImpl.os_and_arch+".jar"; +- jarUriRoot = IOUtil.getDirname( JarUtil.getJarSubURI( platformClassJarURI ) ); +- nativeJarURI = JarUtil.getJarFileURI(jarUriRoot, nativeJarName); +- TempJarCache.bootstrapNativeLib(Platform.class, libBaseName, nativeJarURI); +- } catch (Exception e0) { +- // IllegalArgumentException, IOException +- System.err.println("Catched "+e0.getClass().getSimpleName()+": "+e0.getMessage()+", while TempJarCache.bootstrapNativeLib() of "+nativeJarURI+" ("+jarUriRoot+" + "+nativeJarName+")"); +- } +- } + DynamicLibraryBundle.GlueJNILibLoader.loadLibrary(libBaseName, false, cl); + + // JVM bug workaround Modified: trunk/gluegen2/debian/patches/linker.diff =================================================================== --- trunk/gluegen2/debian/patches/linker.diff 2013-07-01 15:50:01 UTC (rev 16952) +++ trunk/gluegen2/debian/patches/linker.diff 2013-07-01 16:29:01 UTC (rev 16953) @@ -1,8 +1,8 @@ -Index: gluegen-v2.0-rc11/make/gluegen-cpptasks-base.xml +Index: gluegen-v2.0-rc12/make/gluegen-cpptasks-base.xml =================================================================== ---- 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 @@ +--- gluegen-v2.0-rc12.orig/make/gluegen-cpptasks-base.xml 2013-07-01 14:02:21.000000000 +0200 ++++ gluegen-v2.0-rc12/make/gluegen-cpptasks-base.xml 2013-07-01 14:02:21.000000000 +0200 +@@ -1173,6 +1173,27 @@ <linker id="linker.cfg.linux.sparc" name="gcc"> </linker> Modified: trunk/gluegen2/debian/patches/renamedLibrary.diff =================================================================== --- trunk/gluegen2/debian/patches/renamedLibrary.diff 2013-07-01 15:50:01 UTC (rev 16952) +++ trunk/gluegen2/debian/patches/renamedLibrary.diff 2013-07-01 16:29:01 UTC (rev 16953) @@ -1,10 +1,10 @@ -Index: gluegen-v2.0-rc11/src/junit/com/jogamp/common/util/TestTempJarCache.java +Index: gluegen-v2.0-rc12/src/junit/com/jogamp/common/util/TestTempJarCache.java =================================================================== ---- 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 @@ +--- gluegen-v2.0-rc12.orig/src/junit/com/jogamp/common/util/TestTempJarCache.java 2013-07-01 14:01:45.000000000 +0200 ++++ gluegen-v2.0-rc12/src/junit/com/jogamp/common/util/TestTempJarCache.java 2013-07-01 14:01:45.000000000 +0200 +@@ -194,8 +194,8 @@ @Test - public void testTempJarCache02AddNativeLibs() throws IOException { + public void testTempJarCache02AddNativeLibs() throws IOException, IllegalArgumentException, URISyntaxException { if(AndroidVersion.isAvailable) { System.err.println("n/a on Android"); return; } - final String nativeJarName = "gluegen-rt-natives-"+Platform.getOSAndArch()+".jar"; - final String libBaseName = "gluegen-rt"; @@ -12,8 +12,8 @@ + final String libBaseName = "gluegen2-rt"; final ClassLoader cl = getClass().getClassLoader(); - URL jarUrlRoot = JarUtil.getJarSubURL(TempJarCache.class.getName(), cl); -@@ -212,7 +212,7 @@ + URI jarUriRoot = JarUtil.getJarSubURI(TempJarCache.class.getName(), cl); +@@ -214,7 +214,7 @@ @Test public void testTempJarCache03AddNativeJarLibs() throws IOException { if(AndroidVersion.isAvailable) { System.err.println("n/a on Android"); return; } @@ -22,11 +22,11 @@ JNILibLoaderBase.addNativeJarLibs(TempJarCache.class, libBaseName); Assert.assertTrue(JNILibLoaderBase.isLoaded(libBaseName)); -Index: gluegen-v2.0-rc11/src/java/com/jogamp/common/os/Platform.java +Index: gluegen-v2.0-rc12/src/java/com/jogamp/common/os/Platform.java =================================================================== ---- 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 @@ +--- gluegen-v2.0-rc12.orig/src/java/com/jogamp/common/os/Platform.java 2013-07-01 14:01:45.000000000 +0200 ++++ gluegen-v2.0-rc12/src/java/com/jogamp/common/os/Platform.java 2013-07-01 14:02:03.000000000 +0200 +@@ -140,7 +140,7 @@ private static final String useTempJarCachePropName = "jogamp.gluegen.UseTempJarCache"; /** fixed basename of JAR file and native library */ @@ -35,16 +35,16 @@ // // static initialization order: -@@ -186,7 +186,7 @@ - loadGlueGenRTImpl(); - +@@ -210,7 +210,7 @@ + DynamicLibraryBundle.GlueJNILibLoader.loadLibrary(libBaseName, false, cl); + // 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 @@ + + // AWT Headless determination + if( !Debug.getBooleanProperty("java.awt.headless", true) && +@@ -253,7 +253,7 @@ } /** _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
