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

Sylvestre Ledru sylvestre at alioth.debian.org
Mon Jul 1 16:32:37 UTC 2013


Author: sylvestre
Date: 2013-07-01 16:32:36 +0000 (Mon, 01 Jul 2013)
New Revision: 16954

Modified:
   trunk/libjogl2-java/debian/changelog
   trunk/libjogl2-java/debian/control
   trunk/libjogl2-java/debian/patches/arm-build.diff
   trunk/libjogl2-java/debian/patches/disable_android_2.diff
   trunk/libjogl2-java/debian/patches/disable_git_call.diff
   trunk/libjogl2-java/debian/patches/manifest.diff
   trunk/libjogl2-java/debian/patches/s390x.diff
   trunk/libjogl2-java/debian/patches/swt.diff
   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	2013-07-01 16:29:01 UTC (rev 16953)
+++ trunk/libjogl2-java/debian/changelog	2013-07-01 16:32:36 UTC (rev 16954)
@@ -1,3 +1,9 @@
+libjogl2-java (2.0-rc12-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 01 Jul 2013 14:26:13 +0200
+
 libjogl2-java (2.0-rc11-1) unstable; urgency=low
 
   * Upload to unstable

Modified: trunk/libjogl2-java/debian/control
===================================================================
--- trunk/libjogl2-java/debian/control	2013-07-01 16:29:01 UTC (rev 16953)
+++ trunk/libjogl2-java/debian/control	2013-07-01 16:32:36 UTC (rev 16954)
@@ -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-rc11-1~), libgluegen2-rt-java (>= 2.0-rc11-1~),
+ libgluegen2-build-java (>= 2.0-rc12-1~), libgluegen2-rt-java (>= 2.0-rc12-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-rc11), libjogl2-jni (>= ${source:Version})
+ libgluegen2-rt-java (>= 2.0-rc12), 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/arm-build.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/arm-build.diff	2013-07-01 16:29:01 UTC (rev 16953)
+++ trunk/libjogl2-java/debian/patches/arm-build.diff	2013-07-01 16:32:36 UTC (rev 16954)
@@ -1,8 +1,8 @@
-diff --git a/make/build-jogl.xml b/make/build-jogl.xml
-index a071441..aa7aa6e 100644
---- a/make/build-jogl.xml
-+++ b/make/build-jogl.xml
-@@ -197,6 +197,19 @@
+Index: jogl-v2.0-rc12/make/build-jogl.xml
+===================================================================
+--- jogl-v2.0-rc12.orig/make/build-jogl.xml	2013-07-01 14:29:18.000000000 +0200
++++ jogl-v2.0-rc12/make/build-jogl.xml	2013-07-01 14:29:17.000000000 +0200
+@@ -200,6 +200,19 @@
             <isset property="setup.noSWT"/> 
          </condition>
  
@@ -22,7 +22,7 @@
          <property name="java.excludes.javadoc.packagenames"
                    value="jogamp.opengl.gl2.fixme.*,com.jogamp.audio.windows.waveout.TestSpatialization"/>
  
-@@ -1122,7 +1135,7 @@
+@@ -1129,7 +1142,7 @@
          <includepath path="/usr/local/include" />
        </compiler>
  
@@ -31,7 +31,7 @@
          <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage -->
          <compilerarg value="-idirafter" />
          <compilerarg value="/usr/include" />
-@@ -1150,8 +1163,8 @@
+@@ -1157,8 +1170,8 @@
          <syslibset libs="X11"/>
        </linker>
  
@@ -42,7 +42,7 @@
        </linker>
  
        <linker id="linker.cfg.android.jogl" extends="linker.cfg.android">
-@@ -1239,10 +1252,10 @@
+@@ -1246,10 +1259,10 @@
        <property name="linker.cfg.id.os"                    value="linker.cfg.linux.amd64.jogl.x11" />
      </target>
      
@@ -57,7 +57,7 @@
      </target>
      
      <target name="c.configure.linux.ia64" if="isLinuxIA64">
-@@ -1293,7 +1306,7 @@
+@@ -1300,7 +1313,7 @@
        <property name="linker.cfg.id.os"                    value="linker.cfg.linux.jogl.x11" />
      </target>
  
@@ -66,10 +66,10 @@
  
      <target name="c.configure.android" if="isAndroid">
        <echo message="Android" />
-diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
-index 26cf237..d49ef21 100644
---- a/make/build-nativewindow.xml
-+++ b/make/build-nativewindow.xml
+Index: jogl-v2.0-rc12/make/build-nativewindow.xml
+===================================================================
+--- jogl-v2.0-rc12.orig/make/build-nativewindow.xml	2013-07-01 14:29:18.000000000 +0200
++++ jogl-v2.0-rc12/make/build-nativewindow.xml	2013-07-01 14:29:17.000000000 +0200
 @@ -88,6 +88,19 @@
             <isset property="setup.noAWT"/> 
          </condition>
@@ -99,7 +99,7 @@
          <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage -->
          <compilerarg value="-idirafter" />
          <compilerarg value="/usr/include" />
-@@ -396,10 +409,10 @@
+@@ -395,10 +408,10 @@
          <syslibset libs="Xrender"/>
        </linker>
  
@@ -114,7 +114,7 @@
        </linker>
  
        <linker id="linker.cfg.solaris.nativewindow.x11" extends="linker.cfg.solaris">
-@@ -487,10 +500,10 @@
+@@ -483,10 +496,10 @@
        <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.amd64.nativewindow.x11" />
      </target>
      
@@ -129,7 +129,7 @@
      </target>
      
      <target name="c.configure.linux.ia64" if="isLinuxIA64">
-@@ -541,7 +554,7 @@
+@@ -537,7 +550,7 @@
        <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
      </target>
  
@@ -138,10 +138,10 @@
  
      <target name="c.configure.android" if="isAndroid">
        <echo message="Android" />
-diff --git a/make/build-newt.xml b/make/build-newt.xml
-index 9872912..c4f4c6b 100644
---- a/make/build-newt.xml
-+++ b/make/build-newt.xml
+Index: jogl-v2.0-rc12/make/build-newt.xml
+===================================================================
+--- jogl-v2.0-rc12.orig/make/build-newt.xml	2013-07-01 14:29:18.000000000 +0200
++++ jogl-v2.0-rc12/make/build-newt.xml	2013-07-01 14:29:17.000000000 +0200
 @@ -157,6 +157,19 @@
             <isset property="setup.noOpenGL"/>
          </condition>
@@ -189,7 +189,7 @@
        </linker>
  
        <linker id="linker.cfg.solaris.newt.x11" extends="linker.cfg.solaris">
-@@ -410,11 +423,11 @@
+@@ -412,11 +425,11 @@
        <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
      </target>
  
@@ -206,7 +206,7 @@
            <isset property="isX11" />
        </condition>
        <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
-@@ -496,7 +509,7 @@
+@@ -498,7 +511,7 @@
        <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.newt.x11" />
      </target>
  
@@ -215,11 +215,10 @@
  
      <target name="c.configure.android" if="isAndroid">
        <echo message="Android" />
-diff --git a/make/scripts/make.jogl.all.linux-armv7hf.sh b/make/scripts/make.jogl.all.linux-armv7hf.sh
-new file mode 100644
-index 0000000..5170810
---- /dev/null
-+++ b/make/scripts/make.jogl.all.linux-armv7hf.sh
+Index: jogl-v2.0-rc12/make/scripts/make.jogl.all.linux-armv7hf.sh
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ jogl-v2.0-rc12/make/scripts/make.jogl.all.linux-armv7hf.sh	2013-07-01 14:29:17.000000000 +0200
 @@ -0,0 +1,27 @@
 +#! /bin/sh
 +
@@ -248,11 +247,10 @@
 +    -Djunit.run.arg0="-Dnewt.test.Screen.disableScreenMode" \
 +    $* 2>&1 | tee make.jogl.all.linux-armv7hf.log
 +
-diff --git a/make/scripts/tests-armv7_armhf.sh b/make/scripts/tests-armv7_armhf.sh
-new file mode 100644
-index 0000000..5526e81
---- /dev/null
-+++ b/make/scripts/tests-armv7_armhf.sh
+Index: jogl-v2.0-rc12/make/scripts/tests-armv7_armhf.sh
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ jogl-v2.0-rc12/make/scripts/tests-armv7_armhf.sh	2013-07-01 14:29:17.000000000 +0200
 @@ -0,0 +1,7 @@
 +#! /bin/bash
 +
@@ -261,11 +259,10 @@
 +. $spath/tests.sh  `which java` -DummyArg ../build-linux-armv7hf $*
 +
 +
-diff --git a/make/scripts/tests-linux-armv7hf.sh b/make/scripts/tests-linux-armv7hf.sh
-new file mode 100644
-index 0000000..5526e81
---- /dev/null
-+++ b/make/scripts/tests-linux-armv7hf.sh
+Index: jogl-v2.0-rc12/make/scripts/tests-linux-armv7hf.sh
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ jogl-v2.0-rc12/make/scripts/tests-linux-armv7hf.sh	2013-07-01 14:29:17.000000000 +0200
 @@ -0,0 +1,7 @@
 +#! /bin/bash
 +

