Author: sylvestre Date: 2012-07-02 00:43:13 +0000 (Mon, 02 Jul 2012) New Revision: 16223
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/jarPath.diff trunk/gluegen2/debian/patches/linker.diff trunk/gluegen2/debian/patches/renamedLibrary.diff trunk/gluegen2/debian/patches/series Log: * Upload in unstable * New upstream release Modified: trunk/gluegen2/debian/changelog =================================================================== --- trunk/gluegen2/debian/changelog 2012-06-30 18:58:20 UTC (rev 16222) +++ trunk/gluegen2/debian/changelog 2012-07-02 00:43:13 UTC (rev 16223) @@ -1,10 +1,19 @@ -gluegen2 (2.0-rc5-5) UNRELEASED; urgency=low +gluegen2 (2.0-rc8-2) unstable; urgency=low - * Team upload. + * Upload in unstable + + -- Sylvestre Ledru <[email protected]> Wed, 13 Jun 2012 18:31:35 +0200 + +gluegen2 (2.0-rc8-1) experimental; urgency=low + + [ Miguel Landaeta ] * Use public access URL in Vcs-Svn field. (Closes: #669300). - -- Miguel Landaeta <[email protected]> Thu, 26 Apr 2012 19:38:50 -0430 + [ Sylvestre Ledru ] + * New upstream release + -- Sylvestre Ledru <[email protected]> Tue, 15 May 2012 14:23:28 +0200 + gluegen2 (2.0-rc5-4) unstable; urgency=low * Fix a problem in the loading of the native lib (Closes: #668821) Modified: trunk/gluegen2/debian/patches/disable-test-zip-archive.diff =================================================================== --- trunk/gluegen2/debian/patches/disable-test-zip-archive.diff 2012-06-30 18:58:20 UTC (rev 16222) +++ trunk/gluegen2/debian/patches/disable-test-zip-archive.diff 2012-07-02 00:43:13 UTC (rev 16223) @@ -1,11 +1,11 @@ -Index: gluegen-v2.0-rc5/make/build-test.xml +Index: gluegen-v2.0-rc8/make/build-test.xml =================================================================== ---- gluegen-v2.0-rc5.orig/make/build-test.xml 2011-12-18 23:11:17.000000000 +0100 -+++ gluegen-v2.0-rc5/make/build-test.xml 2011-12-26 01:26:55.194009328 +0100 -@@ -399,7 +399,7 @@ - <target name="junit.run.tests" depends="junit.run.local, junit.run.remote.ssh, junit.run.remote.adb"/> +--- 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 @@ + </target> - <target name="junit.run" depends="init, gluegen.cpptasks.detect.os, junit.run.settings, junit.run.d32, junit.run.tests"> + <target name="junit.run" depends="junit.run.settings, junit.run.if.enabled, junit.run.if.disabled"> - <antcall target="test-zip-archive" inheritRefs="true" /> +<!-- <antcall target="test-zip-archive" inheritRefs="true" />--> </target> Modified: trunk/gluegen2/debian/patches/disableArchive7z.diff =================================================================== --- trunk/gluegen2/debian/patches/disableArchive7z.diff 2012-06-30 18:58:20 UTC (rev 16222) +++ trunk/gluegen2/debian/patches/disableArchive7z.diff 2012-07-02 00:43:13 UTC (rev 16223) @@ -1,8 +1,8 @@ -Index: gluegen-v2.0-rc2/make/build.xml +Index: gluegen-v2.0-rc8/make/build.xml =================================================================== ---- gluegen-v2.0-rc2.orig/make/build.xml 2011-03-04 16:13:59.000000000 +0100 -+++ gluegen-v2.0-rc2/make/build.xml 2011-03-04 16:14:06.000000000 +0100 -@@ -683,9 +683,9 @@ +--- gluegen-v2.0-rc8.orig/make/build.xml 2012-04-25 13:09:30.000000000 +0200 ++++ gluegen-v2.0-rc8/make/build.xml 2012-05-15 14:30:48.000000000 +0200 +@@ -870,9 +870,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 2012-06-30 18:58:20 UTC (rev 16222) +++ trunk/gluegen2/debian/patches/disable_git_call.diff 2012-07-02 00:43:13 UTC (rev 16223) @@ -1,8 +1,8 @@ -Index: gluegen2-2.0-rc3/make/build.xml +Index: gluegen-v2.0-rc8/make/build.xml =================================================================== ---- gluegen2-2.0-rc3.orig/make/build.xml 2011-10-08 13:24:22.000000000 +0200 -+++ gluegen2-2.0-rc3/make/build.xml 2011-10-08 13:24:29.000000000 +0200 -@@ -62,14 +62,6 @@ +--- gluegen-v2.0-rc8.orig/make/build.xml 2012-05-15 14:29:21.000000000 +0200 ++++ gluegen-v2.0-rc8/make/build.xml 2012-05-15 14:29:23.000000000 +0200 +@@ -55,14 +55,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 2012-06-30 18:58:20 UTC (rev 16222) +++ trunk/gluegen2/debian/patches/hideException.diff 2012-07-02 00:43:13 UTC (rev 16223) @@ -1,8 +1,8 @@ -Index: gluegen-v2.0-rc5/src/java/com/jogamp/common/os/Platform.java +Index: gluegen-v2.0-rc8/src/java/com/jogamp/common/os/Platform.java =================================================================== ---- gluegen-v2.0-rc5.orig/src/java/com/jogamp/common/os/Platform.java 2011-12-18 23:11:17.000000000 +0100 -+++ gluegen-v2.0-rc5/src/java/com/jogamp/common/os/Platform.java 2011-12-26 01:28:23.362011756 +0100 -@@ -302,18 +302,18 @@ +--- gluegen-v2.0-rc8.orig/src/java/com/jogamp/common/os/Platform.java 2012-05-15 14:25:06.000000000 +0200 ++++ gluegen-v2.0-rc8/src/java/com/jogamp/common/os/Platform.java 2012-05-15 14:30:32.000000000 +0200 +@@ -378,19 +378,19 @@ private static void loadGlueGenRTImpl() { AccessController.doPrivileged(new PrivilegedAction<Object>() { public Object run() { @@ -14,8 +14,9 @@ - JarUtil.getJarSubURL(Platform.class.getName(), cl) ); - final URL nativeJarURL = JarUtil.getJarFileURL(jarUrlRoot, nativeJarName); - TempJarCache.bootstrapNativeLib(Platform.class, libBaseName, nativeJarURL, cl); -- } catch (IOException ioe) { -- ioe.printStackTrace(); +- } catch (Exception e0) { +- // IllegalArgumentException, IOException +- System.err.println("Catched: "+e0.getMessage()); - } - } + // if(USE_TEMP_JAR_CACHE && TempJarCache.initSingleton()) { @@ -26,8 +27,9 @@ + // JarUtil.getJarSubURL(Platform.class.getName(), cl) ); + // final URL nativeJarURL = JarUtil.getJarFileURL(jarUrlRoot, nativeJarName); + // TempJarCache.bootstrapNativeLib(Platform.class, libBaseName, nativeJarURL, cl); -+ // } catch (IOException ioe) { -+ // ioe.printStackTrace(); ++ // } catch (Exception e0) { ++ // // IllegalArgumentException, IOException ++ // System.err.println("Catched: "+e0.getMessage()); + // } + // } DynamicLibraryBundle.GlueJNILibLoader.loadLibrary(libBaseName, false); Modified: trunk/gluegen2/debian/patches/jarPath.diff =================================================================== --- trunk/gluegen2/debian/patches/jarPath.diff 2012-06-30 18:58:20 UTC (rev 16222) +++ trunk/gluegen2/debian/patches/jarPath.diff 2012-07-02 00:43:13 UTC (rev 16223) @@ -1,7 +1,7 @@ -Index: gluegen2-2.0-rc3/make/gluegen-properties.xml +Index: gluegen-v2.0-rc8/make/gluegen-properties.xml =================================================================== ---- gluegen2-2.0-rc3.orig/make/gluegen-properties.xml 2011-10-06 14:54:42.000000000 +0200 -+++ gluegen2-2.0-rc3/make/gluegen-properties.xml 2011-10-06 14:55:51.000000000 +0200 +--- gluegen-v2.0-rc8.orig/make/gluegen-properties.xml 2012-04-25 13:09:30.000000000 +0200 ++++ gluegen-v2.0-rc8/make/gluegen-properties.xml 2012-05-15 14:24:24.000000000 +0200 @@ -39,10 +39,10 @@ <property name="gluegen.user.properties.file.set" value="${gluegen.user.properties.file}"/> <property file="${gluegen.user.properties.file.set}" /> @@ -16,4 +16,4 @@ + <property name="ant-junit.jar" value="/usr/share/ant/lib/ant-junit.jar" /> <property name="android.version" value="9" /> <!-- default - if not set by jogamp-env.xml:jogamp.env.init --> - <property name="android.jar" value="${gluegen.root}/make/lib/android-sdk/${android.version}/android.jar" /> + <!--property name="android.jar" value="${gluegen.root}/make/lib/android-sdk/${android.version}/android.jar" /--> Modified: trunk/gluegen2/debian/patches/linker.diff =================================================================== --- trunk/gluegen2/debian/patches/linker.diff 2012-06-30 18:58:20 UTC (rev 16222) +++ trunk/gluegen2/debian/patches/linker.diff 2012-07-02 00:43:13 UTC (rev 16223) @@ -1,9 +1,9 @@ -Index: gluegen2-2.0-rc3/make/gluegen-cpptasks-base.xml +Index: gluegen-v2.0-rc8/make/gluegen-cpptasks-base.xml =================================================================== ---- gluegen2-2.0-rc3.orig/make/gluegen-cpptasks-base.xml 2011-10-08 15:00:52.000000000 +0200 -+++ gluegen2-2.0-rc3/make/gluegen-cpptasks-base.xml 2011-10-08 15:06:31.000000000 +0200 -@@ -976,6 +976,27 @@ - <linker id="linker.cfg.linux.armv7" name="gcc"> +--- 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 @@ + <linker id="linker.cfg.linux.sparc" name="gcc"> </linker> + <linker id="linker.cfg.linux.alpha" name="gcc"> @@ -28,5 +28,5 @@ + </linker> + <compiler id="linker.cfg.android" name="gcc"> - <!-- shall be defined in custom ${gluegen-cpptasks.file} ! --> + <!-- shall be defined in custom ${gluegen-cpptasks.file} ! --> </compiler> Modified: trunk/gluegen2/debian/patches/renamedLibrary.diff =================================================================== --- trunk/gluegen2/debian/patches/renamedLibrary.diff 2012-06-30 18:58:20 UTC (rev 16222) +++ trunk/gluegen2/debian/patches/renamedLibrary.diff 2012-07-02 00:43:13 UTC (rev 16223) @@ -1,11 +1,11 @@ -Index: gluegen2-2.0-rc5/src/junit/com/jogamp/common/util/TestTempJarCache.java +Index: gluegen-v2.0-rc8/src/junit/com/jogamp/common/util/TestTempJarCache.java =================================================================== ---- gluegen2-2.0-rc5.orig/src/junit/com/jogamp/common/util/TestTempJarCache.java 2011-12-18 23:11:17.000000000 +0100 -+++ gluegen2-2.0-rc5/src/junit/com/jogamp/common/util/TestTempJarCache.java 2012-04-14 18:56:09.000000000 +0200 -@@ -183,8 +183,8 @@ - +--- gluegen-v2.0-rc8.orig/src/junit/com/jogamp/common/util/TestTempJarCache.java 2012-04-25 13:09:30.000000000 +0200 ++++ gluegen-v2.0-rc8/src/junit/com/jogamp/common/util/TestTempJarCache.java 2012-05-15 14:25:33.000000000 +0200 +@@ -192,8 +192,8 @@ @Test public void testTempJarCache02AddNativeLibs() throws IOException { + 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"; + final String nativeJarName = "gluegen2-rt-natives-"+Platform.getOSAndArch()+".jar"; @@ -13,20 +13,20 @@ final ClassLoader cl = getClass().getClassLoader(); URL jarUrlRoot = JarUtil.getJarSubURL(TempJarCache.class.getName(), cl); -@@ -202,7 +202,7 @@ - +@@ -212,7 +212,7 @@ @Test public void testTempJarCache03AddNativeJarLibs() throws IOException { + if(AndroidVersion.isAvailable) { System.err.println("n/a on Android"); return; } - final String libBaseName = "gluegen-rt"; + final String libBaseName = "gluegen2-rt"; JNILibLoaderBase.addNativeJarLibs(TempJarCache.class, libBaseName); Assert.assertTrue(JNILibLoaderBase.isLoaded(libBaseName)); -Index: gluegen2-2.0-rc5/src/java/com/jogamp/common/os/Platform.java +Index: gluegen-v2.0-rc8/src/java/com/jogamp/common/os/Platform.java =================================================================== ---- gluegen2-2.0-rc5.orig/src/java/com/jogamp/common/os/Platform.java 2012-04-15 18:36:43.593084233 +0200 -+++ gluegen2-2.0-rc5/src/java/com/jogamp/common/os/Platform.java 2012-04-15 18:37:08.933083669 +0200 -@@ -54,7 +54,7 @@ +--- gluegen-v2.0-rc8.orig/src/java/com/jogamp/common/os/Platform.java 2012-04-25 13:09:30.000000000 +0200 ++++ gluegen-v2.0-rc8/src/java/com/jogamp/common/os/Platform.java 2012-05-15 14:30:43.000000000 +0200 +@@ -53,7 +53,7 @@ public class Platform { /** fixed basename of JAR file and native library */ Modified: trunk/gluegen2/debian/patches/series =================================================================== --- trunk/gluegen2/debian/patches/series 2012-06-30 18:58:20 UTC (rev 16222) +++ trunk/gluegen2/debian/patches/series 2012-07-02 00:43:13 UTC (rev 16223) @@ -1,14 +1,16 @@ jarPath.diff renamedLibrary.diff disableArchive7z.diff -other-archs.diff +#other-archs.diff #structLayoutLinux.diff disable-test-zip-archive.diff -fix_issues.diff -disable_android.diff +#fix_issues.diff +#disable_android.diff disable_git_call.diff linker.diff hideException.diff -TARGET_JAVA_LIBS_disabled.diff +#TARGET_JAVA_LIBS_disabled.diff -s390x.diff +#s390x.diff +#duplicatedeclaration.diff +disable_android2.diff _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
