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

[Sylvestre Ledru]

Author: sylvestre
Date: 2011-12-26 18:38:58 +0000 (Mon, 26 Dec 2011)
New Revision: 15603

Added:
   trunk/libjogl2-java/debian/patches/disable_android_3.diff
Modified:
   trunk/libjogl2-java/debian/control
   trunk/libjogl2-java/debian/patches/series
   trunk/libjogl2-java/debian/rules
Log:
libjogl2-java (2.0-rc5-1~exp1) experimental; urgency=low

  * New upstream release
  * watch + repack script added


Modified: trunk/libjogl2-java/debian/control
===================================================================
--- trunk/libjogl2-java/debian/control	2011-12-26 15:47:54 UTC (rev 15602)
+++ trunk/libjogl2-java/debian/control	2011-12-26 18:38:58 UTC (rev 15603)
@@ -4,10 +4,11 @@
 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-rc5-1~exp2), libgluegen2-rt-java (>= 2.0-rc5-1~exp2),
  ant-optional, libgl1-mesa-dev, libglu1-mesa-dev, libxxf86vm-dev, 
- x11proto-xf86vidmode-dev, libxt-dev, libgluegen2-build-java (>= 2.0-rc5-1),
+ x11proto-xf86vidmode-dev, libxt-dev,  junit4, libswt-gtk-3-java,
  ant-contrib, ant-contrib-cpptasks, libxinerama-dev, libxrandr-dev,
- libgluegen2-rt-java, junit4, libswt-gtk-3-java
+ ant (>= 1.8)
 Standards-Version: 3.9.2
 Homepage: http://jogamp.org/
 Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/libjogl2-java

Added: trunk/libjogl2-java/debian/patches/disable_android_3.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/disable_android_3.diff	                        (rev 0)
+++ trunk/libjogl2-java/debian/patches/disable_android_3.diff	2011-12-26 18:38:58 UTC (rev 15603)
@@ -0,0 +1,64 @@
+Index: libjogl2-java-2.0-rc5/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 @@
+         st.uniform(gl, pmvMatrixUniform);
+         st.useProgram(gl, false);
+         
+-        if(useAndroidDebug) {
++/*        if(useAndroidDebug) {
+             try {
+                 android.os.Debug.startMethodTracing("GearsES2.trace");
+                 // android.os.Debug.startAllocCounting();
+                 useAndroidDebug = true;
+             } catch (NoClassDefFoundError e) { useAndroidDebug=false; }
+-        }
++            }*/
+         
+         System.err.println(Thread.currentThread()+" GearsES2.reshape FIN");
+     }
+     private boolean useAndroidDebug = false;
+ 
+     public void dispose(GLAutoDrawable drawable) {
+-        if(useAndroidDebug) {
++/*        if(useAndroidDebug) {
+             // android.os.Debug.stopAllocCounting();
+             android.os.Debug.stopMethodTracing();
+-        }
++            }*/
+         
+         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
+===================================================================
+--- 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 @@
+         st.uniform(gl, pmvMatrixUniform);
+         st.useProgram(gl, false);
+         
+-        if(useAndroidDebug) {
++/*        if(useAndroidDebug) {
+             try {
+                 android.os.Debug.startMethodTracing("RedSquareES2.trace");
+                 // android.os.Debug.startAllocCounting();
+                 useAndroidDebug = true;
+             } catch (NoClassDefFoundError e) { useAndroidDebug=false; }
+-        }
++            }*/
+         
+         System.err.println(Thread.currentThread()+" RedSquareES2.reshape FIN");
+     }
+     private boolean useAndroidDebug = false;
+ 
+     public void dispose(GLAutoDrawable glad) {
+-        if(useAndroidDebug) {
++/*        if(useAndroidDebug) {
+             // android.os.Debug.stopAllocCounting();
+             android.os.Debug.stopMethodTracing();
+-        }
++            }*/
+         System.err.println(Thread.currentThread()+" RedSquareES2.dispose ... ");
+         if (null != glWindow) {
+             glWindow.removeMouseListener(myMouse);

Modified: trunk/libjogl2-java/debian/patches/series
===================================================================
--- trunk/libjogl2-java/debian/patches/series	2011-12-26 15:47:54 UTC (rev 15602)
+++ trunk/libjogl2-java/debian/patches/series	2011-12-26 18:38:58 UTC (rev 15603)
@@ -8,3 +8,4 @@
 arch_naming.diff
 linker.cfg.id.os.diff
 otherArchsoswin_2.diff
+disable_android_3.diff

Modified: trunk/libjogl2-java/debian/rules
===================================================================
--- trunk/libjogl2-java/debian/rules	2011-12-26 15:47:54 UTC (rev 15602)
+++ trunk/libjogl2-java/debian/rules	2011-12-26 18:38:58 UTC (rev 15603)
@@ -12,7 +12,7 @@
 DEB_ANT_BUILDFILE    := make/build.xml
 
 common-build-indep:: doc-build
-doc-build: debian/stamp-makefile-build
+doc-build:
 	$(DEB_ANT_INVOKE) javadoc.all
 
 common-install-prehook-indep::