Modified: trunk/libjogl2-java/debian/patches/disable_android_2.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/disable_android_2.diff	2013-07-01 16:29:01 UTC (rev 16953)
+++ trunk/libjogl2-java/debian/patches/disable_android_2.diff	2013-07-01 16:32:36 UTC (rev 16954)
@@ -1,7 +1,7 @@
-Index: libjogl2-java-2.0-rc3/make/build-common.xml
+Index: jogl-v2.0-rc12/make/build-common.xml
 ===================================================================
---- libjogl2-java-2.0-rc3.orig/make/build-common.xml	2011-10-08 11:32:04.000000000 +0200
-+++ libjogl2-java-2.0-rc3/make/build-common.xml	2011-10-08 11:32:28.000000000 +0200
+--- jogl-v2.0-rc12.orig/make/build-common.xml	2013-07-01 14:28:38.000000000 +0200
++++ jogl-v2.0-rc12/make/build-common.xml	2013-07-01 14:28:38.000000000 +0200
 @@ -16,7 +16,7 @@
      <property name="gluegen.root" value="/usr/share/gluegen2/" />
      <import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
@@ -10,4 +10,4 @@
 +<!--    <import file="${gluegen.root}/make/jogamp-androidtasks.xml" />-->
      <import file="${gluegen.root}/make/jogamp-env.xml" />
  
-     <property name="ant-contrib.jar"  value="/usr/share/java/ant-contrib.jar" />
+     <!-- Add JOAL (optional) -->

Modified: trunk/libjogl2-java/debian/patches/disable_git_call.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/disable_git_call.diff	2013-07-01 16:29:01 UTC (rev 16953)
+++ trunk/libjogl2-java/debian/patches/disable_git_call.diff	2013-07-01 16:32:36 UTC (rev 16954)
@@ -1,8 +1,8 @@
-Index: libjogl2-java-2.0-rc3/make/build-common.xml
+Index: jogl-v2.0-rc12/make/build-common.xml
 ===================================================================
---- libjogl2-java-2.0-rc3.orig/make/build-common.xml	2011-10-08 11:34:17.000000000 +0200
-+++ libjogl2-java-2.0-rc3/make/build-common.xml	2011-10-08 11:47:45.000000000 +0200
-@@ -70,19 +70,7 @@
+--- jogl-v2.0-rc12.orig/make/build-common.xml	2013-07-01 14:28:35.000000000 +0200
++++ jogl-v2.0-rc12/make/build-common.xml	2013-07-01 14:28:35.000000000 +0200
+@@ -67,19 +67,7 @@
          <property name="jogl.build.number" value="manual"/>
          <property name="jogl.build.id"     value="${version.timestamp}"/>
          <mkdir dir="${tempdir}" />
@@ -21,4 +21,4 @@
 -        </exec>
          <property name="jogl.build.commit" value="manual"/> <!-- fallback -->
  
-         <property name="nativewindow.version" value="${nativewindow_base_version}-b${jogl.build.number}-${version.timestamp}" />
+         <property name="jogl.version"         value="${jogamp.version.base}-b${jogl.build.number}-${version.timestamp}" />

Modified: trunk/libjogl2-java/debian/patches/manifest.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/manifest.diff	2013-07-01 16:29:01 UTC (rev 16953)
+++ trunk/libjogl2-java/debian/patches/manifest.diff	2013-07-01 16:32:36 UTC (rev 16954)
@@ -1,9 +1,9 @@
-Index: libjogl2-java-2.0-rc8/make/joglversion
+Index: libjogl2-java-2.0-rc12/make/joglversion
 ===================================================================
---- libjogl2-java-2.0-rc8.orig/make/joglversion	2012-05-02 03:28:29.000000000 +0200
-+++ libjogl2-java-2.0-rc8/make/joglversion	2012-05-23 17:49:42.000000000 +0200
-@@ -6,8 +6,9 @@
- Implementation-Version: @VERSION@
+--- libjogl2-java-2.0-rc12.orig/make/joglversion	2013-06-25 16:35:52.000000000 +0200
++++ libjogl2-java-2.0-rc12/make/joglversion	2013-07-01 18:14:24.000000000 +0200
+@@ -7,10 +7,12 @@
+ Implementation-Build: @BUILD_VERSION@
  Implementation-Branch: @SCM_BRANCH@
  Implementation-Commit: @SCM_COMMIT@
 -Implementation-Vendor: JogAmp Community
