[pkg-java] r13339 - in trunk/libjogl2-java/debian: . patches
Sylvestre Ledru
sylvestre at alioth.debian.org
Tue Feb 22 17:07:40 UTC 2011
Author: sylvestre
Date: 2011-02-22 17:07:37 +0000 (Tue, 22 Feb 2011)
New Revision: 13339
Added:
trunk/libjogl2-java/debian/patches/variousFixes.diff
Modified:
trunk/libjogl2-java/debian/README.Debian
trunk/libjogl2-java/debian/changelog
trunk/libjogl2-java/debian/control
Log:
progress in the jogl2 packaging
Modified: trunk/libjogl2-java/debian/README.Debian
===================================================================
--- trunk/libjogl2-java/debian/README.Debian 2011-02-22 17:07:08 UTC (rev 13338)
+++ trunk/libjogl2-java/debian/README.Debian 2011-02-22 17:07:37 UTC (rev 13339)
@@ -1,8 +1,17 @@
-The homepage of jogl is <http://jogl.dev.java.net>. Please check the
-licence of the package if you are about to upload a new upstream version
-of the package to the Debian archive. If the licence has changed in a
-way that forbids autobuilding the package you have to contact Andreas
-Barth <aba at not.so.argh.org> before uploading it.
+JOGL2 in Debian
- -- Torsten Werner <twerner at debian.org>
+==== Packaging naming different with upstream ====
+Packages have been renaming to allow installation of JOGL 1.X and 2.X on
+a Debian system.
+For information:
+https://www.jogamp.org/bugzilla/show_bug.cgi?id=441
+
+
+==== CDC packages ====
+
+CDC (Connected Device Configuration) packages are not generated.
+This feature is already removed from the git repository.
+
+
+
Modified: trunk/libjogl2-java/debian/changelog
===================================================================
--- trunk/libjogl2-java/debian/changelog 2011-02-22 17:07:08 UTC (rev 13338)
+++ trunk/libjogl2-java/debian/changelog 2011-02-22 17:07:37 UTC (rev 13339)
@@ -1,4 +1,4 @@
-libjogl2-java (2.0-beta10-1) unstable; urgency=low
+libjogl2-java (2.0-rc1-1) unstable; urgency=low
* New upstream release
Modified: trunk/libjogl2-java/debian/control
===================================================================
--- trunk/libjogl2-java/debian/control 2011-02-22 17:07:08 UTC (rev 13338)
+++ trunk/libjogl2-java/debian/control 2011-02-22 17:07:37 UTC (rev 13339)
@@ -3,19 +3,19 @@
Priority: optional
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, openjdk-6-jdk,
+Build-Depends: debhelper (>= 5), cdbs, quilt, default-jdk,
ant-optional, libgl1-mesa-dev, libglu1-mesa-dev, libxxf86vm-dev,
- x11proto-xf86vidmode-dev, libxt-dev, libgluegen-java
-Standards-Version: 3.8.3
-Homepage: http://kenai.com/projects/jogl/
-Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/libjogl-java
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjogl-java/
+ x11proto-xf86vidmode-dev, libxt-dev, libgluegen2-java
+Standards-Version: 3.9.1
+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: libjogl-core-java
+Package: libjogl2-core-java
Architecture: all
-Suggests: libjogl-java-doc
-Depends: ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime,
- libjogl-jni (>= ${source:Version}),
+Suggests: libjogl2-java-doc
+Depends: ${misc:Depends}, default-jre,
+ libjogl2-jni (>= ${source:Version}),
antlr
Description: Java bindings for OpenGL API (java library)
The JOGL project hosts the development version of the Java Bindings for
@@ -30,11 +30,11 @@
well as nearly all vendor extensions, and integrates with the AWT and Swing
widget sets.
-Package: libjogl-java
+Package: libjogl2java
Architecture: all
-Suggests: libjogl-java-doc
-Depends: ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime,
- libjogl-jni (>= ${source:Version}),
+Suggests: libjogl2java-doc
+Depends: ${misc:Depends}, default-jre,
+ libjogl2jni (>= ${source:Version}),
antlr
Description: Java bindings for OpenGL API (java library)
The JOGL project hosts the development version of the Java Bindings for
@@ -49,11 +49,11 @@
well as nearly all vendor extensions, and integrates with the AWT and Swing
widget sets.
-Package: libjogl-noawt-java
+Package: libjogl2noawt-java
Architecture: all
-Suggests: libjogl-java-doc
-Depends: ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime,
- libjogl-jni (>= ${source:Version}),
+Suggests: libjogl2java-doc
+Depends: ${misc:Depends}, default-jre,
+ libjogl2jni (>= ${source:Version}),
antlr
Description: Java bindings for OpenGL API (java library)
The JOGL project hosts the development version of the Java Bindings for
@@ -68,11 +68,11 @@
well as nearly all vendor extensions, and integrates with the AWT and Swing
widget sets.
-Package: libjogl-es1-java
+Package: libjogl2es1-java
Architecture: all
-Suggests: libjogl-java-doc
-Depends: ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime,
- libjogl-jni (>= ${source:Version}),
+Suggests: libjogl2java-doc
+Depends: ${misc:Depends}, default-jre,
+ libjogl2jni (>= ${source:Version}),
antlr
Description: Java bindings for OpenGL API (java library)
The JOGL project hosts the development version of the Java Bindings for
@@ -87,11 +87,11 @@
well as nearly all vendor extensions, and integrates with the AWT and Swing
widget sets.
-Package: libjogl-es2-java
+Package: libjogl2es2-java
Architecture: all
-Suggests: libjogl-java-doc
-Depends: ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime,
- libjogl-jni (>= ${source:Version}),
+Suggests: libjogl2java-doc
+Depends: ${misc:Depends}, default-jre,
+ libjogl2jni (>= ${source:Version}),
antlr
Description: Java bindings for OpenGL API (java library)
The JOGL project hosts the development version of the Java Bindings for
@@ -106,11 +106,11 @@
well as nearly all vendor extensions, and integrates with the AWT and Swing
widget sets.
-Package: libjogl-gl2es12-java
+Package: libjogl2gl2es12-java
Architecture: all
-Suggests: libjogl-java-doc
-Depends: ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime,
- libjogl-jni (>= ${source:Version}),
+Suggests: libjogl2java-doc
+Depends: ${misc:Depends}, default-jre,
+ libjogl2jni (>= ${source:Version}),
antlr
Description: Java bindings for OpenGL API (java library)
The JOGL project hosts the development version of the Java Bindings for
@@ -126,11 +126,11 @@
widget sets.
-Package: libjogl-gl2-java
+Package: libjogl2gl2-java
Architecture: all
-Suggests: libjogl-java-doc
-Depends: ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime,
- libjogl-jni (>= ${source:Version}),
+Suggests: libjogl2java-doc
+Depends: ${misc:Depends}, default-jre,
+ libjogl2jni (>= ${source:Version}),
antlr
Description: Java bindings for OpenGL API (java library)
The JOGL project hosts the development version of the Java Bindings for
@@ -145,7 +145,7 @@
well as nearly all vendor extensions, and integrates with the AWT and Swing
widget sets.
-Package: libjogl-jni
+Package: libjogl2jni
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Java bindings for OpenGL API (java jni library)
@@ -163,13 +163,13 @@
.
This package includes the architecture specific java native interface part
for the Java bindings for OpenGL. For an extended description have a look
- at package libjogl-java.
+ at package libjogl2java.
-Package: libjogl-java-doc
+Package: libjogl2java-doc
Architecture: all
Section: doc
Depends: ${misc:Depends}
-Suggests: libjogl-java
+Suggests: libjogl2java
Description: Documentation for the Java bindings for OpenGL
The JOGL project hosts the development version of the Java Bindings for
OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics
Added: trunk/libjogl2-java/debian/patches/variousFixes.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/variousFixes.diff (rev 0)
+++ trunk/libjogl2-java/debian/patches/variousFixes.diff 2011-02-22 17:07:37 UTC (rev 13339)
@@ -0,0 +1,92 @@
+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 @@
+ </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" />
+
+- <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 @@
+ <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"/>
+- <property name="gluegen.jar" value="${build.gluegen}/gluegen.jar" />
++ <property name="gluegen.jar" value="/usr/share/java/gluegen2.jar" />
+ <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 @@
+ </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="${build.jogl}/jogl.test.jar"/>
+
+ <!-- JavaSE combinations . AWT -->
+@@ -356,11 +354,11 @@
+ - 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>
++
++ <property name="build" value="${basedir}/../"/>
++ <property name="test.dir" value="${basedir}/../test"/>
+ </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 @@
+ <delete includeEmptyDirs="true" quiet="true" dir="${jar}" failonerror="false" />
+ <mkdir dir="${jar}" />
+ <copy todir="${jar}">
+- <fileset dir="${gluegen.root}/${rootrel.build}" includes="gluegen-rt*.jar" />
++<!-- <fileset dir="${gluegen.root}/${rootrel.build}" includes="gluegen-rt*.jar" />-->
+ <fileset dir="${build}/jogl" includes="*.jar" />
+ <fileset dir="${build}/nativewindow" includes="*.jar" />
+ <fileset dir="${build}/newt" includes="*.jar" />
+@@ -149,7 +149,7 @@
+ </target>
+
+ <target name="tag.build" depends="init">
+- <copy file="${build.gluegen}/artifact.properties" todir="${build}" overwrite="true"/>
++ <copy file="/usr/share/gluegen2/artifact.properties" todir="${build}" overwrite="true"/>
+ <echo message='jogl.build.number=${jogl.build.number}${line.separator}' file="${build}/artifact.properties" append="true"/>
+ <echo message='jogl.build.id=${jogl.build.id}${line.separator}' file="${build}/artifact.properties" append="true"/>
+ <echo message='jogl.build.branch=${jogl.build.branch}${line.separator}' file="${build}/artifact.properties" append="true"/>
More information about the pkg-java-commits
mailing list