[pkg-java] r17936 - in trunk/gluegen2/debian: . patches

Sylvestre Ledru sylvestre at moszumanska.debian.org
Mon Mar 24 19:00:59 UTC 2014 

Author: sylvestre
Date: 2014-03-24 19:00:59 +0000 (Mon, 24 Mar 2014)
New Revision: 17936

Modified:
   trunk/gluegen2/debian/changelog
   trunk/gluegen2/debian/patches/disableArchive7z.diff
   trunk/gluegen2/debian/patches/disable_git_call.diff
   trunk/gluegen2/debian/patches/hideException.diff
   trunk/gluegen2/debian/patches/jarPath.diff
   trunk/gluegen2/debian/patches/renamedLibrary.diff
Log:
New upstream release

Modified: trunk/gluegen2/debian/changelog
===================================================================
--- trunk/gluegen2/debian/changelog	2014-03-24 16:55:48 UTC (rev 17935)
+++ trunk/gluegen2/debian/changelog	2014-03-24 19:00:59 UTC (rev 17936)
@@ -1,3 +1,9 @@
+gluegen2 (2.1.5-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 24 Mar 2014 14:26:05 +0100
+
 gluegen2 (2.1.4-1) unstable; urgency=medium
 
   * New upstream release

Modified: trunk/gluegen2/debian/patches/disableArchive7z.diff
===================================================================
--- trunk/gluegen2/debian/patches/disableArchive7z.diff	2014-03-24 16:55:48 UTC (rev 17935)
+++ trunk/gluegen2/debian/patches/disableArchive7z.diff	2014-03-24 19:00:59 UTC (rev 17936)
@@ -1,8 +1,8 @@
-Index: gluegen-v2.1.2/make/build.xml
+Index: gluegen-v2.1.5/make/build.xml
 ===================================================================
---- gluegen-v2.1.2.orig/make/build.xml	2013-11-08 10:25:22.000000000 +0100
-+++ gluegen-v2.1.2/make/build.xml	2013-11-08 10:25:22.000000000 +0100
-@@ -1011,9 +1011,9 @@
+--- gluegen-v2.1.5.orig/make/build.xml	2014-03-24 14:27:09.863870538 +0100
++++ gluegen-v2.1.5/make/build.xml	2014-03-24 14:27:09.863870538 +0100
+@@ -1009,9 +1009,9 @@
      <copy todir="${javadoc.gluegen.path}/resources" overwrite="true">
          <fileset dir="doc/javadoc/resources" includes="*" />
      </copy>
@@ -14,7 +14,7 @@
    </target>
  
      <!-- ================================================================== -->
-@@ -1051,9 +1051,9 @@
+@@ -1049,9 +1049,9 @@
              <fileset dir="${project.root}/jnlp-files" includes="*" />
          </copy>
          <copy todir="${archive}" file="${build}/gluegen-java-src.zip"/>

Modified: trunk/gluegen2/debian/patches/disable_git_call.diff
===================================================================
--- trunk/gluegen2/debian/patches/disable_git_call.diff	2014-03-24 16:55:48 UTC (rev 17935)
+++ trunk/gluegen2/debian/patches/disable_git_call.diff	2014-03-24 19:00:59 UTC (rev 17936)
@@ -1,7 +1,7 @@
-Index: gluegen-v2.0-rc12/make/build.xml
+Index: gluegen-v2.1.5/make/build.xml
 ===================================================================
---- gluegen-v2.0-rc12.orig/make/build.xml	2013-07-01 14:02:19.000000000 +0200
-+++ gluegen-v2.0-rc12/make/build.xml	2013-07-01 14:02:19.000000000 +0200
+--- gluegen-v2.1.5.orig/make/build.xml	2014-03-24 14:28:02.880616139 +0100
++++ gluegen-v2.1.5/make/build.xml	2014-03-24 14:29:04.545483279 +0100
 @@ -66,14 +66,6 @@
      <property name="gluegen.build.number" value="manual"/>
      <property name="gluegen.build.id"     value="${version.timestamp}"/>
@@ -12,7 +12,7 @@
 -    </exec>
 -    <exec dir="." executable="sed" logError="true" failonerror="false" failifexecutionfails="false"
 -              outputproperty="gluegen.build.branch">
--        <arg line="-e '/^[^*]/d' -e 's/* \(.*\)/\1/' ${build}/localbranch.raw"/>
+-        <arg line="-e '/^[^*]/d' -e 's/* \(.*\)/\1/' '${build}/localbranch.raw'"/>
 -    </exec>
      <property name="gluegen.build.branch" value="manual"/> <!-- fallback -->
      <exec dir="${project.root}" executable="git" logError="true" failonerror="false" failifexecutionfails="false"

Modified: trunk/gluegen2/debian/patches/hideException.diff
===================================================================
--- trunk/gluegen2/debian/patches/hideException.diff	2014-03-24 16:55:48 UTC (rev 17935)
+++ trunk/gluegen2/debian/patches/hideException.diff	2014-03-24 19:00:59 UTC (rev 17936)
@@ -1,8 +1,8 @@
-Index: gluegen-v2.1.2/src/java/com/jogamp/common/os/Platform.java
+Index: gluegen-v2.1.5/src/java/com/jogamp/common/os/Platform.java
 ===================================================================
---- gluegen-v2.1.2.orig/src/java/com/jogamp/common/os/Platform.java	2013-11-08 10:28:03.000000000 +0100
-+++ gluegen-v2.1.2/src/java/com/jogamp/common/os/Platform.java	2013-11-08 10:29:00.000000000 +0100
-@@ -191,15 +191,6 @@
+--- gluegen-v2.1.5.orig/src/java/com/jogamp/common/os/Platform.java	2014-03-24 14:29:13.501609214 +0100
++++ gluegen-v2.1.5/src/java/com/jogamp/common/os/Platform.java	2014-03-24 14:29:13.497609157 +0100
+@@ -197,15 +197,6 @@
                  _USE_TEMP_JAR_CACHE[0] = ( OS_TYPE != OSType.ANDROID ) && ( null != platformClassJarURI ) &&
                                           Debug.getBooleanProperty(useTempJarCachePropName, true, true);
  

Modified: trunk/gluegen2/debian/patches/jarPath.diff
===================================================================
--- trunk/gluegen2/debian/patches/jarPath.diff	2014-03-24 16:55:48 UTC (rev 17935)
+++ trunk/gluegen2/debian/patches/jarPath.diff	2014-03-24 19:00:59 UTC (rev 17936)
@@ -1,8 +1,8 @@
-Index: gluegen-v2.0-rc11/make/gluegen-properties.xml
+Index: gluegen-v2.1.5/make/gluegen-properties.xml
 ===================================================================
---- gluegen-v2.0-rc11.orig/make/gluegen-properties.xml	2012-10-31 19:42:42.000000000 +0100
-+++ gluegen-v2.0-rc11/make/gluegen-properties.xml	2012-11-08 16:23:52.000000000 +0100
-@@ -46,10 +46,10 @@
+--- gluegen-v2.1.5.orig/make/gluegen-properties.xml	2014-03-24 14:27:04.211791046 +0100
++++ gluegen-v2.1.5/make/gluegen-properties.xml	2014-03-24 14:27:04.211791046 +0100
+@@ -49,10 +49,10 @@
      <property name="gluegen.user.properties.file.set" value="${gluegen.user.properties.file}"/>
      <property file="${gluegen.user.properties.file.set}" />
      <echo message="Loaded ${gluegen.user.properties.file.set}." />

Modified: trunk/gluegen2/debian/patches/renamedLibrary.diff
===================================================================
--- trunk/gluegen2/debian/patches/renamedLibrary.diff	2014-03-24 16:55:48 UTC (rev 17935)
+++ trunk/gluegen2/debian/patches/renamedLibrary.diff	2014-03-24 19:00:59 UTC (rev 17936)
@@ -1,7 +1,7 @@
-Index: gluegen-v2.1.2/src/junit/com/jogamp/common/util/TestTempJarCache.java
+Index: gluegen-v2.1.5/src/junit/com/jogamp/common/util/TestTempJarCache.java
 ===================================================================
---- gluegen-v2.1.2.orig/src/junit/com/jogamp/common/util/TestTempJarCache.java	2013-11-08 10:22:57.000000000 +0100
-+++ gluegen-v2.1.2/src/junit/com/jogamp/common/util/TestTempJarCache.java	2013-11-08 10:24:35.000000000 +0100
+--- gluegen-v2.1.5.orig/src/junit/com/jogamp/common/util/TestTempJarCache.java	2014-03-24 14:27:08.039844885 +0100
++++ gluegen-v2.1.5/src/junit/com/jogamp/common/util/TestTempJarCache.java	2014-03-24 14:27:08.039844885 +0100
 @@ -197,8 +197,8 @@
      @Test
      public void testTempJarCache02AddNativeLibs() throws IOException, IllegalArgumentException, URISyntaxException {
@@ -22,11 +22,11 @@
  
          JNILibLoaderBase.addNativeJarLibs(TempJarCache.class, libBaseName);
          Assert.assertTrue(JNILibLoaderBase.isLoaded(libBaseName));
-Index: gluegen-v2.1.2/src/java/com/jogamp/common/os/Platform.java
+Index: gluegen-v2.1.5/src/java/com/jogamp/common/os/Platform.java
 ===================================================================
---- gluegen-v2.1.2.orig/src/java/com/jogamp/common/os/Platform.java	2013-11-08 10:22:57.000000000 +0100
-+++ gluegen-v2.1.2/src/java/com/jogamp/common/os/Platform.java	2013-11-08 10:25:15.000000000 +0100
-@@ -140,7 +140,7 @@
+--- gluegen-v2.1.5.orig/src/java/com/jogamp/common/os/Platform.java	2014-03-24 14:27:08.039844885 +0100
++++ gluegen-v2.1.5/src/java/com/jogamp/common/os/Platform.java	2014-03-24 14:27:08.039844885 +0100
+@@ -146,7 +146,7 @@
      private static final String useTempJarCachePropName = "jogamp.gluegen.UseTempJarCache";
  
      /** fixed basename of JAR file and native library */
@@ -35,7 +35,7 @@
  
      //
      // static initialization order:
-@@ -203,7 +203,7 @@
+@@ -209,7 +209,7 @@
                  DynamicLibraryBundle.GlueJNILibLoader.loadLibrary(libBaseName, false, cl);
  
                  // JVM bug workaround
@@ -44,7 +44,7 @@
  
                  // AWT Headless determination
                  if( !Debug.getBooleanProperty("java.awt.headless", true) &&
-@@ -246,7 +246,7 @@
+@@ -252,7 +252,7 @@
      }
  
      /**

More information about the pkg-java-commits mailing list