@@ -12,4 +12,7 @@
  Extension-Name: javax.media.opengl
  Implementation-Vendor-Id: com.jogamp
  Trusted-Library: true
+ Permissions: all-permissions
 +Class-Path: /usr/share/java/gluegen2-rt.jar
+ @JAR_CODEBASE_TAG@
++

Modified: trunk/libjogl2-java/debian/patches/s390x.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/s390x.diff	2013-07-01 16:29:01 UTC (rev 16953)
+++ trunk/libjogl2-java/debian/patches/s390x.diff	2013-07-01 16:32:36 UTC (rev 16954)
@@ -1,8 +1,8 @@
-Index: jogl-v2.0-rc11/make/build-jogl.xml
+Index: jogl-v2.0-rc12/make/build-jogl.xml
 ===================================================================
---- jogl-v2.0-rc11.orig/make/build-jogl.xml	2012-11-08 16:44:29.000000000 +0100
-+++ jogl-v2.0-rc11/make/build-jogl.xml	2012-11-08 16:46:41.000000000 +0100
-@@ -1280,6 +1280,12 @@
+--- jogl-v2.0-rc12.orig/make/build-jogl.xml	2013-07-01 14:29:14.000000000 +0200
++++ jogl-v2.0-rc12/make/build-jogl.xml	2013-07-01 14:29:14.000000000 +0200
+@@ -1287,6 +1287,12 @@
        <property name="compiler.cfg.id"                     value="compiler.cfg.linux" />
        <property name="linker.cfg.id.os"                    value="linker.cfg.linux.jogl.x11" />
      </target>
@@ -15,7 +15,7 @@
  
      <target name="c.configure.linux.sparc" if="isLinuxSparc">
        <echo message="Linux.SPARC" />
-@@ -1287,7 +1293,7 @@
+@@ -1294,7 +1300,7 @@
        <property name="linker.cfg.id.os"                    value="linker.cfg.linux.jogl.x11" />
      </target>
  
@@ -24,11 +24,11 @@
  
      <target name="c.configure.android" if="isAndroid">
        <echo message="Android" />
-Index: jogl-v2.0-rc11/make/build-nativewindow.xml
+Index: jogl-v2.0-rc12/make/build-nativewindow.xml
 ===================================================================
---- jogl-v2.0-rc11.orig/make/build-nativewindow.xml	2012-11-08 16:45:12.000000000 +0100
-+++ jogl-v2.0-rc11/make/build-nativewindow.xml	2012-11-08 16:48:45.000000000 +0100
-@@ -529,13 +529,19 @@
+--- jogl-v2.0-rc12.orig/make/build-nativewindow.xml	2013-07-01 14:29:14.000000000 +0200
++++ jogl-v2.0-rc12/make/build-nativewindow.xml	2013-07-01 14:29:14.000000000 +0200
+@@ -525,13 +525,19 @@
        <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
      </target>
  
@@ -49,11 +49,11 @@
  
      <target name="c.configure.android" if="isAndroid">
        <echo message="Android" />
-Index: jogl-v2.0-rc11/make/build-newt.xml
+Index: jogl-v2.0-rc12/make/build-newt.xml
 ===================================================================
---- jogl-v2.0-rc11.orig/make/build-newt.xml	2012-11-08 16:43:44.000000000 +0100
-+++ jogl-v2.0-rc11/make/build-newt.xml	2012-11-08 16:49:14.000000000 +0100
-@@ -470,6 +470,16 @@
+--- jogl-v2.0-rc12.orig/make/build-newt.xml	2013-07-01 14:29:14.000000000 +0200
++++ jogl-v2.0-rc12/make/build-newt.xml	2013-07-01 14:29:14.000000000 +0200
+@@ -472,6 +472,16 @@
        <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
      </target>
  
@@ -70,7 +70,7 @@
      <target name="c.configure.linux.sparc" if="isLinuxSparc">
        <echo message="Linux.sparc" />
        <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
-@@ -486,7 +496,7 @@
+@@ -488,7 +498,7 @@
        <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.newt.x11" />
      </target>
  

Modified: trunk/libjogl2-java/debian/patches/swt.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/swt.diff	2013-07-01 16:29:01 UTC (rev 16953)
+++ trunk/libjogl2-java/debian/patches/swt.diff	2013-07-01 16:32:36 UTC (rev 16954)
@@ -1,8 +1,8 @@
-Index: jogl-v2.0-rc11/make/build-common.xml
+Index: jogl-v2.0-rc12/make/build-common.xml
 ===================================================================
