[pkg-java] r17819 - in trunk/libjogl2-java/debian: . patches
Sylvestre Ledru
sylvestre at moszumanska.debian.org
Thu Feb 27 23:11:44 UTC 2014
Author: sylvestre
Date: 2014-02-27 23:11:44 +0000 (Thu, 27 Feb 2014)
New Revision: 17819
Added:
trunk/libjogl2-java/debian/patches/disable-applet.diff
Modified:
trunk/libjogl2-java/debian/changelog
trunk/libjogl2-java/debian/control
trunk/libjogl2-java/debian/patches/arm-build.diff
trunk/libjogl2-java/debian/patches/manifest.diff
trunk/libjogl2-java/debian/patches/s390x.diff
trunk/libjogl2-java/debian/patches/series
trunk/libjogl2-java/debian/patches/variousFixes.diff
Log:
* New upstream release
* Disable the build of com/jogamp/newt/util/applet/
Modified: trunk/libjogl2-java/debian/changelog
===================================================================
--- trunk/libjogl2-java/debian/changelog 2014-02-26 16:38:46 UTC (rev 17818)
+++ trunk/libjogl2-java/debian/changelog 2014-02-27 23:11:44 UTC (rev 17819)
@@ -1,3 +1,10 @@
+libjogl2-java (2.1.4-1) unstable; urgency=medium
+
+ * New upstream release
+ * Disable the build of com/jogamp/newt/util/applet/
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Thu, 27 Feb 2014 23:42:51 +0100
+
libjogl2-java (2.1.3-2) UNRELEASED; urgency=medium
* Team upload.
Modified: trunk/libjogl2-java/debian/control
===================================================================
--- trunk/libjogl2-java/debian/control 2014-02-26 16:38:46 UTC (rev 17818)
+++ trunk/libjogl2-java/debian/control 2014-02-27 23:11:44 UTC (rev 17819)
@@ -4,11 +4,11 @@
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Sylvestre Ledru <sylvestre at debian.org>
Build-Depends: debhelper (>= 5), cdbs, quilt, default-jdk,
- libgluegen2-build-java (>= 2.1.3), libgluegen2-rt-java (>= 2.1.3),
+ libgluegen2-build-java (>= 2.1.3), libgluegen2-rt-java (>= 2.1.4),
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,
- ant (>= 1.8)
+ ant (>= 1.8), libxcursor-dev
Standards-Version: 3.9.5
Homepage: http://jogamp.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjogl2-java
@@ -17,7 +17,7 @@
Package: libjogl2-java
Architecture: all
Depends: ${misc:Depends},
- libgluegen2-rt-java (>= 2.1.3), libjogl2-jni (>= ${source:Version})
+ libgluegen2-rt-java (>= 2.1.4), 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/arm-build.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/arm-build.diff 2014-02-26 16:38:46 UTC (rev 17818)
+++ trunk/libjogl2-java/debian/patches/arm-build.diff 2014-02-27 23:11:44 UTC (rev 17819)
@@ -1,7 +1,7 @@
-Index: jogl-v2.1.2/make/build-jogl.xml
+Index: jogl-v2.1.4/make/build-jogl.xml
===================================================================
---- 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
+--- jogl-v2.1.4.orig/make/build-jogl.xml 2014-02-11 15:57:15.689427868 +0100
++++ jogl-v2.1.4/make/build-jogl.xml 2014-02-11 15:57:15.689427868 +0100
@@ -200,6 +200,19 @@
<isset property="setup.noSWT"/>
</condition>
@@ -66,10 +66,10 @@
<target name="c.configure.android" if="isAndroid">
<echo message="Android" />
-Index: jogl-v2.1.2/make/build-nativewindow.xml
+Index: jogl-v2.1.4/make/build-nativewindow.xml
===================================================================
---- 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
+--- jogl-v2.1.4.orig/make/build-nativewindow.xml 2014-02-11 15:57:15.689427868 +0100
++++ jogl-v2.1.4/make/build-nativewindow.xml 2014-02-11 15:57:15.689427868 +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.1.2/make/build-newt.xml
+Index: jogl-v2.1.4/make/build-newt.xml
===================================================================
---- 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
+--- jogl-v2.1.4.orig/make/build-newt.xml 2014-02-11 15:57:15.689427868 +0100
++++ jogl-v2.1.4/make/build-newt.xml 2014-02-11 15:58:15.169426413 +0100
@@ -157,6 +157,19 @@
<isset property="setup.noOpenGL"/>
</condition>
@@ -171,17 +171,19 @@
<!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage -->
<compilerarg value="-idirafter" />
<compilerarg value="/usr/include" />
-@@ -320,13 +333,13 @@
+@@ -325,14 +338,13 @@
<!--syslibset libs="X11-xcb" /-->
</linker>
- <linker id="linker.cfg.linux.armv6.newt.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="Xrandr" />
+- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xcursor" />
+- </linker>
+ <linker id="linker.cfg.linux.arm.newt.x11" extends="linker.cfg.linux">
+ <syslibset libs="X11" />
+ <syslibset libs="Xrandr" />
- </linker>
++ </linker>
<linker id="linker.cfg.android.newt" extends="linker.cfg.android">
- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="android" />
@@ -189,7 +191,7 @@
</linker>
<linker id="linker.cfg.solaris.newt.x11" extends="linker.cfg.solaris">
-@@ -412,11 +425,11 @@
+@@ -421,11 +433,11 @@
<echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
</target>
@@ -206,7 +208,7 @@
<isset property="isX11" />
</condition>
<echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
-@@ -498,7 +511,7 @@
+@@ -507,7 +519,7 @@
<property name="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" />
</target>
@@ -215,10 +217,10 @@
<target name="c.configure.android" if="isAndroid">
<echo message="Android" />
-Index: jogl-v2.1.2/make/scripts/make.jogl.all.linux-armv7hf.sh
+Index: jogl-v2.1.4/make/scripts/make.jogl.all.linux-armv7hf.sh
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ jogl-v2.1.2/make/scripts/make.jogl.all.linux-armv7hf.sh 2013-11-08 10:54:31.000000000 +0100
++++ jogl-v2.1.4/make/scripts/make.jogl.all.linux-armv7hf.sh 2014-02-11 15:57:15.689427868 +0100
@@ -0,0 +1,27 @@
+#! /bin/sh
+
@@ -247,10 +249,10 @@
+ -Djunit.run.arg0="-Dnewt.test.Screen.disableScreenMode" \
+ $* 2>&1 | tee make.jogl.all.linux-armv7hf.log
+
-Index: jogl-v2.1.2/make/scripts/tests-armv7_armhf.sh
+Index: jogl-v2.1.4/make/scripts/tests-armv7_armhf.sh
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ jogl-v2.1.2/make/scripts/tests-armv7_armhf.sh 2013-11-08 10:54:31.000000000 +0100
++++ jogl-v2.1.4/make/scripts/tests-armv7_armhf.sh 2014-02-11 15:57:15.689427868 +0100
@@ -0,0 +1,7 @@
+#! /bin/bash
+
@@ -259,10 +261,10 @@
+. $spath/tests.sh `which java` -DummyArg ../build-linux-armv7hf $*
+
+
-Index: jogl-v2.1.2/make/scripts/tests-linux-armv7hf.sh
+Index: jogl-v2.1.4/make/scripts/tests-linux-armv7hf.sh
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ jogl-v2.1.2/make/scripts/tests-linux-armv7hf.sh 2013-11-08 10:54:31.000000000 +0100
++++ jogl-v2.1.4/make/scripts/tests-linux-armv7hf.sh 2014-02-11 15:57:15.689427868 +0100
@@ -0,0 +1,7 @@
+#! /bin/bash
+
Added: trunk/libjogl2-java/debian/patches/disable-applet.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/disable-applet.diff (rev 0)
+++ trunk/libjogl2-java/debian/patches/disable-applet.diff 2014-02-27 23:11:44 UTC (rev 17819)
@@ -0,0 +1,22 @@
+Index: libjogl2-java-2.1.4/make/build-newt.xml
+===================================================================
+--- libjogl2-java-2.1.4.orig/make/build-newt.xml 2014-02-27 23:21:42.000000000 +0100
++++ libjogl2-java-2.1.4/make/build-newt.xml 2014-02-27 23:32:11.638399263 +0100
+@@ -100,7 +100,7 @@
+ <!-- partitioning -->
+
+ <property name="java.part.core"
+- value="com/jogamp/newt/* com/jogamp/newt/event/* com/jogamp/newt/util/* com/jogamp/newt/util/applet/* jogamp/newt/* jogamp/newt/event/* jogamp/newt/driver/*"/>
++ value="com/jogamp/newt/* com/jogamp/newt/event/* com/jogamp/newt/util/* jogamp/newt/* jogamp/newt/event/* jogamp/newt/driver/*"/>
+
+ <property name="java.part.opengl"
+ value="com/jogamp/newt/opengl/** jogamp/newt/driver/opengl/**"/>
+@@ -236,7 +236,7 @@
+ -->
+ <target name="java.compile.javase">
+ <javac destdir="${classes}"
+- excludes="${java.excludes.all} ${java.part.driver.android}"
++ excludes="${java.excludes.all} ${java.part.driver.android} com/jogamp/newt/util/applet/*"
+ fork="yes"
+ includeAntRuntime="false"
+ memoryMaximumSize="${javac.memorymax}"
Modified: trunk/libjogl2-java/debian/patches/manifest.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/manifest.diff 2014-02-26 16:38:46 UTC (rev 17818)
+++ trunk/libjogl2-java/debian/patches/manifest.diff 2014-02-27 23:11:44 UTC (rev 17819)
@@ -1,18 +1,20 @@
-Index: jogl-v2.1.2/make/joglversion
+Index: jogl-v2.1.4/make/joglversion
===================================================================
---- 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 @@
+--- jogl-v2.1.4.orig/make/joglversion 2014-02-11 15:56:19.285429247 +0100
++++ jogl-v2.1.4/make/joglversion 2014-02-11 15:57:01.845428206 +0100
+@@ -2,7 +2,7 @@
+ Application-Name: Java Bindings for OpenGL
+ Specification-Title: Java Bindings for OpenGL API Specification
+ Specification-Version: @BASEVERSION@
+-Specification-Vendor: JogAmp Community
++Specification-Vendor: JogAmp Community - Debian package
+ Implementation-Title: Java Bindings for OpenGL Runtime Environment
+ Implementation-Version: @VERSION@
Implementation-Build: @BUILD_VERSION@
- Implementation-Branch: @SCM_BRANCH@
- Implementation-Commit: @SCM_COMMIT@
--Implementation-Vendor: JogAmp Community
-+Implementation-Vendor: JogAmp Community - Debian package
- Implementation-URL: http://jogamp.org/
- Extension-Name: javax.media.opengl
- Implementation-Vendor-Id: com.jogamp
+@@ -15,5 +15,6 @@
Trusted-Library: true
Permissions: all-permissions
+ Application-Library-Allowable-Codebase: *
+Class-Path: /usr/share/java/gluegen2-rt.jar
@JAR_CODEBASE_TAG@
-+
+
Modified: trunk/libjogl2-java/debian/patches/s390x.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/s390x.diff 2014-02-26 16:38:46 UTC (rev 17818)
+++ trunk/libjogl2-java/debian/patches/s390x.diff 2014-02-27 23:11:44 UTC (rev 17819)
@@ -1,7 +1,7 @@
-Index: jogl-v2.1.2/make/build-jogl.xml
+Index: jogl-v2.1.4/make/build-jogl.xml
===================================================================
---- 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
+--- jogl-v2.1.4.orig/make/build-jogl.xml 2014-02-11 15:57:11.017427982 +0100
++++ jogl-v2.1.4/make/build-jogl.xml 2014-02-11 15:57:11.013427982 +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" />
@@ -24,10 +24,10 @@
<target name="c.configure.android" if="isAndroid">
<echo message="Android" />
-Index: jogl-v2.1.2/make/build-nativewindow.xml
+Index: jogl-v2.1.4/make/build-nativewindow.xml
===================================================================
---- 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
+--- jogl-v2.1.4.orig/make/build-nativewindow.xml 2014-02-11 15:57:11.017427982 +0100
++++ jogl-v2.1.4/make/build-nativewindow.xml 2014-02-11 15:57:11.013427982 +0100
@@ -525,13 +525,19 @@
<property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" />
</target>
@@ -49,11 +49,11 @@
<target name="c.configure.android" if="isAndroid">
<echo message="Android" />
-Index: jogl-v2.1.2/make/build-newt.xml
+Index: jogl-v2.1.4/make/build-newt.xml
===================================================================
---- 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 @@
+--- jogl-v2.1.4.orig/make/build-newt.xml 2014-02-11 15:57:11.017427982 +0100
++++ jogl-v2.1.4/make/build-newt.xml 2014-02-11 15:57:11.013427982 +0100
+@@ -481,6 +481,16 @@
<echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
</target>
@@ -70,7 +70,7 @@
<target name="c.configure.linux.sparc" if="isLinuxSparc">
<echo message="Linux.sparc" />
<property name="compiler.cfg.id" value="compiler.cfg.linux" />
-@@ -488,7 +498,7 @@
+@@ -497,7 +507,7 @@
<property name="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" />
</target>
Modified: trunk/libjogl2-java/debian/patches/series
===================================================================
--- trunk/libjogl2-java/debian/patches/series 2014-02-26 16:38:46 UTC (rev 17818)
+++ trunk/libjogl2-java/debian/patches/series 2014-02-27 23:11:44 UTC (rev 17819)
@@ -12,4 +12,6 @@
manifest.diff
s390x.diff
arm-build.diff
+disable-applet.diff
alpha.diff
+
Modified: trunk/libjogl2-java/debian/patches/variousFixes.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/variousFixes.diff 2014-02-26 16:38:46 UTC (rev 17818)
+++ trunk/libjogl2-java/debian/patches/variousFixes.diff 2014-02-27 23:11:44 UTC (rev 17819)
@@ -1,7 +1,7 @@
-Index: jogl-v2.1.2/make/build-common.xml
+Index: jogl-v2.1.4/make/build-common.xml
===================================================================
---- 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
+--- jogl-v2.1.4.orig/make/build-common.xml 2014-02-11 15:56:11.681429433 +0100
++++ jogl-v2.1.4/make/build-common.xml 2014-02-11 15:56:11.677429433 +0100
@@ -13,7 +13,7 @@
</fail>
@@ -20,7 +20,7 @@
<condition property="rootrel.build" value="build">
<not>
-@@ -205,7 +205,7 @@
+@@ -208,7 +208,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" />
-@@ -410,7 +410,7 @@
+@@ -413,7 +413,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"/>
-@@ -580,7 +580,10 @@
+@@ -585,7 +585,10 @@
<!-- Run the GlueGen build to ensure that the GlueGen ANT task
- has been built. -->
@@ -50,10 +50,10 @@
</target>
-Index: jogl-v2.1.2/make/build.xml
+Index: jogl-v2.1.4/make/build.xml
===================================================================
---- 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
+--- jogl-v2.1.4.orig/make/build.xml 2014-02-11 15:56:11.681429433 +0100
++++ jogl-v2.1.4/make/build.xml 2014-02-11 15:56:11.677429433 +0100
@@ -291,7 +291,7 @@
</target>
More information about the pkg-java-commits
mailing list