[pkg-java] r13544 - in trunk/libjogl2-java/debian: . patches
Sylvestre Ledru
sylvestre at alioth.debian.org
Sun Apr 17 14:26:29 UTC 2011
Author: sylvestre
Date: 2011-04-17 14:26:21 +0000 (Sun, 17 Apr 2011)
New Revision: 13544
Modified:
trunk/libjogl2-java/debian/changelog
trunk/libjogl2-java/debian/control
trunk/libjogl2-java/debian/libjogl2-awt-java.install
trunk/libjogl2-java/debian/libjogl2-awt-jni.install
trunk/libjogl2-java/debian/libjogl2-core-java.install
trunk/libjogl2-java/debian/libjogl2-core-newt-java.install
trunk/libjogl2-java/debian/libjogl2-core-newt-jni.install
trunk/libjogl2-java/debian/libjogl2-desktop-java.install
trunk/libjogl2-java/debian/libjogl2-desktop-jni.install
trunk/libjogl2-java/debian/libjogl2-es-common-java.install
trunk/libjogl2-java/debian/libjogl2-es1-java.install
trunk/libjogl2-java/debian/libjogl2-es1-jni.install
trunk/libjogl2-java/debian/libjogl2-es2-java.install
trunk/libjogl2-java/debian/libjogl2-es2-jni.install
trunk/libjogl2-java/debian/libjogl2-glu-java.install
trunk/libjogl2-java/debian/libjogl2-platform-java.install
trunk/libjogl2-java/debian/libjogl2-platform-jni.install
trunk/libjogl2-java/debian/libjogl2-platform-newt-java.install
trunk/libjogl2-java/debian/libjogl2-toolkits.install
trunk/libjogl2-java/debian/patches/series
trunk/libjogl2-java/debian/patches/variousFixes.diff
trunk/libjogl2-java/debian/rules
Log:
* New upstream release
* Standards-Version updated to version 3.9.2
* needless-dependency-on-jre removed
Modified: trunk/libjogl2-java/debian/changelog
===================================================================
--- trunk/libjogl2-java/debian/changelog 2011-04-17 09:15:41 UTC (rev 13543)
+++ trunk/libjogl2-java/debian/changelog 2011-04-17 14:26:21 UTC (rev 13544)
@@ -1,3 +1,11 @@
+libjogl2-java (2.0-rc2-1) unstable; urgency=low
+
+ * New upstream release
+ * Standards-Version updated to version 3.9.2
+ * needless-dependency-on-jre removed
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sun, 17 Apr 2011 14:41:20 +0200
+
libjogl2-java (2.0-rc1-1) unstable; urgency=low
* New upstream release (Closes: #614819)
Modified: trunk/libjogl2-java/debian/control
===================================================================
--- trunk/libjogl2-java/debian/control 2011-04-17 09:15:41 UTC (rev 13543)
+++ trunk/libjogl2-java/debian/control 2011-04-17 14:26:21 UTC (rev 13544)
@@ -6,16 +6,17 @@
Build-Depends: debhelper (>= 5), cdbs, quilt, default-jdk,
ant-optional, libgl1-mesa-dev, libglu1-mesa-dev, libxxf86vm-dev,
x11proto-xf86vidmode-dev, libxt-dev, libgluegen2-build-java, ant-contrib,
- ant-contrib-cpptasks, libxinerama-dev, libxrandr-dev
-Standards-Version: 3.9.1
+ ant-contrib-cpptasks, libxinerama-dev, libxrandr-dev, libgluegen2-rt-java,
+ junit4
+Standards-Version: 3.9.2
Homepage: http://jogamp.org/
Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/libjogl2-java
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjogl2-java/
Package: libjogl2-core-java
Architecture: all
-Depends: ${misc:Depends}, default-jre,
- libjogl2-core-jni (>= ${source:Version}), libgluegen2-rt-java
+Depends: ${misc:Depends}, libjogl2-core-jni (>= ${source:Version}),
+ libgluegen2-rt-java
Description: Java bindings for OpenGL API
The JOGL project hosts the development version of the Java Bindings for
OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics
Modified: trunk/libjogl2-java/debian/libjogl2-awt-java.install
===================================================================
--- trunk/libjogl2-java/debian/libjogl2-awt-java.install 2011-04-17 09:15:41 UTC (rev 13543)
+++ trunk/libjogl2-java/debian/libjogl2-awt-java.install 2011-04-17 14:26:21 UTC (rev 13544)
@@ -1,3 +1,3 @@
-build/jar/nativewindow.awt.jar /usr/share/java/
-build/jar/jogl.awt.jar /usr/share/java/
-build/jar/jogl.util.awt.jar /usr/share/java/
\ No newline at end of file
+build/nativewindow/nativewindow.awt.jar /usr/share/java/
+build/jogl/jogl.awt.jar /usr/share/java/
+build/jogl/jogl.util.awt.jar /usr/share/java/
\ No newline at end of file
Modified: trunk/libjogl2-java/debian/libjogl2-awt-jni.install
===================================================================
--- trunk/libjogl2-java/debian/libjogl2-awt-jni.install 2011-04-17 09:15:41 UTC (rev 13543)
+++ trunk/libjogl2-java/debian/libjogl2-awt-jni.install 2011-04-17 14:26:21 UTC (rev 13544)
@@ -1 +1 @@
-build/lib/libnativewindow_awt.so /usr/lib/jni/
+build/nativewindow/obj/libnativewindow_awt.so /usr/lib/jni/
Modified: trunk/libjogl2-java/debian/libjogl2-core-java.install
===================================================================
--- trunk/libjogl2-java/debian/libjogl2-core-java.install 2011-04-17 09:15:41 UTC (rev 13543)
+++ trunk/libjogl2-java/debian/libjogl2-core-java.install 2011-04-17 14:26:21 UTC (rev 13544)
@@ -1,4 +1,4 @@
-build/jar/nativewindow.core.jar /usr/share/java/
-build/jar/jogl.core.jar /usr/share/java/
-build/jar/jogl.util.jar /usr/share/java/
+build/nativewindow/nativewindow.core.jar /usr/share/java/
+build/jogl/jogl.core.jar /usr/share/java/
+build/jogl/jogl.util.jar /usr/share/java/
Modified: trunk/libjogl2-java/debian/libjogl2-core-newt-java.install
===================================================================
--- trunk/libjogl2-java/debian/libjogl2-core-newt-java.install 2011-04-17 09:15:41 UTC (rev 13543)
+++ trunk/libjogl2-java/debian/libjogl2-core-newt-java.install 2011-04-17 14:26:21 UTC (rev 13544)
@@ -1,2 +1,2 @@
-build/jar/newt.core.jar /usr/share/java/
-build/jar/newt.ogl.jar /usr/share/java/
+build/newt/newt.core.jar /usr/share/java/
+build/newt/newt.ogl.jar /usr/share/java/
Modified: trunk/libjogl2-java/debian/libjogl2-core-newt-jni.install
===================================================================
--- trunk/libjogl2-java/debian/libjogl2-core-newt-jni.install 2011-04-17 09:15:41 UTC (rev 13543)
+++ trunk/libjogl2-java/debian/libjogl2-core-newt-jni.install 2011-04-17 14:26:21 UTC (rev 13544)
@@ -1 +1 @@
-build/lib/libnewt.so /usr/lib/jni/
+build/newt/obj/libnewt.so /usr/lib/jni/
Modified: trunk/libjogl2-java/debian/libjogl2-desktop-java.install
===================================================================
--- trunk/libjogl2-java/debian/libjogl2-desktop-java.install 2011-04-17 09:15:41 UTC (rev 13543)
+++ trunk/libjogl2-java/debian/libjogl2-desktop-java.install 2011-04-17 14:26:21 UTC (rev 13544)
@@ -1 +1 @@
-build/jar/jogl.gldesktop.jar /usr/share/java/
+build/jogl/jogl.gldesktop.jar /usr/share/java/
Modified: trunk/libjogl2-java/debian/libjogl2-desktop-jni.install
===================================================================
--- trunk/libjogl2-java/debian/libjogl2-desktop-jni.install 2011-04-17 09:15:41 UTC (rev 13543)
+++ trunk/libjogl2-java/debian/libjogl2-desktop-jni.install 2011-04-17 14:26:21 UTC (rev 13544)
@@ -1 +1 @@
-build/lib/libjogl_desktop.so /usr/lib/jni/
+build/jogl/obj/libjogl_desktop.so /usr/lib/jni/
Modified: trunk/libjogl2-java/debian/libjogl2-es-common-java.install
===================================================================
--- trunk/libjogl2-java/debian/libjogl2-es-common-java.install 2011-04-17 09:15:41 UTC (rev 13543)
+++ trunk/libjogl2-java/debian/libjogl2-es-common-java.install 2011-04-17 14:26:21 UTC (rev 13544)
@@ -1 +1 @@
-build/jar/jogl.egl.jar /usr/share/java
+build/jogl/jogl.egl.jar /usr/share/java
Modified: trunk/libjogl2-java/debian/libjogl2-es1-java.install
===================================================================
--- trunk/libjogl2-java/debian/libjogl2-es1-java.install 2011-04-17 09:15:41 UTC (rev 13543)
+++ trunk/libjogl2-java/debian/libjogl2-es1-java.install 2011-04-17 14:26:21 UTC (rev 13544)
@@ -1 +1 @@
-build/jar/jogl.gles1.jar /usr/share/java
+build/jogl/jogl.gles1.jar /usr/share/java
Modified: trunk/libjogl2-java/debian/libjogl2-es1-jni.install
===================================================================
--- trunk/libjogl2-java/debian/libjogl2-es1-jni.install 2011-04-17 09:15:41 UTC (rev 13543)
+++ trunk/libjogl2-java/debian/libjogl2-es1-jni.install 2011-04-17 14:26:21 UTC (rev 13544)
@@ -1 +1 @@
-build/lib/libjogl_es1.so /usr/lib/jni/
+build/jogl/obj/libjogl_es1.so /usr/lib/jni/
Modified: trunk/libjogl2-java/debian/libjogl2-es2-java.install
===================================================================
--- trunk/libjogl2-java/debian/libjogl2-es2-java.install 2011-04-17 09:15:41 UTC (rev 13543)
+++ trunk/libjogl2-java/debian/libjogl2-es2-java.install 2011-04-17 14:26:21 UTC (rev 13544)
@@ -1 +1 @@
-build/jar/jogl.gles2.jar /usr/share/java/
+build/jogl/jogl.gles2.jar /usr/share/java/
Modified: trunk/libjogl2-java/debian/libjogl2-es2-jni.install
===================================================================
--- trunk/libjogl2-java/debian/libjogl2-es2-jni.install 2011-04-17 09:15:41 UTC (rev 13543)
+++ trunk/libjogl2-java/debian/libjogl2-es2-jni.install 2011-04-17 14:26:21 UTC (rev 13544)
@@ -1 +1 @@
-build/lib/libjogl_es2.so /usr/lib/jni/
\ No newline at end of file
+build/jogl/obj/libjogl_es2.so /usr/lib/jni/
\ No newline at end of file
Modified: trunk/libjogl2-java/debian/libjogl2-glu-java.install
===================================================================
--- trunk/libjogl2-java/debian/libjogl2-glu-java.install 2011-04-17 09:15:41 UTC (rev 13543)
+++ trunk/libjogl2-java/debian/libjogl2-glu-java.install 2011-04-17 14:26:21 UTC (rev 13544)
@@ -1,3 +1,3 @@
-build/jar/jogl.glu.tess.jar /usr/share/java/
-build/jar/jogl.glu.gldesktop.jar /usr/share/java/
-build/jar/jogl.glu.mipmap.jar /usr/share/java/
+build/jogl/jogl.glu.tess.jar /usr/share/java/
+build/jogl/jogl.glu.gldesktop.jar /usr/share/java/
+build/jogl/jogl.glu.mipmap.jar /usr/share/java/
Modified: trunk/libjogl2-java/debian/libjogl2-platform-java.install
===================================================================
--- trunk/libjogl2-java/debian/libjogl2-platform-java.install 2011-04-17 09:15:41 UTC (rev 13543)
+++ trunk/libjogl2-java/debian/libjogl2-platform-java.install 2011-04-17 14:26:21 UTC (rev 13544)
@@ -1,2 +1,2 @@
-build/jar/nativewindow.os.x11.jar /usr/share/java/
-build/jar/jogl.os.x11.jar /usr/share/java/
+build/nativewindow/nativewindow.os.x11.jar /usr/share/java/
+build/jogl/jogl.os.x11.jar /usr/share/java/
Modified: trunk/libjogl2-java/debian/libjogl2-platform-jni.install
===================================================================
--- trunk/libjogl2-java/debian/libjogl2-platform-jni.install 2011-04-17 09:15:41 UTC (rev 13543)
+++ trunk/libjogl2-java/debian/libjogl2-platform-jni.install 2011-04-17 14:26:21 UTC (rev 13544)
@@ -1 +1 @@
-build/lib/libnativewindow_x11.so /usr/lib/jni/
+build/nativewindow/obj/libnativewindow_x11.so /usr/lib/jni/
Modified: trunk/libjogl2-java/debian/libjogl2-platform-newt-java.install
===================================================================
--- trunk/libjogl2-java/debian/libjogl2-platform-newt-java.install 2011-04-17 09:15:41 UTC (rev 13543)
+++ trunk/libjogl2-java/debian/libjogl2-platform-newt-java.install 2011-04-17 14:26:21 UTC (rev 13544)
@@ -1 +1 @@
-build/jar/newt.os.x11.jar /usr/share/java/
+build/newt/newt.os.x11.jar /usr/share/java/
Modified: trunk/libjogl2-java/debian/libjogl2-toolkits.install
===================================================================
--- trunk/libjogl2-java/debian/libjogl2-toolkits.install 2011-04-17 09:15:41 UTC (rev 13543)
+++ trunk/libjogl2-java/debian/libjogl2-toolkits.install 2011-04-17 14:26:21 UTC (rev 13544)
@@ -1 +1 @@
-build/jar/jogl.util.fixedfuncemu.jar /usr/share/java/
+build/jogl/jogl.util.fixedfuncemu.jar /usr/share/java/
Modified: trunk/libjogl2-java/debian/patches/series
===================================================================
--- trunk/libjogl2-java/debian/patches/series 2011-04-17 09:15:41 UTC (rev 13543)
+++ trunk/libjogl2-java/debian/patches/series 2011-04-17 14:26:21 UTC (rev 13544)
@@ -1 +1,2 @@
variousFixes.diff
+disableOneDir.diff
Modified: trunk/libjogl2-java/debian/patches/variousFixes.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/variousFixes.diff 2011-04-17 09:15:41 UTC (rev 13543)
+++ trunk/libjogl2-java/debian/patches/variousFixes.diff 2011-04-17 14:26:21 UTC (rev 13544)
@@ -1,20 +1,22 @@
-diff -ur jogl/make//build-common.xml libjogl2-java-2.0-rc1/make//build-common.xml
---- jogl/make//build-common.xml 2011-02-22 14:28:48.000000000 +0100
-+++ libjogl2-java-2.0-rc1/make//build-common.xml 2011-02-22 17:59:48.000000000 +0100
-@@ -13,11 +13,9 @@
+diff -ur jogl-v2.0-rc2.orig/make/build-common.xml jogl-v2.0-rc2/make/build-common.xml
+--- jogl-v2.0-rc2.orig/make/build-common.xml 2011-03-02 20:52:40.000000000 +0100
++++ jogl-v2.0-rc2/make/build-common.xml 2011-04-17 15:28:58.000000000 +0200
+@@ -13,13 +13,11 @@
</fail>
<!-- Pull in GlueGen cpptasks build file -->
- <property name="gluegen.root" value="../../gluegen" />
+ <property name="gluegen.root" value="/usr/share/gluegen2/" />
<import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
+ <import file="${gluegen.root}/make/jogamp-archivetasks.xml" />
+ <import file="${gluegen.root}/make/jogamp-env.xml" />
- <property name="ant-contrib.jar" value="${gluegen.root}/make/lib/ant-contrib-1.0b3.jar" />
-
<condition property="rootrel.build" value="build">
<not>
<isset property="rootrel.build"/>
-@@ -115,7 +113,7 @@
+@@ -150,7 +148,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"/>
@@ -23,7 +25,7 @@
<property name="ant.jar" value="${ant.home}/lib/ant.jar" />
<property name="ant-junit.jar" value="${ant.home}/lib/ant-junit.jar" />
-@@ -159,7 +157,7 @@
+@@ -192,7 +190,7 @@
</path>
<!-- JavaSE combinations -->
@@ -32,47 +34,22 @@
<property name="jogl.test.jar" value="${build.jogl}/jogl.test.jar"/>
<!-- JavaSE combinations . AWT -->
-@@ -356,11 +354,11 @@
+@@ -362,7 +360,10 @@
+
+ <!-- Run the GlueGen build to ensure that the GlueGen ANT task
- has been built. -->
- <!-- FIXME: remove passing down of antlr.jar when gluegen.properties is on all
- nightly build machines -->
-+<!--<mkdir dir="${basedir}/${build.jogl}/gensrc/classes/src/java/com/jogamp/common/util/"/>-->
- <ant antfile="${gluegen.build.xml}" dir="${gluegen.make}" target="all" inheritAll="false">
-- <propertyset>
-- <propertyref name="antlr.jar" />
-- <!--propertyref name="gluegen.nsig" /-->
-- </propertyset>
-+
+- <ant antfile="${gluegen.build.xml}" dir="${gluegen.make}" target="base.compile" inheritAll="false"/>
++ <ant antfile="${gluegen.build.xml}" dir="${gluegen.make}" target="base.compile" inheritAll="false">
+ <property name="build" value="${basedir}/../"/>
+ <property name="test.dir" value="${basedir}/../test"/>
- </ant>
++ </ant>
</target>
-diff -ur jogl/make//build-jogl.xml libjogl2-java-2.0-rc1/make//build-jogl.xml
---- jogl/make//build-jogl.xml 2011-02-22 14:28:48.000000000 +0100
-+++ libjogl2-java-2.0-rc1/make//build-jogl.xml 2011-02-22 16:39:37.000000000 +0100
-@@ -1612,7 +1612,7 @@
- includes="${java.part.util.fixedfuncemu.shadercode}"/>
- </jar>
- </target>
-- <target name="build-jars-all-cdc" depends="setup-manifestfile">
-+ <target name="build-jars-all-cdc" depends="setup-manifestfile" unless="setup.noCDC">
- <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.all.cdc.jar}" filesonly="true">
- <fileset dir="${classes-cdc}"
- includes="${java.part.core} ${java.part.egl} ${java.part.glutess} ${java.part.glumipmap} ${java.part.openmax} ${java.part.sdk} ${java.part.glx} ${java.part.cgl} ${java.part.wgl} ${java.part.es1} ${java.part.es1.dbg} ${java.part.es2} ${java.part.es2.dbg} ${java.part.util} ${java.part.util.glsl} ${java.part.util.fixedfuncemu}"
-diff -ur jogl/make//build.xml libjogl2-java-2.0-rc1/make//build.xml
---- jogl/make//build.xml 2011-02-22 14:28:48.000000000 +0100
-+++ libjogl2-java-2.0-rc1/make//build.xml 2011-02-22 16:54:49.000000000 +0100
-@@ -64,7 +64,7 @@
- <delete includeEmptyDirs="true" quiet="true" dir="${lib}" failonerror="false" />
- <mkdir dir="${lib}" />
- <copy todir="${lib}">
-- <fileset dir="${gluegen.root}/${rootrel.build}/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
-+<!-- <fileset dir="${gluegen.root}/${rootrel.build}/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />-->
- <fileset dir="${build}/jogl/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
- <fileset dir="${build}/nativewindow/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
- <fileset dir="${build}/newt/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
-@@ -75,7 +75,7 @@
+
+diff -ur jogl-v2.0-rc2.orig/make/build.xml jogl-v2.0-rc2/make/build.xml
+--- jogl-v2.0-rc2.orig/make/build.xml 2011-03-02 20:52:40.000000000 +0100
++++ jogl-v2.0-rc2/make/build.xml 2011-04-17 15:26:47.000000000 +0200
+@@ -86,7 +86,7 @@
<delete includeEmptyDirs="true" quiet="true" dir="${jar}" failonerror="false" />
<mkdir dir="${jar}" />
<copy todir="${jar}">
@@ -81,7 +58,7 @@
<fileset dir="${build}/jogl" includes="*.jar" />
<fileset dir="${build}/nativewindow" includes="*.jar" />
<fileset dir="${build}/newt" includes="*.jar" />
-@@ -149,7 +149,7 @@
+@@ -159,7 +159,7 @@
</target>
<target name="tag.build" depends="init">
Modified: trunk/libjogl2-java/debian/rules
===================================================================
--- trunk/libjogl2-java/debian/rules 2011-04-17 09:15:41 UTC (rev 13543)
+++ trunk/libjogl2-java/debian/rules 2011-04-17 14:26:21 UTC (rev 13544)
@@ -5,7 +5,7 @@
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
JAVA_HOME := /usr/lib/jvm/default-java/
-DEB_JARS := ant-contrib-cpptasks ant-nodeps antlr ant-antlr
+DEB_JARS := ant-contrib ant-contrib-cpptasks ant-nodeps antlr ant-antlr
DEB_ANT_ARGS := -Dsetup.noCDC=true
DEB_ANT_CLEAN_TARGET := clean
DEB_ANT_BUILD_TARGET := all
More information about the pkg-java-commits
mailing list