---- jogl-v2.0-rc11.orig/make/build-common.xml	2012-11-08 16:41:46.000000000 +0100
-+++ jogl-v2.0-rc11/make/build-common.xml	2012-11-08 16:43:26.000000000 +0100
-@@ -133,15 +133,9 @@
+--- jogl-v2.0-rc12.orig/make/build-common.xml	2013-07-01 14:28:32.000000000 +0200
++++ jogl-v2.0-rc12/make/build-common.xml	2013-07-01 14:28:32.000000000 +0200
+@@ -127,15 +127,9 @@
          <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-freebsd-x86_64/swt.jar">
            <istrue value="${isFreeBSDAMD64}" />
          </condition>

Modified: trunk/libjogl2-java/debian/patches/variousFixes.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/variousFixes.diff	2013-07-01 16:29:01 UTC (rev 16953)
+++ trunk/libjogl2-java/debian/patches/variousFixes.diff	2013-07-01 16:32:36 UTC (rev 16954)
@@ -1,8 +1,8 @@
-Index: jogl-v2.0-rc11/make/build-common.xml
+Index: jogl-v2.0-rc12/make/build-common.xml
 ===================================================================
---- jogl-v2.0-rc11.orig/make/build-common.xml	2012-10-31 21:58:36.000000000 +0100
-+++ jogl-v2.0-rc11/make/build-common.xml	2012-11-08 16:41:46.000000000 +0100
-@@ -13,13 +13,13 @@
+--- jogl-v2.0-rc12.orig/make/build-common.xml	2013-07-01 14:27:33.000000000 +0200
++++ jogl-v2.0-rc12/make/build-common.xml	2013-07-01 14:28:22.000000000 +0200
+@@ -13,7 +13,7 @@
      </fail>
  
      <!-- Pull in GlueGen cpptasks build file -->
@@ -11,14 +11,16 @@
      <import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
      <import file="${gluegen.root}/make/jogamp-archivetasks.xml" />
      <import file="${gluegen.root}/make/jogamp-androidtasks.xml" />
-     <import file="${gluegen.root}/make/jogamp-env.xml" />
+@@ -22,7 +22,7 @@
+     <!-- Add JOAL (optional) -->
+     <property name="joal.root" value="../../joal" />
  
 -    <property name="ant-contrib.jar"  value="${gluegen.root}/make/lib/ant-contrib-1.0b3.jar" />
 +    <property name="ant-contrib.jar"  value="/usr/share/java/ant-contrib.jar" />
  
      <condition property="rootrel.build" value="build">
        <not>
-@@ -207,7 +207,7 @@
+@@ -201,7 +201,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"/>
@@ -27,7 +29,7 @@
          <property name="ant.jar"                    value="${ant.home}/lib/ant.jar" />
          <property name="ant-junit.jar"              value="${ant.home}/lib/ant-junit.jar" />
  
-@@ -413,7 +413,7 @@
+@@ -404,7 +404,7 @@
          </path>
  
          <!-- JavaSE combinations -->
@@ -36,7 +38,7 @@
          <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"/>
-@@ -568,7 +568,10 @@
+@@ -574,7 +574,10 @@
  
          <!-- Run the GlueGen build to ensure that the GlueGen ANT task
             - has been built. -->
@@ -48,11 +50,11 @@
      </target>
  
  
-Index: jogl-v2.0-rc11/make/build.xml
+Index: jogl-v2.0-rc12/make/build.xml
 ===================================================================
---- jogl-v2.0-rc11.orig/make/build.xml	2012-10-31 21:58:36.000000000 +0100
-+++ jogl-v2.0-rc11/make/build.xml	2012-11-08 16:41:46.000000000 +0100
-@@ -276,7 +276,7 @@
+--- jogl-v2.0-rc12.orig/make/build.xml	2013-07-01 14:27:33.000000000 +0200
++++ jogl-v2.0-rc12/make/build.xml	2013-07-01 14:27:33.000000000 +0200
+@@ -291,7 +291,7 @@
      </target>
  
      <target name="tag.build" depends="init">

Modified: trunk/libjogl2-java/debian/rules
===================================================================
--- trunk/libjogl2-java/debian/rules	2013-07-01 16:29:01 UTC (rev 16953)
+++ trunk/libjogl2-java/debian/rules	2013-07-01 16:32:36 UTC (rev 16954)
@@ -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 -verbose
+DEB_ANT_ARGS         := -Dsetup.noCDC=true -verbose -Dcommon.gluegen.build.done=true
 DEB_ANT_CLEAN_TARGET := clean
 DEB_ANT_BUILD_TARGET := all
 DEB_ANT_BUILDFILE    := make/build.xml




More information about the pkg-java-commits mailing list