Author: sylvestre Date: 2012-11-09 07:50:46 +0000 (Fri, 09 Nov 2012) New Revision: 16357
Modified: trunk/libjogl2-java/debian/changelog trunk/libjogl2-java/debian/control trunk/libjogl2-java/debian/patches/TARGET_PLATFORM_LIBS_2.diff trunk/libjogl2-java/debian/patches/armhfbuild.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 2012-11-08 16:23:14 UTC (rev 16356) +++ trunk/libjogl2-java/debian/changelog 2012-11-09 07:50:46 UTC (rev 16357) @@ -1,3 +1,9 @@ +libjogl2-java (2.0-rc11-1~exp1) experimental; urgency=low + + * New upstream release + + -- Sylvestre Ledru <[email protected]> Thu, 08 Nov 2012 16:51:30 +0100 + libjogl2-java (2.0-rc10-1~exp1) experimental; urgency=low * New upstream release Modified: trunk/libjogl2-java/debian/control =================================================================== --- trunk/libjogl2-java/debian/control 2012-11-08 16:23:14 UTC (rev 16356) +++ trunk/libjogl2-java/debian/control 2012-11-09 07:50:46 UTC (rev 16357) @@ -4,7 +4,7 @@ Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Sylvestre Ledru <[email protected]> Build-Depends: debhelper (>= 5), cdbs, quilt, default-jdk, - libgluegen2-build-java (>= 2.0-rc10-1~), libgluegen2-rt-java (>= 2.0-rc10-1~), + libgluegen2-build-java (>= 2.0-rc11-1~), libgluegen2-rt-java (>= 2.0-rc11-1~), ant-optional, libgl1-mesa-dev, libglu1-mesa-dev, libxxf86vm-dev, x11proto-xf86vidmode-dev, libxt-dev, junit4, libswt-gtk-3-java, ant-contrib, ant-contrib-cpptasks, libxinerama-dev, libxrandr-dev, @@ -17,7 +17,7 @@ Package: libjogl2-java Architecture: all Depends: ${misc:Depends}, - libgluegen2-rt-java (>= 2.0-rc10), libjogl2-jni (>= ${source:Version}) + libgluegen2-rt-java (>= 2.0-rc11), libjogl2-jni (>= ${source:Version}) Suggests: libjogl2-java-doc Description: Java bindings for OpenGL API The JOGL project hosts the development version of the Java Bindings for Modified: trunk/libjogl2-java/debian/patches/TARGET_PLATFORM_LIBS_2.diff =================================================================== --- trunk/libjogl2-java/debian/patches/TARGET_PLATFORM_LIBS_2.diff 2012-11-08 16:23:14 UTC (rev 16356) +++ trunk/libjogl2-java/debian/patches/TARGET_PLATFORM_LIBS_2.diff 2012-11-09 07:50:46 UTC (rev 16357) @@ -1,21 +1,21 @@ -Index: jogl-v2.0-rc9/make/build-jogl.xml +Index: jogl-v2.0-rc11/make/build-jogl.xml =================================================================== ---- jogl-v2.0-rc9.orig/make/build-jogl.xml 2012-06-19 05:23:28.000000000 +0200 -+++ jogl-v2.0-rc9/make/build-jogl.xml 2012-07-02 03:26:25.434527540 +0200 -@@ -1148,7 +1148,7 @@ +--- jogl-v2.0-rc11.orig/make/build-jogl.xml 2012-10-31 21:58:36.000000000 +0100 ++++ jogl-v2.0-rc11/make/build-jogl.xml 2012-11-08 16:44:29.000000000 +0100 +@@ -1151,7 +1151,7 @@ </linker> - <linker id="linker.cfg.linux.armv7.jogl.x11" extends="linker.cfg.linux.armv7"> + <linker id="linker.cfg.linux.armv6.jogl.x11" extends="linker.cfg.linux.armv6"> - <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11"/> + <syslibset libs="X11"/> </linker> <linker id="linker.cfg.android.jogl" extends="linker.cfg.android"> -Index: jogl-v2.0-rc9/make/build-newt.xml +Index: jogl-v2.0-rc11/make/build-newt.xml =================================================================== ---- jogl-v2.0-rc9.orig/make/build-newt.xml 2012-07-02 03:25:32.350528723 +0200 -+++ jogl-v2.0-rc9/make/build-newt.xml 2012-07-02 03:26:25.434527540 +0200 -@@ -292,7 +292,7 @@ +--- jogl-v2.0-rc11.orig/make/build-newt.xml 2012-10-31 21:58:36.000000000 +0100 ++++ jogl-v2.0-rc11/make/build-newt.xml 2012-11-08 16:43:44.000000000 +0100 +@@ -326,7 +326,7 @@ </linker> <linker id="linker.cfg.android.newt" extends="linker.cfg.android"> Modified: trunk/libjogl2-java/debian/patches/armhfbuild.diff =================================================================== --- trunk/libjogl2-java/debian/patches/armhfbuild.diff 2012-11-08 16:23:14 UTC (rev 16356) +++ trunk/libjogl2-java/debian/patches/armhfbuild.diff 2012-11-09 07:50:46 UTC (rev 16357) @@ -1,11 +1,11 @@ -Index: libjogl2-java-2.0-rc8/make/build-nativewindow.xml +Index: jogl-v2.0-rc11/make/build-nativewindow.xml =================================================================== ---- libjogl2-java-2.0-rc8.orig/make/build-nativewindow.xml 2012-05-02 03:28:29.000000000 +0200 -+++ libjogl2-java-2.0-rc8/make/build-nativewindow.xml 2012-06-13 18:25:52.000000000 +0200 +--- jogl-v2.0-rc11.orig/make/build-nativewindow.xml 2012-10-31 21:58:36.000000000 +0100 ++++ jogl-v2.0-rc11/make/build-nativewindow.xml 2012-11-08 16:45:12.000000000 +0100 @@ -397,9 +397,9 @@ </linker> - <linker id="linker.cfg.linux.armv7.nativewindow.x11" extends="linker.cfg.linux.armv7"> + <linker id="linker.cfg.linux.armv6.nativewindow.x11" extends="linker.cfg.linux.armv6"> - <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11" /> - <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xxf86vm" /> - <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrender" /> Modified: trunk/libjogl2-java/debian/patches/s390x.diff =================================================================== --- trunk/libjogl2-java/debian/patches/s390x.diff 2012-11-08 16:23:14 UTC (rev 16356) +++ trunk/libjogl2-java/debian/patches/s390x.diff 2012-11-09 07:50:46 UTC (rev 16357) @@ -1,32 +1,33 @@ -Index: jogl-v2.0-rc9/make/build-jogl.xml +Index: jogl-v2.0-rc11/make/build-jogl.xml =================================================================== ---- jogl-v2.0-rc9.orig/make/build-jogl.xml 2012-07-02 03:26:25.434527540 +0200 -+++ jogl-v2.0-rc9/make/build-jogl.xml 2012-07-02 03:26:31.382527406 +0200 -@@ -1278,13 +1278,19 @@ +--- jogl-v2.0-rc11.orig/make/build-jogl.xml 2012-11-08 16:44:29.000000000 +0100 ++++ jogl-v2.0-rc11/make/build-jogl.xml 2012-11-08 16:46:41.000000000 +0100 +@@ -1280,6 +1280,12 @@ + <property name="compiler.cfg.id" value="compiler.cfg.linux" /> <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" /> </target> - ++ + <target name="c.configure.linux.s390x" if="isLinuxs390x"> + <echo message="Linux.S390x" /> + <property name="compiler.cfg.id" value="compiler.cfg.linux" /> + <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" /> + </target> -+ + <target name="c.configure.linux.sparc" if="isLinuxSparc"> <echo message="Linux.SPARC" /> - <property name="compiler.cfg.id" value="compiler.cfg.linux" /> +@@ -1287,7 +1293,7 @@ <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" /> </target> -- <target name="c.configure.linux" depends="c.configure.linux.armv7,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" /> -+ <target name="c.configure.linux" depends="c.configure.linux.armv7,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.x11" if="isLinux" /> +- <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" /> ++ <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.x11" if="isLinux" /> <target name="c.configure.android" if="isAndroid"> <echo message="Android" /> -Index: jogl-v2.0-rc9/make/build-nativewindow.xml +Index: jogl-v2.0-rc11/make/build-nativewindow.xml =================================================================== ---- jogl-v2.0-rc9.orig/make/build-nativewindow.xml 2012-07-02 03:26:30.550527425 +0200 -+++ jogl-v2.0-rc9/make/build-nativewindow.xml 2012-07-02 03:26:31.382527406 +0200 +--- jogl-v2.0-rc11.orig/make/build-nativewindow.xml 2012-11-08 16:45:12.000000000 +0100 ++++ jogl-v2.0-rc11/make/build-nativewindow.xml 2012-11-08 16:48:45.000000000 +0100 @@ -529,13 +529,19 @@ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" /> </target> @@ -43,16 +44,16 @@ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" /> </target> -- <target name="c.configure.linux" depends="c.configure.linux.armv7,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" /> -+ <target name="c.configure.linux" depends="c.configure.linux.armv7,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.x11" if="isLinux" /> +- <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" /> ++ <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.x11" if="isLinux" /> <target name="c.configure.android" if="isAndroid"> <echo message="Android" /> -Index: jogl-v2.0-rc9/make/build-newt.xml +Index: jogl-v2.0-rc11/make/build-newt.xml =================================================================== ---- jogl-v2.0-rc9.orig/make/build-newt.xml 2012-07-02 03:26:25.434527540 +0200 -+++ jogl-v2.0-rc9/make/build-newt.xml 2012-07-02 03:26:31.386527406 +0200 -@@ -436,6 +436,16 @@ +--- jogl-v2.0-rc11.orig/make/build-newt.xml 2012-11-08 16:43:44.000000000 +0100 ++++ jogl-v2.0-rc11/make/build-newt.xml 2012-11-08 16:49:14.000000000 +0100 +@@ -470,6 +470,16 @@ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> </target> @@ -69,12 +70,12 @@ <target name="c.configure.linux.sparc" if="isLinuxSparc"> <echo message="Linux.sparc" /> <property name="compiler.cfg.id" value="compiler.cfg.linux" /> -@@ -452,7 +462,7 @@ +@@ -486,7 +496,7 @@ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" /> </target> -- <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv7,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.linux.ia64,c.configure.x11" if="isLinux"/> -+ <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv7,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.linux.ia64,c.configure.x11" if="isLinux"/> +- <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv6,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.linux.ia64,c.configure.x11" if="isLinux"/> ++ <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv6,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.linux.ia64,c.configure.x11" if="isLinux"/> <target name="c.configure.android" if="isAndroid"> <echo message="Android" /> Modified: trunk/libjogl2-java/debian/patches/swt.diff =================================================================== --- trunk/libjogl2-java/debian/patches/swt.diff 2012-11-08 16:23:14 UTC (rev 16356) +++ trunk/libjogl2-java/debian/patches/swt.diff 2012-11-09 07:50:46 UTC (rev 16357) @@ -1,8 +1,8 @@ -Index: jogl-v2.0-rc5/make/build-common.xml +Index: jogl-v2.0-rc11/make/build-common.xml =================================================================== ---- jogl-v2.0-rc5.orig/make/build-common.xml 2011-12-26 02:00:28.000000000 +0100 -+++ jogl-v2.0-rc5/make/build-common.xml 2011-12-26 02:00:34.658064939 +0100 -@@ -133,14 +133,8 @@ +--- jogl-v2.0-rc11.orig/make/build-common.xml 2012-11-08 16:41:46.000000000 +0100 ++++ jogl-v2.0-rc11/make/build-common.xml 2012-11-08 16:43:26.000000000 +0100 +@@ -133,15 +133,9 @@ <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-freebsd-x86_64/swt.jar"> <istrue value="${isFreeBSDAMD64}" /> </condition> @@ -13,9 +13,11 @@ - <istrue value="${isLinuxX86}" /> - </condition> - <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar"> -- <istrue value="${isLinuxARMv7}" /> <!-- FIXME JAU .. hack --> +- <istrue value="${isLinuxARMv6}" /> <!-- FIXME JAU .. hack --> +- </condition> + <condition property="swt.jar" value="/usr/share/java/swt.jar"> + <istrue value="${isLinux}" /> - </condition> ++ </condition> <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar"> <istrue value="${isAndroid}" /> <!-- FIXME JAU .. hack --> + </condition> Modified: trunk/libjogl2-java/debian/patches/variousFixes.diff =================================================================== --- trunk/libjogl2-java/debian/patches/variousFixes.diff 2012-11-08 16:23:14 UTC (rev 16356) +++ trunk/libjogl2-java/debian/patches/variousFixes.diff 2012-11-09 07:50:46 UTC (rev 16357) @@ -1,7 +1,7 @@ -Index: jogl-v2.0-rc10/make/build-common.xml +Index: jogl-v2.0-rc11/make/build-common.xml =================================================================== ---- jogl-v2.0-rc10.orig/make/build-common.xml 2012-08-03 00:38:37.000000000 +0200 -+++ jogl-v2.0-rc10/make/build-common.xml 2012-09-03 09:38:18.000000000 +0200 +--- jogl-v2.0-rc11.orig/make/build-common.xml 2012-10-31 21:58:36.000000000 +0100 ++++ jogl-v2.0-rc11/make/build-common.xml 2012-11-08 16:41:46.000000000 +0100 @@ -13,13 +13,13 @@ </fail> @@ -27,7 +27,7 @@ <property name="ant.jar" value="${ant.home}/lib/ant.jar" /> <property name="ant-junit.jar" value="${ant.home}/lib/ant-junit.jar" /> -@@ -400,7 +400,7 @@ +@@ -413,7 +413,7 @@ </path> <!-- JavaSE combinations --> @@ -36,7 +36,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"/> -@@ -555,7 +555,10 @@ +@@ -568,7 +568,10 @@ <!-- Run the GlueGen build to ensure that the GlueGen ANT task - has been built. --> @@ -48,10 +48,10 @@ </target> -Index: jogl-v2.0-rc10/make/build.xml +Index: jogl-v2.0-rc11/make/build.xml =================================================================== ---- jogl-v2.0-rc10.orig/make/build.xml 2012-08-03 00:38:37.000000000 +0200 -+++ jogl-v2.0-rc10/make/build.xml 2012-09-03 09:38:18.000000000 +0200 +--- jogl-v2.0-rc11.orig/make/build.xml 2012-10-31 21:58:36.000000000 +0100 ++++ jogl-v2.0-rc11/make/build.xml 2012-11-08 16:41:46.000000000 +0100 @@ -276,7 +276,7 @@ </target> _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
