Author: sylvestre Date: 2013-11-08 15:48:25 +0000 (Fri, 08 Nov 2013) New Revision: 17455
Modified: trunk/gluegen2/debian/changelog trunk/gluegen2/debian/orig-tar.sh trunk/gluegen2/debian/patches/armhf.diff trunk/gluegen2/debian/patches/disableArchive7z.diff trunk/gluegen2/debian/patches/fix-ppc64-build-config.patch trunk/gluegen2/debian/patches/hideException.diff trunk/gluegen2/debian/patches/linker.diff trunk/gluegen2/debian/patches/renamedLibrary.diff Log: * New upstream release * Update of the repack script to remove some thirdparty jars Modified: trunk/gluegen2/debian/changelog =================================================================== --- trunk/gluegen2/debian/changelog 2013-11-08 14:46:08 UTC (rev 17454) +++ trunk/gluegen2/debian/changelog 2013-11-08 15:48:25 UTC (rev 17455) @@ -1,3 +1,10 @@ +gluegen2 (2.1.2-1) unstable; urgency=low + + * New upstream release + * Update of the repack script to remove some thirdparty jars + + -- Sylvestre Ledru <[email protected]> Fri, 08 Nov 2013 10:20:37 +0100 + gluegen2 (2.0.2-2) unstable; urgency=low * Team upload. @@ -13,7 +20,7 @@ gluegen2 (2.0.2-1) unstable; urgency=low * New upstream release - + [ Colin Watson ] * Synchronise From Ubuntu. Remaining changes: - Add more explicit armhf support, rather than trying to use incorrect Modified: trunk/gluegen2/debian/orig-tar.sh =================================================================== --- trunk/gluegen2/debian/orig-tar.sh 2013-11-08 14:46:08 UTC (rev 17454) +++ trunk/gluegen2/debian/orig-tar.sh 2013-11-08 15:48:25 UTC (rev 17455) @@ -9,6 +9,7 @@ tar xvf gluegen-v$VERSION.tar cd $DIR* rm -rf .gitignore .htaccess make/lib/ +rm -f $(find . -iname '*.jar') cd .. tar jcvf ../$TAR $DIR rm -rf $DIR gluegen-v$VERSION.tar Modified: trunk/gluegen2/debian/patches/armhf.diff =================================================================== --- trunk/gluegen2/debian/patches/armhf.diff 2013-11-08 14:46:08 UTC (rev 17454) +++ trunk/gluegen2/debian/patches/armhf.diff 2013-11-08 15:48:25 UTC (rev 17455) @@ -1,7 +1,7 @@ -Index: b/make/build.xml +Index: gluegen-v2.1.2/make/build.xml =================================================================== ---- a/make/build.xml -+++ b/make/build.xml +--- gluegen-v2.1.2.orig/make/build.xml 2013-11-08 10:29:07.000000000 +0100 ++++ gluegen-v2.1.2/make/build.xml 2013-11-08 10:29:07.000000000 +0100 @@ -289,10 +289,16 @@ <property name="linker.cfg.id" value="linker.cfg.linux" /> </target> @@ -32,11 +32,11 @@ <property name="c.src.dir.os" value="unix" /> <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" /> </target> -Index: b/make/gluegen-cpptasks-base.xml +Index: gluegen-v2.1.2/make/gluegen-cpptasks-base.xml =================================================================== ---- a/make/gluegen-cpptasks-base.xml -+++ b/make/gluegen-cpptasks-base.xml -@@ -122,7 +122,7 @@ +--- gluegen-v2.1.2.orig/make/gluegen-cpptasks-base.xml 2013-11-08 10:29:07.000000000 +0100 ++++ gluegen-v2.1.2/make/gluegen-cpptasks-base.xml 2013-11-08 10:32:33.000000000 +0100 +@@ -124,7 +124,7 @@ - compiler.cfg.linux - compiler.cfg.linux.x86 - compiler.cfg.linux.amd64 @@ -45,7 +45,7 @@ - compiler.cfg.linux.alpha - compiler.cfg.linux.hppa - compiler.cfg.linux.mips -@@ -143,7 +143,8 @@ +@@ -145,7 +145,8 @@ - linker.cfg.linux - linker.cfg.linux.x86 - linker.cfg.linux.amd64 @@ -55,30 +55,30 @@ - linker.cfg.linux.alpha - linker.cfg.linux.hppa - linker.cfg.linux.mips -@@ -927,7 +928,7 @@ +@@ -942,7 +943,7 @@ - lib/gluegen-cpptasks-linux-armv6.xml (armv5te + softfp), or - lib/gluegen-cpptasks-linux-armv6hf.xml (armv6 + hardfp) for official JogAmp builds! --> -- <compiler id="compiler.cfg.linux.armv6" name="gcc"> -+ <compiler id="compiler.cfg.linux.armv6.armel" name="gcc"> +- <compiler id="compiler.cfg.linux.armv6" name="${gcc.compat.compiler}"> ++ <compiler id="compiler.cfg.linux.armv6.armel" name="${gcc.compat.compiler}"> <defineset> <define name="__unix__"/> <define name="__X11__" if="isX11"/> -@@ -1142,13 +1143,16 @@ +@@ -1157,13 +1158,16 @@ - lib/gluegen-cpptasks-linux-armv6.xml (armv5te + softfp), or - lib/gluegen-cpptasks-linux-armv6hf.xml (armv6 + hardfp) for official JogAmp builds! --> -- <linker id="linker.cfg.linux.armv6" name="gcc"> -+ <linker id="linker.cfg.linux.armv6.armel" name="gcc"> +- <linker id="linker.cfg.linux.armv6" name="${gcc.compat.compiler}"> ++ <linker id="linker.cfg.linux.armv6.armel" name="${gcc.compat.compiler}"> <linkerarg value="-fpic" /> <linkerarg value="-nostdlib" /> <linkerarg value="-Bdynamic" /> - <linkerarg value="-static-libgcc"/> + <linkerarg value="-static-libgcc" if="isGCC"/> </linker> + <linker id="linker.cfg.linux.armv6.armhf" name="gcc"> + </linker> + - <linker id="linker.cfg.linux.alpha" name="gcc"> + <linker id="linker.cfg.linux.alpha" name="${gcc.compat.compiler}"> </linker> Modified: trunk/gluegen2/debian/patches/disableArchive7z.diff =================================================================== --- trunk/gluegen2/debian/patches/disableArchive7z.diff 2013-11-08 14:46:08 UTC (rev 17454) +++ trunk/gluegen2/debian/patches/disableArchive7z.diff 2013-11-08 15:48:25 UTC (rev 17455) @@ -1,8 +1,8 @@ -Index: gluegen-v2.0.2/make/build.xml +Index: gluegen-v2.1.2/make/build.xml =================================================================== ---- gluegen-v2.0.2.orig/make/build.xml 2013-09-28 18:57:37.000000000 +0200 -+++ gluegen-v2.0.2/make/build.xml 2013-09-28 18:58:13.000000000 +0200 -@@ -1006,9 +1006,9 @@ +--- gluegen-v2.1.2.orig/make/build.xml 2013-11-08 10:25:22.000000000 +0100 ++++ gluegen-v2.1.2/make/build.xml 2013-11-08 10:25:22.000000000 +0100 +@@ -1011,9 +1011,9 @@ <copy todir="${javadoc.gluegen.path}/resources" overwrite="true"> <fileset dir="doc/javadoc/resources" includes="*" /> </copy> @@ -14,7 +14,7 @@ </target> <!-- ================================================================== --> -@@ -1046,9 +1046,9 @@ +@@ -1051,9 +1051,9 @@ <fileset dir="${project.root}/jnlp-files" includes="*" /> </copy> <copy todir="${archive}" file="${build}/gluegen-java-src.zip"/> Modified: trunk/gluegen2/debian/patches/fix-ppc64-build-config.patch =================================================================== --- trunk/gluegen2/debian/patches/fix-ppc64-build-config.patch 2013-11-08 14:46:08 UTC (rev 17454) +++ trunk/gluegen2/debian/patches/fix-ppc64-build-config.patch 2013-11-08 15:48:25 UTC (rev 17455) @@ -1,5 +1,7 @@ ---- a/make/build.xml -+++ b/make/build.xml +Index: gluegen-v2.1.2/make/build.xml +=================================================================== +--- gluegen-v2.1.2.orig/make/build.xml 2013-11-08 10:32:45.000000000 +0100 ++++ gluegen-v2.1.2/make/build.xml 2013-11-08 10:32:45.000000000 +0100 @@ -331,6 +331,12 @@ <property name="linker.cfg.id" value="linker.cfg.linux.ppc" /> </target> @@ -22,8 +24,10 @@ <property name="c.src.dir.os" value="unix" /> <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" /> </target> ---- a/make/gluegen-cpptasks-base.xml -+++ b/make/gluegen-cpptasks-base.xml +Index: gluegen-v2.1.2/make/gluegen-cpptasks-base.xml +=================================================================== +--- gluegen-v2.1.2.orig/make/gluegen-cpptasks-base.xml 2013-11-08 10:32:45.000000000 +0100 ++++ gluegen-v2.1.2/make/gluegen-cpptasks-base.xml 2013-11-08 10:33:20.000000000 +0100 @@ -46,6 +46,7 @@ - isLinuxMips - isLinuxMipsel @@ -32,7 +36,7 @@ - isLinuxs390 - isLinuxs390x - isLinuxSparc -@@ -128,6 +129,7 @@ +@@ -130,6 +131,7 @@ - compiler.cfg.linux.mips - compiler.cfg.linux.mipsel - compiler.cfg.linux.ppc @@ -40,7 +44,7 @@ - compiler.cfg.linux.s390 - compiler.cfg.linux.s390x - compiler.cfg.linux.sparc -@@ -386,6 +388,15 @@ +@@ -388,6 +390,15 @@ <condition property="ppc"> <os arch="ppc" /> </condition> @@ -56,7 +60,7 @@ <condition property="isLinuxs390"> <and> <istrue value="${isLinux}" /> -@@ -568,6 +579,7 @@ +@@ -570,6 +581,7 @@ <echo message="LinuxMips=${isLinuxMips}" /> <echo message="LinuxMipsel=${isLinuxMipsel}" /> <echo message="LinuxPpc=${isLinuxPpc}" /> @@ -64,7 +68,7 @@ <echo message="Linuxs390=${isLinuxs390}" /> <echo message="Linuxs390x=${isLinuxs390x}" /> <echo message="LinuxSparc=${isLinuxSparc}" /> -@@ -644,6 +656,10 @@ +@@ -646,6 +658,10 @@ <property name="os.and.arch" value="linux-ppc" /> </target> @@ -75,7 +79,7 @@ <target name="gluegen.cpptasks.detect.os.linux.s390" unless="gluegen.cpptasks.detected.os.2" if="isLinuxs390"> <property name="os.and.arch" value="linux-s390" /> </target> -@@ -664,7 +680,7 @@ +@@ -666,7 +682,7 @@ <property name="os.and.arch" value="android-armv6hf" /> </target> @@ -84,17 +88,17 @@ <target name="gluegen.cpptasks.detect.os.osx" unless="gluegen.cpptasks.detected.os.2" if="isOSX"> <property name="native.library.suffix" value="*lib" /> -@@ -1168,6 +1184,9 @@ - <linker id="linker.cfg.linux.ppc" name="gcc"> +@@ -1183,6 +1199,9 @@ + <linker id="linker.cfg.linux.ppc" name="${gcc.compat.compiler}"> </linker> -+ <linker id="linker.cfg.linux.ppc64" name="gcc"> ++ <linker id="linker.cfg.linux.ppc64" name="${gcc.compat.compiler}"> + </linker> + - <linker id="linker.cfg.linux.s390" name="gcc"> + <linker id="linker.cfg.linux.s390" name="${gcc.compat.compiler}"> </linker> -@@ -1411,6 +1430,13 @@ +@@ -1407,6 +1426,13 @@ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ppc" /> </target> @@ -108,7 +112,7 @@ <target name="gluegen.cpptasks.declare.compiler.linux.s390" if="isLinuxs390"> <echo message="Linux.s390" /> <property name="compiler.cfg.id.base" value="compiler.cfg.linux" /> -@@ -1432,7 +1458,7 @@ +@@ -1428,7 +1454,7 @@ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/sparc" /> </target> Modified: trunk/gluegen2/debian/patches/hideException.diff =================================================================== --- trunk/gluegen2/debian/patches/hideException.diff 2013-11-08 14:46:08 UTC (rev 17454) +++ trunk/gluegen2/debian/patches/hideException.diff 2013-11-08 15:48:25 UTC (rev 17455) @@ -1,27 +1,20 @@ -Index: gluegen-v2.0-rc12/src/java/com/jogamp/common/os/Platform.java +Index: gluegen-v2.1.2/src/java/com/jogamp/common/os/Platform.java =================================================================== ---- 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 @@ +--- gluegen-v2.1.2.orig/src/java/com/jogamp/common/os/Platform.java 2013-11-08 10:28:03.000000000 +0100 ++++ gluegen-v2.1.2/src/java/com/jogamp/common/os/Platform.java 2013-11-08 10:29:00.000000000 +0100 +@@ -191,15 +191,6 @@ + _USE_TEMP_JAR_CACHE[0] = ( OS_TYPE != OSType.ANDROID ) && ( null != platformClassJarURI ) && Debug.getBooleanProperty(useTempJarCachePropName, true, true); - - // load GluegenRT native library + +- // 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); +- JNILibLoaderBase.addNativeJarLibs(new Class<?>[] { Platform.class }, null, null ); - } catch (Exception e0) { - // IllegalArgumentException, IOException -- System.err.println("Catched "+e0.getClass().getSimpleName()+": "+e0.getMessage()+", while TempJarCache.bootstrapNativeLib() of "+nativeJarURI+" ("+jarUriRoot+" + "+nativeJarName+")"); +- System.err.println("Catched "+e0.getClass().getSimpleName()+": "+e0.getMessage()+", while JNILibLoaderBase.addNativeJarLibs(..)"); - } - } DynamicLibraryBundle.GlueJNILibLoader.loadLibrary(libBaseName, false, cl); - + // JVM bug workaround Modified: trunk/gluegen2/debian/patches/linker.diff =================================================================== --- trunk/gluegen2/debian/patches/linker.diff 2013-11-08 14:46:08 UTC (rev 17454) +++ trunk/gluegen2/debian/patches/linker.diff 2013-11-08 15:48:25 UTC (rev 17455) @@ -1,32 +1,13 @@ -Index: gluegen-v2.0-rc12/make/gluegen-cpptasks-base.xml +Index: gluegen-v2.1.2/make/gluegen-cpptasks-base.xml =================================================================== ---- 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"> +--- gluegen-v2.1.2.orig/make/gluegen-cpptasks-base.xml 2013-11-08 10:25:29.000000000 +0100 ++++ gluegen-v2.1.2/make/gluegen-cpptasks-base.xml 2013-11-08 10:27:43.000000000 +0100 +@@ -1188,6 +1188,8 @@ + <linker id="linker.cfg.linux.sparc" name="${gcc.compat.compiler}"> </linker> -+ <linker id="linker.cfg.linux.alpha" name="gcc"> -+ </linker> + -+ <linker id="linker.cfg.linux.hppa" name="gcc"> -+ </linker> + -+ <linker id="linker.cfg.linux.mips" name="gcc"> -+ </linker> -+ -+ <linker id="linker.cfg.linux.mipsel" name="gcc"> -+ </linker> -+ -+ <linker id="linker.cfg.linux.ppc" name="gcc"> -+ </linker> -+ -+ <linker id="linker.cfg.linux.s390" name="gcc"> -+ </linker> -+ -+ <linker id="linker.cfg.linux.sparc" name="gcc"> -+ </linker> -+ - <compiler id="linker.cfg.android" name="gcc"> + <compiler id="linker.cfg.android" name="${gcc.compat.compiler}"> <!-- shall be defined in custom ${gluegen-cpptasks.file} ! --> </compiler> Modified: trunk/gluegen2/debian/patches/renamedLibrary.diff =================================================================== --- trunk/gluegen2/debian/patches/renamedLibrary.diff 2013-11-08 14:46:08 UTC (rev 17454) +++ trunk/gluegen2/debian/patches/renamedLibrary.diff 2013-11-08 15:48:25 UTC (rev 17455) @@ -1,55 +1,55 @@ -Index: gluegen-v2.0-rc12/src/junit/com/jogamp/common/util/TestTempJarCache.java +Index: gluegen-v2.1.2/src/junit/com/jogamp/common/util/TestTempJarCache.java =================================================================== ---- 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 @@ +--- gluegen-v2.1.2.orig/src/junit/com/jogamp/common/util/TestTempJarCache.java 2013-11-08 10:22:57.000000000 +0100 ++++ gluegen-v2.1.2/src/junit/com/jogamp/common/util/TestTempJarCache.java 2013-11-08 10:24:35.000000000 +0100 +@@ -197,8 +197,8 @@ @Test 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"; +- final String libBaseName = "gluegen-rt"; + final String nativeJarName = "gluegen2-rt-natives-"+Platform.getOSAndArch()+".jar"; -+ final String libBaseName = "gluegen2-rt"; ++ final String libBaseName = "gluegen2-rt"; final ClassLoader cl = getClass().getClassLoader(); - + URI jarUriRoot = JarUtil.getJarSubURI(TempJarCache.class.getName(), cl); -@@ -214,7 +214,7 @@ +@@ -217,7 +217,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"; - +- final String libBaseName = "gluegen-rt"; ++ final String libBaseName = "gluegen2-rt"; + JNILibLoaderBase.addNativeJarLibs(TempJarCache.class, libBaseName); Assert.assertTrue(JNILibLoaderBase.isLoaded(libBaseName)); -Index: gluegen-v2.0-rc12/src/java/com/jogamp/common/os/Platform.java +Index: gluegen-v2.1.2/src/java/com/jogamp/common/os/Platform.java =================================================================== ---- 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 +--- gluegen-v2.1.2.orig/src/java/com/jogamp/common/os/Platform.java 2013-11-08 10:22:57.000000000 +0100 ++++ gluegen-v2.1.2/src/java/com/jogamp/common/os/Platform.java 2013-11-08 10:25:15.000000000 +0100 @@ -140,7 +140,7 @@ private static final String useTempJarCachePropName = "jogamp.gluegen.UseTempJarCache"; - + /** fixed basename of JAR file and native library */ -- private static final String libBaseName = "gluegen-rt"; -+ private static final String libBaseName = "gluegen2-rt"; - +- private static final String libBaseName = "gluegen-rt"; ++ private static final String libBaseName = "gluegen2-rt"; + // // static initialization order: -@@ -210,7 +210,7 @@ +@@ -203,7 +203,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. - + // AWT Headless determination if( !Debug.getBooleanProperty("java.awt.headless", true) && -@@ -253,7 +253,7 @@ +@@ -246,7 +246,7 @@ } - + /** - * kick off static initialization of <i>platform property information</i> and <i>native gluegen-rt lib loading</i> + * kick off static initialization of <i>platform property information</i> and <i>native gluegen2-rt lib loading</i> */ - public static void initSingleton() { } - + public static void initSingleton() { } + _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
