Author: sylvestre
Date: 2012-05-23 16:41:32 +0000 (Wed, 23 May 2012)
New Revision: 16061
Added:
trunk/libjogl2-java/debian/patches/manifest.diff
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/disable_android.diff
trunk/libjogl2-java/debian/patches/disable_android_3.diff
trunk/libjogl2-java/debian/patches/series
trunk/libjogl2-java/debian/patches/variousFixes.diff
Log:
* New upstream release
* Set the exact version of the dependency between libjogl2-java
and libjogl2-jni
Modified: trunk/libjogl2-java/debian/changelog
===================================================================
--- trunk/libjogl2-java/debian/changelog 2012-05-23 10:55:20 UTC (rev
16060)
+++ trunk/libjogl2-java/debian/changelog 2012-05-23 16:41:32 UTC (rev
16061)
@@ -1,10 +1,14 @@
-libjogl2-java (2.0-rc5-3) UNRELEASED; urgency=low
+libjogl2-java (2.0-rc8-1~exp1) experimental; urgency=low
+
+ * New upstream release
+ * Set the exact version of the dependency between libjogl2-java
+ and libjogl2-jni
- * Team upload.
+ [ Miguel Landaeta ]
* Use public access URL in Vcs-Svn field. (Closes: #670283).
* Fix debian-control-has-unusual-field-spacing lintian warning.
- -- Miguel Landaeta <mig...@miguel.cc> Wed, 25 Apr 2012 20:38:39 -0430
+ -- Sylvestre Ledru <sylves...@debian.org> Wed, 23 May 2012 14:23:19 +0200
libjogl2-java (2.0-rc5-2) unstable; urgency=low
Modified: trunk/libjogl2-java/debian/control
===================================================================
--- trunk/libjogl2-java/debian/control 2012-05-23 10:55:20 UTC (rev 16060)
+++ trunk/libjogl2-java/debian/control 2012-05-23 16:41:32 UTC (rev 16061)
@@ -4,7 +4,7 @@
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Sylvestre Ledru <sylves...@debian.org>
Build-Depends: debhelper (>= 5), cdbs, quilt, default-jdk,
- libgluegen2-build-java (>= 2.0-rc5-1~), libgluegen2-rt-java (>= 2.0-rc5-1~),
+ libgluegen2-build-java (>= 2.0-rc8-1~), libgluegen2-rt-java (>= 2.0-rc8-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, libjogl2-jni
+ libgluegen2-rt-java, 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-05-23 10:55:20 UTC (rev 16060)
+++ trunk/libjogl2-java/debian/patches/TARGET_PLATFORM_LIBS_2.diff
2012-05-23 16:41:32 UTC (rev 16061)
@@ -1,25 +1,25 @@
-Index: libjogl2-java-2.0-rc5/make/build-jogl.xml
+Index: jogl-v2.0-rc8/make/build-jogl.xml
===================================================================
---- libjogl2-java-2.0-rc5.orig/make/build-jogl.xml 2011-12-26
09:54:09.000000000 +0100
-+++ libjogl2-java-2.0-rc5/make/build-jogl.xml 2011-12-27 23:14:19.109596268
+0100
-@@ -1092,7 +1092,7 @@
+--- jogl-v2.0-rc8.orig/make/build-jogl.xml 2012-05-02 03:28:29.000000000
+0200
++++ jogl-v2.0-rc8/make/build-jogl.xml 2012-05-15 13:53:13.000000000 +0200
+@@ -1155,7 +1155,7 @@
</linker>
<linker id="linker.cfg.linux.armv7.jogl.x11"
extends="linker.cfg.linux.armv7">
-- <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="X11"/>
+- <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: libjogl2-java-2.0-rc5/make/build-newt.xml
+Index: jogl-v2.0-rc8/make/build-newt.xml
===================================================================
---- libjogl2-java-2.0-rc5.orig/make/build-newt.xml 2011-12-26
09:54:09.000000000 +0100
-+++ libjogl2-java-2.0-rc5/make/build-newt.xml 2011-12-27 23:14:25.001596434
+0100
-@@ -276,7 +276,7 @@
+--- jogl-v2.0-rc8.orig/make/build-newt.xml 2012-05-15 13:48:52.000000000
+0200
++++ jogl-v2.0-rc8/make/build-newt.xml 2012-05-15 13:52:55.000000000 +0200
+@@ -279,7 +279,7 @@
</linker>
<linker id="linker.cfg.android.newt" extends="linker.cfg.android">
-- <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="android" />
+- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="android" />
+ <syslibset libs="android" />
</linker>
Modified: trunk/libjogl2-java/debian/patches/disable_android.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/disable_android.diff 2012-05-23
10:55:20 UTC (rev 16060)
+++ trunk/libjogl2-java/debian/patches/disable_android.diff 2012-05-23
16:41:32 UTC (rev 16061)
@@ -1,5 +1,7 @@
---- plpo/libjogl2-java-2.0-rc3/make/build-newt.xml 2011-10-06
15:52:37.000000000 +0200
-+++ libjogl2-java-2.0-rc3/make//build-newt.xml 2011-10-06 18:55:54.000000000
+0200
+Index: jogl-v2.0-rc8/make/build-newt.xml
+===================================================================
+--- jogl-v2.0-rc8.orig/make/build-newt.xml 2012-05-02 03:28:29.000000000
+0200
++++ jogl-v2.0-rc8/make/build-newt.xml 2012-05-15 13:48:52.000000000 +0200
@@ -139,7 +139,7 @@
<isset property="setup.noOpenGL"/>
</condition>
@@ -9,7 +11,7 @@
<echo message="java.excludes.all: ${java.excludes.all}" />
</target>
-@@ -575,7 +575,7 @@
+@@ -644,7 +644,7 @@
<javah destdir="${src.generated.c}/X11"
classpath="${javah.classpath}" class="jogamp.newt.driver.x11.X11Window" />
<javah destdir="${src.generated.c}/X11"
classpath="${javah.classpath}" class="jogamp.newt.driver.x11.X11Screen" />
<javah destdir="${src.generated.c}/X11"
classpath="${javah.classpath}" class="jogamp.newt.driver.x11.X11Display" />
@@ -18,20 +20,15 @@
</target>
<target name="c.build.newt.windowlib" unless="setup.nonatives">
---- plpo/libjogl2-java-2.0-rc3/make/build-test.xml 2011-10-06
15:52:37.000000000 +0200
-+++ libjogl2-java-2.0-rc3/make//build-test.xml 2011-10-06 19:02:13.000000000
+0200
-@@ -78,12 +78,14 @@
- </target>
-
- <target name="test.compile" depends="test.compile.check"
unless="test.compile.skip">
-+ <property name="java.excludes.all"
value="jogamp/newt/driver/android/** com/jogamp/opengl/test/android/**" />
- <!-- Perform the junit pass Java compile -->
+Index: jogl-v2.0-rc8/make/build-test.xml
+===================================================================
+--- jogl-v2.0-rc8.orig/make/build-test.xml 2012-05-02 03:28:29.000000000
+0200
++++ jogl-v2.0-rc8/make/build-test.xml 2012-05-15 13:49:47.000000000 +0200
+@@ -79,6 +79,7 @@
<javac destdir="${classes}"
- source="${host.sourcelevel}"
fork="yes"
- memoryMaximumSize="${javac.memorymax}"
includeAntRuntime="false"
+ excludes="${java.excludes.all}"
- debug="${javacdebug}" debuglevel="${javacdebuglevel}">
- <classpath refid="junit_jogl_newt_android.compile.classpath"/>
- <src path="${src.test}" />
+ memoryMaximumSize="${javac.memorymax}"
+ encoding="UTF-8"
+ source="${target.sourcelevel}"
Modified: trunk/libjogl2-java/debian/patches/disable_android_3.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/disable_android_3.diff 2012-05-23
10:55:20 UTC (rev 16060)
+++ trunk/libjogl2-java/debian/patches/disable_android_3.diff 2012-05-23
16:41:32 UTC (rev 16061)
@@ -1,8 +1,8 @@
-Index:
libjogl2-java-2.0-rc5/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java
+Index:
libjogl2-java-2.0-rc8/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java
===================================================================
----
libjogl2-java-2.0-rc5.orig/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java
2011-12-19 03:43:56.000000000 +0100
-+++
libjogl2-java-2.0-rc5/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java
2011-12-26 10:06:08.266867194 +0100
-@@ -200,23 +200,23 @@
+---
libjogl2-java-2.0-rc8.orig/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java
2012-05-02 03:28:29.000000000 +0200
++++
libjogl2-java-2.0-rc8/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java
2012-05-23 16:13:20.000000000 +0200
+@@ -205,23 +205,23 @@
st.uniform(gl, pmvMatrixUniform);
st.useProgram(gl, false);
@@ -30,11 +30,11 @@
System.err.println(Thread.currentThread()+" GearsES2.dispose ... ");
if (drawable instanceof Window) {
-Index:
libjogl2-java-2.0-rc5/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java
+Index:
libjogl2-java-2.0-rc8/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java
===================================================================
----
libjogl2-java-2.0-rc5.orig/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java
2011-12-19 03:43:56.000000000 +0100
-+++
libjogl2-java-2.0-rc5/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java
2011-12-26 10:01:49.134860058 +0100
-@@ -172,23 +172,23 @@
+---
libjogl2-java-2.0-rc8.orig/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java
2012-05-02 03:28:29.000000000 +0200
++++
libjogl2-java-2.0-rc8/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java
2012-05-23 16:13:20.000000000 +0200
+@@ -173,23 +173,23 @@
st.uniform(gl, pmvMatrixUniform);
st.useProgram(gl, false);
@@ -62,3 +62,16 @@
System.err.println(Thread.currentThread()+" RedSquareES2.dispose ...
");
if (null != glWindow) {
glWindow.removeMouseListener(myMouse);
+Index: libjogl2-java-2.0-rc8/make/build-test.xml
+===================================================================
+--- libjogl2-java-2.0-rc8.orig/make/build-test.xml 2012-05-23
16:13:20.000000000 +0200
++++ libjogl2-java-2.0-rc8/make/build-test.xml 2012-05-23 16:13:53.000000000
+0200
+@@ -79,7 +79,7 @@
+ <javac destdir="${classes}"
+ fork="yes"
+ includeAntRuntime="false"
+- excludes="${java.excludes.all}"
++ excludes="${java.excludes.all}
com/jogamp/opengl/test/android/**"
+ memoryMaximumSize="${javac.memorymax}"
+ encoding="UTF-8"
+ source="${target.sourcelevel}"
Added: trunk/libjogl2-java/debian/patches/manifest.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/manifest.diff
(rev 0)
+++ trunk/libjogl2-java/debian/patches/manifest.diff 2012-05-23 16:41:32 UTC
(rev 16061)
@@ -0,0 +1,15 @@
+Index: libjogl2-java-2.0-rc8/make/joglversion
+===================================================================
+--- libjogl2-java-2.0-rc8.orig/make/joglversion 2012-05-02
03:28:29.000000000 +0200
++++ libjogl2-java-2.0-rc8/make/joglversion 2012-05-23 17:49:42.000000000
+0200
+@@ -6,8 +6,9 @@
+ Implementation-Version: @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
+ Trusted-Library: true
++Class-Path: /usr/share/java/gluegen2-rt.jar
Modified: trunk/libjogl2-java/debian/patches/series
===================================================================
--- trunk/libjogl2-java/debian/patches/series 2012-05-23 10:55:20 UTC (rev
16060)
+++ trunk/libjogl2-java/debian/patches/series 2012-05-23 16:41:32 UTC (rev
16061)
@@ -1,12 +1,13 @@
variousFixes.diff
#disableOneDir.diff
swt.diff
-otherArchsoswin.diff
+#otherArchsoswin.diff
disable_android.diff
disable_git_call.diff
disable_android_2.diff
-arch_naming.diff
-linker.cfg.id.os.diff
-otherArchsoswin_2.diff
+#arch_naming.diff
+#linker.cfg.id.os.diff
+#otherArchsoswin_2.diff
disable_android_3.diff
TARGET_PLATFORM_LIBS_2.diff
+manifest.diff
Modified: trunk/libjogl2-java/debian/patches/variousFixes.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/variousFixes.diff 2012-05-23
10:55:20 UTC (rev 16060)
+++ trunk/libjogl2-java/debian/patches/variousFixes.diff 2012-05-23
16:41:32 UTC (rev 16061)
@@ -1,7 +1,7 @@
-Index: libjogl2-java-2.0-rc3/make/build-common.xml
+Index: jogl-v2.0-rc8/make/build-common.xml
===================================================================
---- libjogl2-java-2.0-rc3.orig/make/build-common.xml 2011-10-06
15:52:37.000000000 +0200
-+++ libjogl2-java-2.0-rc3/make/build-common.xml 2011-10-06
16:09:03.000000000 +0200
+--- jogl-v2.0-rc8.orig/make/build-common.xml 2012-05-15 13:53:25.000000000
+0200
++++ jogl-v2.0-rc8/make/build-common.xml 2012-05-15 13:53:27.000000000
+0200
@@ -13,13 +13,13 @@
</fail>
@@ -18,7 +18,7 @@
<condition property="rootrel.build" value="build">
<not>
-@@ -198,7 +192,7 @@
+@@ -207,7 +207,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"/>
@@ -27,16 +27,16 @@
<property name="ant.jar"
value="${ant.home}/lib/ant.jar" />
<property name="ant-junit.jar"
value="${ant.home}/lib/ant-junit.jar" />
-@@ -373,7 +367,7 @@
+@@ -397,7 +397,7 @@
</path>
<!-- JavaSE combinations -->
- <property name="gluegen-rt.jar"
value="${build.gluegen}/gluegen-rt.jar" />
+ <property name="gluegen-rt.jar"
value="/usr/share/java/gluegen2-rt.jar" />
<property name="jogl.test.jar"
value="${jar}/jogl.test.jar"/>
+ <property name="jogl.test.apk"
value="${jar}/jogl.test.apk"/>
- <!-- JavaSE combinations . AWT -->
-@@ -494,7 +488,10 @@
+@@ -531,7 +531,10 @@
<!-- Run the GlueGen build to ensure that the GlueGen ANT task
- has been built. -->
@@ -48,11 +48,11 @@
</target>
-Index: libjogl2-java-2.0-rc3/make/build.xml
+Index: jogl-v2.0-rc8/make/build.xml
===================================================================
---- libjogl2-java-2.0-rc3.orig/make/build.xml 2011-10-06 15:52:37.000000000
+0200
-+++ libjogl2-java-2.0-rc3/make/build.xml 2011-10-06 16:03:43.000000000
+0200
-@@ -325,7 +325,7 @@
+--- jogl-v2.0-rc8.orig/make/build.xml 2012-05-15 13:53:25.000000000 +0200
++++ jogl-v2.0-rc8/make/build.xml 2012-05-15 13:53:27.000000000 +0200
+@@ -276,7 +276,7 @@
</target>
<target name="tag.build" depends="init">
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
