[pkg-java] r16235 - in trunk/libjogl2-java/debian: . patches
Sylvestre Ledru
sylvestre at alioth.debian.org
Thu Jul 12 16:35:07 UTC 2012
Author: sylvestre
Date: 2012-07-12 16:35:07 +0000 (Thu, 12 Jul 2012)
New Revision: 16235
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/s390x.diff
trunk/libjogl2-java/debian/patches/series
trunk/libjogl2-java/debian/patches/variousFixes.diff
Log:
New upstream release
Modified: trunk/libjogl2-java/debian/changelog
===================================================================
--- trunk/libjogl2-java/debian/changelog 2012-07-10 06:47:08 UTC (rev 16234)
+++ trunk/libjogl2-java/debian/changelog 2012-07-12 16:35:07 UTC (rev 16235)
@@ -1,3 +1,9 @@
+libjogl2-java (2.0-rc9-1~exp1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Mon, 02 Jul 2012 03:22:25 +0200
+
libjogl2-java (2.0-rc8-1) unstable; urgency=low
* Upload to unstable
Modified: trunk/libjogl2-java/debian/control
===================================================================
--- trunk/libjogl2-java/debian/control 2012-07-10 06:47:08 UTC (rev 16234)
+++ trunk/libjogl2-java/debian/control 2012-07-12 16:35:07 UTC (rev 16235)
@@ -4,7 +4,7 @@
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.0-rc8-1~), libgluegen2-rt-java (>= 2.0-rc8-1~),
+ libgluegen2-build-java (>= 2.0-rc9-1~), libgluegen2-rt-java (>= 2.0-rc9-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-rc8), libjogl2-jni (>= ${source:Version})
+ libgluegen2-rt-java (>= 2.0-rc9), 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-07-10 06:47:08 UTC (rev 16234)
+++ trunk/libjogl2-java/debian/patches/TARGET_PLATFORM_LIBS_2.diff 2012-07-12 16:35:07 UTC (rev 16235)
@@ -1,8 +1,8 @@
-Index: jogl-v2.0-rc8/make/build-jogl.xml
+Index: jogl-v2.0-rc9/make/build-jogl.xml
===================================================================
---- 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 @@
+--- 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 @@
</linker>
<linker id="linker.cfg.linux.armv7.jogl.x11" extends="linker.cfg.linux.armv7">
@@ -11,11 +11,11 @@
</linker>
<linker id="linker.cfg.android.jogl" extends="linker.cfg.android">
-Index: jogl-v2.0-rc8/make/build-newt.xml
+Index: jogl-v2.0-rc9/make/build-newt.xml
===================================================================
---- 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 @@
+--- 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 @@
</linker>
<linker id="linker.cfg.android.newt" extends="linker.cfg.android">
Modified: trunk/libjogl2-java/debian/patches/disable_android.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/disable_android.diff 2012-07-10 06:47:08 UTC (rev 16234)
+++ trunk/libjogl2-java/debian/patches/disable_android.diff 2012-07-12 16:35:07 UTC (rev 16235)
@@ -1,7 +1,7 @@
-Index: jogl-v2.0-rc8/make/build-newt.xml
+Index: jogl-v2.0-rc9/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
+--- jogl-v2.0-rc9.orig/make/build-newt.xml 2012-06-19 05:23:28.000000000 +0200
++++ jogl-v2.0-rc9/make/build-newt.xml 2012-07-02 03:25:32.350528723 +0200
@@ -139,7 +139,7 @@
<isset property="setup.noOpenGL"/>
</condition>
@@ -11,20 +11,11 @@
<echo message="java.excludes.all: ${java.excludes.all}" />
</target>
-@@ -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" />
-- <javah destdir="${src.generated.c}/Android" classpath="${javah.classpath}:${android.jar}" class="jogamp.newt.driver.android.AndroidWindow" />
-+<!-- <javah destdir="${src.generated.c}/Android" classpath="${javah.classpath}:${android.jar}" class="jogamp.newt.driver.android.AndroidWindow" />-->
- </target>
-
- <target name="c.build.newt.windowlib" unless="setup.nonatives">
-Index: jogl-v2.0-rc8/make/build-test.xml
+Index: jogl-v2.0-rc9/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 @@
+--- jogl-v2.0-rc9.orig/make/build-test.xml 2012-06-19 05:23:28.000000000 +0200
++++ jogl-v2.0-rc9/make/build-test.xml 2012-07-02 03:25:32.350528723 +0200
+@@ -101,6 +101,7 @@
<javac destdir="${classes}"
fork="yes"
includeAntRuntime="false"
Modified: trunk/libjogl2-java/debian/patches/s390x.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/s390x.diff 2012-07-10 06:47:08 UTC (rev 16234)
+++ trunk/libjogl2-java/debian/patches/s390x.diff 2012-07-12 16:35:07 UTC (rev 16235)
@@ -1,8 +1,8 @@
-Index: libjogl2-java-2.0-rc8/make/build-jogl.xml
+Index: jogl-v2.0-rc9/make/build-jogl.xml
===================================================================
---- libjogl2-java-2.0-rc8.orig/make/build-jogl.xml 2012-06-13 18:24:37.000000000 +0200
-+++ libjogl2-java-2.0-rc8/make/build-jogl.xml 2012-06-13 18:28:51.000000000 +0200
-@@ -1285,13 +1285,19 @@
+--- 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 @@
<property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" />
</target>
@@ -23,10 +23,10 @@
<target name="c.configure.android" if="isAndroid">
<echo message="Android" />
-Index: libjogl2-java-2.0-rc8/make/build-nativewindow.xml
+Index: jogl-v2.0-rc9/make/build-nativewindow.xml
===================================================================
---- libjogl2-java-2.0-rc8.orig/make/build-nativewindow.xml 2012-06-13 18:25:52.000000000 +0200
-+++ libjogl2-java-2.0-rc8/make/build-nativewindow.xml 2012-06-13 18:27:24.000000000 +0200
+--- 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
@@ -529,13 +529,19 @@
<property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" />
</target>
@@ -48,11 +48,11 @@
<target name="c.configure.android" if="isAndroid">
<echo message="Android" />
-Index: libjogl2-java-2.0-rc8/make/build-newt.xml
+Index: jogl-v2.0-rc9/make/build-newt.xml
===================================================================
---- libjogl2-java-2.0-rc8.orig/make/build-newt.xml 2012-06-13 18:24:37.000000000 +0200
-+++ libjogl2-java-2.0-rc8/make/build-newt.xml 2012-06-13 18:28:33.000000000 +0200
-@@ -423,6 +423,16 @@
+--- 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 @@
<echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
</target>
@@ -69,7 +69,7 @@
<target name="c.configure.linux.sparc" if="isLinuxSparc">
<echo message="Linux.sparc" />
<property name="compiler.cfg.id" value="compiler.cfg.linux" />
-@@ -439,7 +449,7 @@
+@@ -452,7 +462,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 2012-07-10 06:47:08 UTC (rev 16234)
+++ trunk/libjogl2-java/debian/patches/series 2012-07-12 16:35:07 UTC (rev 16235)
@@ -8,7 +8,7 @@
#arch_naming.diff
#linker.cfg.id.os.diff
#otherArchsoswin_2.diff
-disable_android_3.diff
+#disable_android_3.diff
TARGET_PLATFORM_LIBS_2.diff
manifest.diff
armhfbuild.diff
Modified: trunk/libjogl2-java/debian/patches/variousFixes.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/variousFixes.diff 2012-07-10 06:47:08 UTC (rev 16234)
+++ trunk/libjogl2-java/debian/patches/variousFixes.diff 2012-07-12 16:35:07 UTC (rev 16235)
@@ -1,7 +1,7 @@
-Index: jogl-v2.0-rc8/make/build-common.xml
+Index: jogl-v2.0-rc9/make/build-common.xml
===================================================================
---- 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
+--- jogl-v2.0-rc9.orig/make/build-common.xml 2012-06-19 05:23:28.000000000 +0200
++++ jogl-v2.0-rc9/make/build-common.xml 2012-07-02 03:25:02.878529381 +0200
@@ -13,13 +13,13 @@
</fail>
@@ -33,11 +33,11 @@
<!-- 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="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.apk" value="${jar}/jogl.test.apk"/>
+ <property name="jogl.test-android.jar" value="${jar}/jogl.test-android.jar"/>
+@@ -552,7 +552,10 @@
-@@ -531,7 +531,10 @@
-
<!-- Run the GlueGen build to ensure that the GlueGen ANT task
- has been built. -->
- <ant antfile="${gluegen.build.xml}" dir="${gluegen.make}" target="base.compile" inheritAll="false"/>
@@ -48,10 +48,10 @@
</target>
-Index: jogl-v2.0-rc8/make/build.xml
+Index: jogl-v2.0-rc9/make/build.xml
===================================================================
---- 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
+--- jogl-v2.0-rc9.orig/make/build.xml 2012-06-19 05:23:28.000000000 +0200
++++ jogl-v2.0-rc9/make/build.xml 2012-07-02 03:24:29.006530137 +0200
@@ -276,7 +276,7 @@
</target>
More information about the pkg-java-commits
mailing list