[pkg-java] r16290 - in trunk/libjogl2-java/debian: . patches

Sylvestre Ledru sylvestre at alioth.debian.org
Mon Sep 3 09:48:15 UTC 2012 

Author: sylvestre
Date: 2012-09-03 09:48:15 +0000 (Mon, 03 Sep 2012)
New Revision: 16290

Modified:
   trunk/libjogl2-java/debian/changelog
   trunk/libjogl2-java/debian/control
   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

Modified: trunk/libjogl2-java/debian/changelog
===================================================================
--- trunk/libjogl2-java/debian/changelog	2012-08-31 01:43:42 UTC (rev 16289)
+++ trunk/libjogl2-java/debian/changelog	2012-09-03 09:48:15 UTC (rev 16290)
@@ -1,3 +1,9 @@
+libjogl2-java (2.0-rc10-1~exp1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 03 Sep 2012 09:34:29 +0200
+
 libjogl2-java (2.0-rc9-1~exp1) experimental; urgency=low
 
   * New upstream release

Modified: trunk/libjogl2-java/debian/control
===================================================================
--- trunk/libjogl2-java/debian/control	2012-08-31 01:43:42 UTC (rev 16289)
+++ trunk/libjogl2-java/debian/control	2012-09-03 09:48:15 UTC (rev 16290)
@@ -4,8 +4,8 @@
 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-rc9-1~), libgluegen2-rt-java (>= 2.0-rc9-1~),
- ant-optional, libgl1-mesa-dev, libglu1-mesa-dev, libxxf86vm-dev, 
+ libgluegen2-build-java (>= 2.0-rc10-1~), libgluegen2-rt-java (>= 2.0-rc10-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,
  ant (>= 1.8)
@@ -17,12 +17,12 @@
 Package: libjogl2-java
 Architecture: all
 Depends: ${misc:Depends},
- libgluegen2-rt-java (>= 2.0-rc9), libjogl2-jni (>= ${source:Version})
+ libgluegen2-rt-java (>= 2.0-rc10), 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 
- OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics 
- to applications written in Java. JOGL is not the official reference 
+ The JOGL project hosts the development version of the Java Bindings for
+ OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics
+ to applications written in Java. JOGL is not the official reference
  implementation of the JSR, but an evolving workspace; snapshots are taken 
  from this workspace which become the official reference implementations of 
  the JSR. 

Modified: trunk/libjogl2-java/debian/libjogl2-toolkits.install
===================================================================
--- trunk/libjogl2-java/debian/libjogl2-toolkits.install	2012-08-31 01:43:42 UTC (rev 16289)
+++ trunk/libjogl2-java/debian/libjogl2-toolkits.install	2012-09-03 09:48:15 UTC (rev 16290)
@@ -1 +1 @@
-build/jogl/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	2012-08-31 01:43:42 UTC (rev 16289)
+++ trunk/libjogl2-java/debian/patches/series	2012-09-03 09:48:15 UTC (rev 16290)
@@ -2,7 +2,7 @@
 #disableOneDir.diff
 swt.diff
 #otherArchsoswin.diff
-disable_android.diff
+#disable_android.diff
 disable_git_call.diff
 disable_android_2.diff
 #arch_naming.diff

Modified: trunk/libjogl2-java/debian/patches/variousFixes.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/variousFixes.diff	2012-08-31 01:43:42 UTC (rev 16289)
+++ trunk/libjogl2-java/debian/patches/variousFixes.diff	2012-09-03 09:48:15 UTC (rev 16290)
@@ -1,7 +1,7 @@
-Index: jogl-v2.0-rc9/make/build-common.xml
+Index: jogl-v2.0-rc10/make/build-common.xml
 ===================================================================
---- 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
+--- jogl-v2.0-rc10.orig/make/build-common.xml	2012-08-03 00:38:37.000000000 +0200
++++ jogl-v2.0-rc10/make/build-common.xml	2012-09-03 09:38:18.000000000 +0200
 @@ -13,13 +13,13 @@
      </fail>
  
@@ -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" />
  
-@@ -397,7 +397,7 @@
+@@ -400,7 +400,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="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"/>
-@@ -552,7 +552,10 @@
+         <property name="jogl-test.jar"                  value="${jar}/jogl-test.jar"/>
+         <property name="jogl-test-android.jar"          value="${jar}/jogl-test-android.jar"/>
+@@ -555,7 +555,10 @@
  
          <!-- Run the GlueGen build to ensure that the GlueGen ANT task
             - has been built. -->
@@ -48,10 +48,10 @@
      </target>
  
  
-Index: jogl-v2.0-rc9/make/build.xml
+Index: jogl-v2.0-rc10/make/build.xml
 ===================================================================
---- 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
+--- jogl-v2.0-rc10.orig/make/build.xml	2012-08-03 00:38:37.000000000 +0200
++++ jogl-v2.0-rc10/make/build.xml	2012-09-03 09:38:18.000000000 +0200
 @@ -276,7 +276,7 @@
      </target>
  

Modified: trunk/libjogl2-java/debian/rules
===================================================================
--- trunk/libjogl2-java/debian/rules	2012-08-31 01:43:42 UTC (rev 16289)
+++ trunk/libjogl2-java/debian/rules	2012-09-03 09:48:15 UTC (rev 16290)
@@ -6,7 +6,7 @@
 
 JAVA_HOME            := /usr/lib/jvm/default-java/
 DEB_JARS             := ant-contrib ant-contrib-cpptasks ant-nodeps antlr ant-antlr swt
-DEB_ANT_ARGS         := -Dsetup.noCDC=true 
+DEB_ANT_ARGS         := -Dsetup.noCDC=true
 DEB_ANT_CLEAN_TARGET := clean
 DEB_ANT_BUILD_TARGET := all
 DEB_ANT_BUILDFILE    := make/build.xml
@@ -20,7 +20,7 @@
 endif
 
 common-install-prehook-indep::
-	mv build/jar/jogl.all.jar build/jar/jogl2.jar
+	mv build/jar/jogl-all.jar build/jar/jogl2.jar
 
 clean::
 	$(RM) -r gluegen/build

More information about the pkg-java-commits mailing list