Author: sylvestre Date: 2013-11-25 14:33:38 +0000 (Mon, 25 Nov 2013) New Revision: 17512
Modified: trunk/libjogl2-java/debian/changelog trunk/libjogl2-java/debian/patches/arm-build.diff trunk/libjogl2-java/debian/patches/disable_git_call.diff trunk/libjogl2-java/debian/patches/manifest.diff trunk/libjogl2-java/debian/patches/s390x.diff trunk/libjogl2-java/debian/patches/swt.diff trunk/libjogl2-java/debian/patches/variousFixes.diff Log: New upstream release Modified: trunk/libjogl2-java/debian/changelog =================================================================== --- trunk/libjogl2-java/debian/changelog 2013-11-24 22:27:52 UTC (rev 17511) +++ trunk/libjogl2-java/debian/changelog 2013-11-25 14:33:38 UTC (rev 17512) @@ -1,3 +1,9 @@ +libjogl2-java (2.1.2-1) unstable; urgency=low + + * New upstream release + + -- Sylvestre Ledru <[email protected]> Fri, 08 Nov 2013 10:53:16 +0100 + libjogl2-java (2.0.2-1) unstable; urgency=low * New upstream release Modified: trunk/libjogl2-java/debian/patches/arm-build.diff =================================================================== --- trunk/libjogl2-java/debian/patches/arm-build.diff 2013-11-24 22:27:52 UTC (rev 17511) +++ trunk/libjogl2-java/debian/patches/arm-build.diff 2013-11-25 14:33:38 UTC (rev 17512) @@ -1,7 +1,7 @@ -Index: jogl-v2.0-rc12/make/build-jogl.xml +Index: jogl-v2.1.2/make/build-jogl.xml =================================================================== ---- jogl-v2.0-rc12.orig/make/build-jogl.xml 2013-07-01 14:29:18.000000000 +0200 -+++ jogl-v2.0-rc12/make/build-jogl.xml 2013-07-01 14:29:17.000000000 +0200 +--- jogl-v2.1.2.orig/make/build-jogl.xml 2013-11-08 10:54:31.000000000 +0100 ++++ jogl-v2.1.2/make/build-jogl.xml 2013-11-08 10:54:31.000000000 +0100 @@ -200,6 +200,19 @@ <isset property="setup.noSWT"/> </condition> @@ -22,7 +22,7 @@ <property name="java.excludes.javadoc.packagenames" value="jogamp.opengl.gl2.fixme.*,com.jogamp.audio.windows.waveout.TestSpatialization"/> -@@ -1129,7 +1142,7 @@ +@@ -1187,7 +1200,7 @@ <includepath path="/usr/local/include" /> </compiler> @@ -31,7 +31,7 @@ <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage --> <compilerarg value="-idirafter" /> <compilerarg value="/usr/include" /> -@@ -1157,8 +1170,8 @@ +@@ -1215,8 +1228,8 @@ <syslibset libs="X11"/> </linker> @@ -42,7 +42,7 @@ </linker> <linker id="linker.cfg.android.jogl" extends="linker.cfg.android"> -@@ -1246,10 +1259,10 @@ +@@ -1304,10 +1317,10 @@ <property name="linker.cfg.id.os" value="linker.cfg.linux.amd64.jogl.x11" /> </target> @@ -57,7 +57,7 @@ </target> <target name="c.configure.linux.ia64" if="isLinuxIA64"> -@@ -1300,7 +1313,7 @@ +@@ -1358,7 +1371,7 @@ <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" /> </target> @@ -66,10 +66,10 @@ <target name="c.configure.android" if="isAndroid"> <echo message="Android" /> -Index: jogl-v2.0-rc12/make/build-nativewindow.xml +Index: jogl-v2.1.2/make/build-nativewindow.xml =================================================================== ---- jogl-v2.0-rc12.orig/make/build-nativewindow.xml 2013-07-01 14:29:18.000000000 +0200 -+++ jogl-v2.0-rc12/make/build-nativewindow.xml 2013-07-01 14:29:17.000000000 +0200 +--- jogl-v2.1.2.orig/make/build-nativewindow.xml 2013-11-08 10:54:31.000000000 +0100 ++++ jogl-v2.1.2/make/build-nativewindow.xml 2013-11-08 10:54:31.000000000 +0100 @@ -88,6 +88,19 @@ <isset property="setup.noAWT"/> </condition> @@ -138,10 +138,10 @@ <target name="c.configure.android" if="isAndroid"> <echo message="Android" /> -Index: jogl-v2.0-rc12/make/build-newt.xml +Index: jogl-v2.1.2/make/build-newt.xml =================================================================== ---- jogl-v2.0-rc12.orig/make/build-newt.xml 2013-07-01 14:29:18.000000000 +0200 -+++ jogl-v2.0-rc12/make/build-newt.xml 2013-07-01 14:29:17.000000000 +0200 +--- jogl-v2.1.2.orig/make/build-newt.xml 2013-11-08 10:54:31.000000000 +0100 ++++ jogl-v2.1.2/make/build-newt.xml 2013-11-08 10:54:31.000000000 +0100 @@ -157,6 +157,19 @@ <isset property="setup.noOpenGL"/> </condition> @@ -215,10 +215,10 @@ <target name="c.configure.android" if="isAndroid"> <echo message="Android" /> -Index: jogl-v2.0-rc12/make/scripts/make.jogl.all.linux-armv7hf.sh +Index: jogl-v2.1.2/make/scripts/make.jogl.all.linux-armv7hf.sh =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ jogl-v2.0-rc12/make/scripts/make.jogl.all.linux-armv7hf.sh 2013-07-01 14:29:17.000000000 +0200 ++++ jogl-v2.1.2/make/scripts/make.jogl.all.linux-armv7hf.sh 2013-11-08 10:54:31.000000000 +0100 @@ -0,0 +1,27 @@ +#! /bin/sh + @@ -247,10 +247,10 @@ + -Djunit.run.arg0="-Dnewt.test.Screen.disableScreenMode" \ + $* 2>&1 | tee make.jogl.all.linux-armv7hf.log + -Index: jogl-v2.0-rc12/make/scripts/tests-armv7_armhf.sh +Index: jogl-v2.1.2/make/scripts/tests-armv7_armhf.sh =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ jogl-v2.0-rc12/make/scripts/tests-armv7_armhf.sh 2013-07-01 14:29:17.000000000 +0200 ++++ jogl-v2.1.2/make/scripts/tests-armv7_armhf.sh 2013-11-08 10:54:31.000000000 +0100 @@ -0,0 +1,7 @@ +#! /bin/bash + @@ -259,10 +259,10 @@ +. $spath/tests.sh `which java` -DummyArg ../build-linux-armv7hf $* + + -Index: jogl-v2.0-rc12/make/scripts/tests-linux-armv7hf.sh +Index: jogl-v2.1.2/make/scripts/tests-linux-armv7hf.sh =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ jogl-v2.0-rc12/make/scripts/tests-linux-armv7hf.sh 2013-07-01 14:29:17.000000000 +0200 ++++ jogl-v2.1.2/make/scripts/tests-linux-armv7hf.sh 2013-11-08 10:54:31.000000000 +0100 @@ -0,0 +1,7 @@ +#! /bin/bash + Modified: trunk/libjogl2-java/debian/patches/disable_git_call.diff =================================================================== --- trunk/libjogl2-java/debian/patches/disable_git_call.diff 2013-11-24 22:27:52 UTC (rev 17511) +++ trunk/libjogl2-java/debian/patches/disable_git_call.diff 2013-11-25 14:33:38 UTC (rev 17512) @@ -1,8 +1,8 @@ -Index: jogl-v2.0-rc12/make/build-common.xml +Index: jogl-v2.1.2/make/build-common.xml =================================================================== ---- jogl-v2.0-rc12.orig/make/build-common.xml 2013-07-01 14:28:35.000000000 +0200 -+++ jogl-v2.0-rc12/make/build-common.xml 2013-07-01 14:28:35.000000000 +0200 -@@ -67,19 +67,7 @@ +--- jogl-v2.1.2.orig/make/build-common.xml 2013-11-08 10:54:23.000000000 +0100 ++++ jogl-v2.1.2/make/build-common.xml 2013-11-08 10:54:23.000000000 +0100 +@@ -71,19 +71,7 @@ <property name="jogl.build.number" value="manual"/> <property name="jogl.build.id" value="${version.timestamp}"/> <mkdir dir="${tempdir}" /> Modified: trunk/libjogl2-java/debian/patches/manifest.diff =================================================================== --- trunk/libjogl2-java/debian/patches/manifest.diff 2013-11-24 22:27:52 UTC (rev 17511) +++ trunk/libjogl2-java/debian/patches/manifest.diff 2013-11-25 14:33:38 UTC (rev 17512) @@ -1,8 +1,8 @@ -Index: libjogl2-java-2.0-rc12/make/joglversion +Index: jogl-v2.1.2/make/joglversion =================================================================== ---- libjogl2-java-2.0-rc12.orig/make/joglversion 2013-06-25 16:35:52.000000000 +0200 -+++ libjogl2-java-2.0-rc12/make/joglversion 2013-07-01 18:14:24.000000000 +0200 -@@ -7,10 +7,12 @@ +--- jogl-v2.1.2.orig/make/joglversion 2013-11-08 10:54:26.000000000 +0100 ++++ jogl-v2.1.2/make/joglversion 2013-11-08 10:54:26.000000000 +0100 +@@ -8,10 +8,12 @@ Implementation-Build: @BUILD_VERSION@ Implementation-Branch: @SCM_BRANCH@ Implementation-Commit: @SCM_COMMIT@ Modified: trunk/libjogl2-java/debian/patches/s390x.diff =================================================================== --- trunk/libjogl2-java/debian/patches/s390x.diff 2013-11-24 22:27:52 UTC (rev 17511) +++ trunk/libjogl2-java/debian/patches/s390x.diff 2013-11-25 14:33:38 UTC (rev 17512) @@ -1,8 +1,8 @@ -Index: jogl-v2.0-rc12/make/build-jogl.xml +Index: jogl-v2.1.2/make/build-jogl.xml =================================================================== ---- jogl-v2.0-rc12.orig/make/build-jogl.xml 2013-07-01 14:29:14.000000000 +0200 -+++ jogl-v2.0-rc12/make/build-jogl.xml 2013-07-01 14:29:14.000000000 +0200 -@@ -1287,6 +1287,12 @@ +--- jogl-v2.1.2.orig/make/build-jogl.xml 2013-11-08 10:54:28.000000000 +0100 ++++ jogl-v2.1.2/make/build-jogl.xml 2013-11-08 10:54:28.000000000 +0100 +@@ -1345,6 +1345,12 @@ <property name="compiler.cfg.id" value="compiler.cfg.linux" /> <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" /> </target> @@ -15,7 +15,7 @@ <target name="c.configure.linux.sparc" if="isLinuxSparc"> <echo message="Linux.SPARC" /> -@@ -1294,7 +1300,7 @@ +@@ -1352,7 +1358,7 @@ <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" /> </target> @@ -24,10 +24,10 @@ <target name="c.configure.android" if="isAndroid"> <echo message="Android" /> -Index: jogl-v2.0-rc12/make/build-nativewindow.xml +Index: jogl-v2.1.2/make/build-nativewindow.xml =================================================================== ---- jogl-v2.0-rc12.orig/make/build-nativewindow.xml 2013-07-01 14:29:14.000000000 +0200 -+++ jogl-v2.0-rc12/make/build-nativewindow.xml 2013-07-01 14:29:14.000000000 +0200 +--- jogl-v2.1.2.orig/make/build-nativewindow.xml 2013-11-08 10:54:28.000000000 +0100 ++++ jogl-v2.1.2/make/build-nativewindow.xml 2013-11-08 10:54:28.000000000 +0100 @@ -525,13 +525,19 @@ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" /> </target> @@ -49,10 +49,10 @@ <target name="c.configure.android" if="isAndroid"> <echo message="Android" /> -Index: jogl-v2.0-rc12/make/build-newt.xml +Index: jogl-v2.1.2/make/build-newt.xml =================================================================== ---- jogl-v2.0-rc12.orig/make/build-newt.xml 2013-07-01 14:29:14.000000000 +0200 -+++ jogl-v2.0-rc12/make/build-newt.xml 2013-07-01 14:29:14.000000000 +0200 +--- jogl-v2.1.2.orig/make/build-newt.xml 2013-11-08 10:54:28.000000000 +0100 ++++ jogl-v2.1.2/make/build-newt.xml 2013-11-08 10:54:28.000000000 +0100 @@ -472,6 +472,16 @@ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> </target> Modified: trunk/libjogl2-java/debian/patches/swt.diff =================================================================== --- trunk/libjogl2-java/debian/patches/swt.diff 2013-11-24 22:27:52 UTC (rev 17511) +++ trunk/libjogl2-java/debian/patches/swt.diff 2013-11-25 14:33:38 UTC (rev 17512) @@ -1,8 +1,8 @@ -Index: jogl-v2.0-rc12/make/build-common.xml +Index: jogl-v2.1.2/make/build-common.xml =================================================================== ---- jogl-v2.0-rc12.orig/make/build-common.xml 2013-07-01 14:28:32.000000000 +0200 -+++ jogl-v2.0-rc12/make/build-common.xml 2013-07-01 14:28:32.000000000 +0200 -@@ -127,15 +127,9 @@ +--- jogl-v2.1.2.orig/make/build-common.xml 2013-11-08 10:54:20.000000000 +0100 ++++ jogl-v2.1.2/make/build-common.xml 2013-11-08 10:54:20.000000000 +0100 +@@ -131,15 +131,9 @@ <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-freebsd-x86_64/swt.jar"> <istrue value="${isFreeBSDAMD64}" /> </condition> Modified: trunk/libjogl2-java/debian/patches/variousFixes.diff =================================================================== --- trunk/libjogl2-java/debian/patches/variousFixes.diff 2013-11-24 22:27:52 UTC (rev 17511) +++ trunk/libjogl2-java/debian/patches/variousFixes.diff 2013-11-25 14:33:38 UTC (rev 17512) @@ -1,7 +1,7 @@ -Index: jogl-v2.0-rc12/make/build-common.xml +Index: jogl-v2.1.2/make/build-common.xml =================================================================== ---- jogl-v2.0-rc12.orig/make/build-common.xml 2013-07-01 14:27:33.000000000 +0200 -+++ jogl-v2.0-rc12/make/build-common.xml 2013-07-01 14:28:22.000000000 +0200 +--- jogl-v2.1.2.orig/make/build-common.xml 2013-11-08 10:53:51.000000000 +0100 ++++ jogl-v2.1.2/make/build-common.xml 2013-11-08 10:53:51.000000000 +0100 @@ -13,7 +13,7 @@ </fail> @@ -20,7 +20,7 @@ <condition property="rootrel.build" value="build"> <not> -@@ -201,7 +201,7 @@ +@@ -205,7 +205,7 @@ <property name="gluegen.build.xml" value="${gluegen.make}/build.xml" /> <property name="build.gluegen" value="${gluegen.root}/${rootrel.build}" /> <property name="obj.gluegen" value="${build.gluegen}/obj"/> @@ -29,7 +29,7 @@ <property name="ant.jar" value="${ant.home}/lib/ant.jar" /> <property name="ant-junit.jar" value="${ant.home}/lib/ant-junit.jar" /> -@@ -404,7 +404,7 @@ +@@ -410,7 +410,7 @@ </path> <!-- JavaSE combinations --> @@ -38,7 +38,7 @@ <property name="gluegen-rt-android.jar" value="${build.gluegen}/gluegen-rt-android.jar" /> <property name="jogl-test.jar" value="${jar}/jogl-test.jar"/> <property name="jogl-test-android.jar" value="${jar}/jogl-test-android.jar"/> -@@ -574,7 +574,10 @@ +@@ -580,7 +580,10 @@ <!-- Run the GlueGen build to ensure that the GlueGen ANT task - has been built. --> @@ -50,16 +50,16 @@ </target> -Index: jogl-v2.0-rc12/make/build.xml +Index: jogl-v2.1.2/make/build.xml =================================================================== ---- jogl-v2.0-rc12.orig/make/build.xml 2013-07-01 14:27:33.000000000 +0200 -+++ jogl-v2.0-rc12/make/build.xml 2013-07-01 14:27:33.000000000 +0200 +--- jogl-v2.1.2.orig/make/build.xml 2013-11-08 10:53:51.000000000 +0100 ++++ jogl-v2.1.2/make/build.xml 2013-11-08 10:54:14.000000000 +0100 @@ -291,7 +291,7 @@ </target> <target name="tag.build" depends="init"> - <copy file="${build.gluegen}/artifact.properties" todir="${build}" overwrite="true"/> + <copy file="/usr/share/gluegen2/artifact.properties" todir="${build}" overwrite="true"/> + <echo message='jogl.build.version=${jogamp.version}${line.separator}' file="${build}/artifact.properties" append="true"/> <echo message='jogl.build.number=${jogl.build.number}${line.separator}' file="${build}/artifact.properties" append="true"/> <echo message='jogl.build.id=${jogl.build.id}${line.separator}' file="${build}/artifact.properties" append="true"/> - <echo message='jogl.build.branch=${jogl.build.branch}${line.separator}' file="${build}/artifact.properties" append="true"/> _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
