[pkg-java] r16224 - in trunk/gluegen2/debian: . patches
Sylvestre Ledru
sylvestre at alioth.debian.org
Mon Jul 2 01:20:16 UTC 2012
Author: sylvestre
Date: 2012-07-02 01:20:16 +0000 (Mon, 02 Jul 2012)
New Revision: 16224
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
trunk/gluegen2/debian/patches/series
Log:
New upstream release
Modified: trunk/gluegen2/debian/changelog
===================================================================
--- trunk/gluegen2/debian/changelog 2012-07-02 00:43:13 UTC (rev 16223)
+++ trunk/gluegen2/debian/changelog 2012-07-02 01:20:16 UTC (rev 16224)
@@ -1,3 +1,9 @@
+gluegen2 (2.0-rc9-1~exp1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Mon, 02 Jul 2012 02:44:59 +0200
+
gluegen2 (2.0-rc8-2) unstable; urgency=low
* Upload in unstable
Modified: trunk/gluegen2/debian/patches/disableArchive7z.diff
===================================================================
--- trunk/gluegen2/debian/patches/disableArchive7z.diff 2012-07-02 00:43:13 UTC (rev 16223)
+++ trunk/gluegen2/debian/patches/disableArchive7z.diff 2012-07-02 01:20:16 UTC (rev 16224)
@@ -1,8 +1,8 @@
-Index: gluegen-v2.0-rc8/make/build.xml
+Index: gluegen-v2.0-rc9/make/build.xml
===================================================================
---- gluegen-v2.0-rc8.orig/make/build.xml 2012-04-25 13:09:30.000000000 +0200
-+++ gluegen-v2.0-rc8/make/build.xml 2012-05-15 14:30:48.000000000 +0200
-@@ -870,9 +870,9 @@
+--- gluegen-v2.0-rc9.orig/make/build.xml 2012-06-20 03:09:50.000000000 +0200
++++ gluegen-v2.0-rc9/make/build.xml 2012-07-02 02:53:25.966571707 +0200
+@@ -933,9 +933,9 @@
<classpath path="${classes}"/>
<link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" />
</javadoc>
Modified: trunk/gluegen2/debian/patches/disable_git_call.diff
===================================================================
--- trunk/gluegen2/debian/patches/disable_git_call.diff 2012-07-02 00:43:13 UTC (rev 16223)
+++ trunk/gluegen2/debian/patches/disable_git_call.diff 2012-07-02 01:20:16 UTC (rev 16224)
@@ -1,8 +1,8 @@
-Index: gluegen-v2.0-rc8/make/build.xml
+Index: gluegen-v2.0-rc9/make/build.xml
===================================================================
---- gluegen-v2.0-rc8.orig/make/build.xml 2012-05-15 14:29:21.000000000 +0200
-+++ gluegen-v2.0-rc8/make/build.xml 2012-05-15 14:29:23.000000000 +0200
-@@ -55,14 +55,6 @@
+--- gluegen-v2.0-rc9.orig/make/build.xml 2012-07-02 02:53:25.966571707 +0200
++++ gluegen-v2.0-rc9/make/build.xml 2012-07-02 02:53:31.606571580 +0200
+@@ -70,14 +70,6 @@
<property name="gluegen.build.number" value="manual"/>
<property name="gluegen.build.id" value="${version.timestamp}"/>
<mkdir dir="${build}" />
Modified: trunk/gluegen2/debian/patches/hideException.diff
===================================================================
--- trunk/gluegen2/debian/patches/hideException.diff 2012-07-02 00:43:13 UTC (rev 16223)
+++ trunk/gluegen2/debian/patches/hideException.diff 2012-07-02 01:20:16 UTC (rev 16224)
@@ -1,14 +1,13 @@
-Index: gluegen-v2.0-rc8/src/java/com/jogamp/common/os/Platform.java
+Index: gluegen-v2.0-rc9/src/java/com/jogamp/common/os/Platform.java
===================================================================
---- gluegen-v2.0-rc8.orig/src/java/com/jogamp/common/os/Platform.java 2012-05-15 14:25:06.000000000 +0200
-+++ gluegen-v2.0-rc8/src/java/com/jogamp/common/os/Platform.java 2012-05-15 14:30:32.000000000 +0200
-@@ -378,19 +378,19 @@
- private static void loadGlueGenRTImpl() {
+--- gluegen-v2.0-rc9.orig/src/java/com/jogamp/common/os/Platform.java 2012-07-02 02:53:15.000000000 +0200
++++ gluegen-v2.0-rc9/src/java/com/jogamp/common/os/Platform.java 2012-07-02 02:54:34.534570176 +0200
+@@ -225,18 +225,18 @@
AccessController.doPrivileged(new PrivilegedAction<Object>() {
public Object run() {
+ final ClassLoader cl = Platform.class.getClassLoader();
- if(USE_TEMP_JAR_CACHE && TempJarCache.initSingleton()) {
- final String nativeJarName = libBaseName+"-natives-"+os_and_arch+".jar";
-- final ClassLoader cl = Platform.class.getClassLoader();
- try {
- final URL jarUrlRoot = JarUtil.getURLDirname(
- JarUtil.getJarSubURL(Platform.class.getName(), cl) );
@@ -21,7 +20,6 @@
- }
+ // if(USE_TEMP_JAR_CACHE && TempJarCache.initSingleton()) {
+ // final String nativeJarName = libBaseName+"-natives-"+os_and_arch+".jar";
-+ // final ClassLoader cl = Platform.class.getClassLoader();
+ // try {
+ // final URL jarUrlRoot = JarUtil.getURLDirname(
+ // JarUtil.getJarSubURL(Platform.class.getName(), cl) );
@@ -32,6 +30,6 @@
+ // System.err.println("Catched: "+e0.getMessage());
+ // }
+ // }
- DynamicLibraryBundle.GlueJNILibLoader.loadLibrary(libBaseName, false);
+ DynamicLibraryBundle.GlueJNILibLoader.loadLibrary(libBaseName, false, cl);
return null;
}
Modified: trunk/gluegen2/debian/patches/jarPath.diff
===================================================================
--- trunk/gluegen2/debian/patches/jarPath.diff 2012-07-02 00:43:13 UTC (rev 16223)
+++ trunk/gluegen2/debian/patches/jarPath.diff 2012-07-02 01:20:16 UTC (rev 16224)
@@ -1,7 +1,7 @@
-Index: gluegen-v2.0-rc8/make/gluegen-properties.xml
+Index: gluegen-v2.0-rc9/make/gluegen-properties.xml
===================================================================
---- gluegen-v2.0-rc8.orig/make/gluegen-properties.xml 2012-04-25 13:09:30.000000000 +0200
-+++ gluegen-v2.0-rc8/make/gluegen-properties.xml 2012-05-15 14:24:24.000000000 +0200
+--- gluegen-v2.0-rc9.orig/make/gluegen-properties.xml 2012-06-20 03:09:50.000000000 +0200
++++ gluegen-v2.0-rc9/make/gluegen-properties.xml 2012-07-02 02:47:03.304555233 +0200
@@ -39,10 +39,10 @@
<property name="gluegen.user.properties.file.set" value="${gluegen.user.properties.file}"/>
<property file="${gluegen.user.properties.file.set}" />
@@ -16,4 +16,4 @@
+ <property name="ant-junit.jar" value="/usr/share/ant/lib/ant-junit.jar" />
<property name="android.version" value="9" /> <!-- default - if not set by jogamp-env.xml:jogamp.env.init -->
- <!--property name="android.jar" value="${gluegen.root}/make/lib/android-sdk/${android.version}/android.jar" /-->
+ <property name="android-min.jar" value="${gluegen.root}/make/lib/android-sdk/${android.version}/android.jar" />
Modified: trunk/gluegen2/debian/patches/renamedLibrary.diff
===================================================================
--- trunk/gluegen2/debian/patches/renamedLibrary.diff 2012-07-02 00:43:13 UTC (rev 16223)
+++ trunk/gluegen2/debian/patches/renamedLibrary.diff 2012-07-02 01:20:16 UTC (rev 16224)
@@ -1,7 +1,7 @@
-Index: gluegen-v2.0-rc8/src/junit/com/jogamp/common/util/TestTempJarCache.java
+Index: gluegen-v2.0-rc9/src/junit/com/jogamp/common/util/TestTempJarCache.java
===================================================================
---- gluegen-v2.0-rc8.orig/src/junit/com/jogamp/common/util/TestTempJarCache.java 2012-04-25 13:09:30.000000000 +0200
-+++ gluegen-v2.0-rc8/src/junit/com/jogamp/common/util/TestTempJarCache.java 2012-05-15 14:25:33.000000000 +0200
+--- gluegen-v2.0-rc9.orig/src/junit/com/jogamp/common/util/TestTempJarCache.java 2012-06-20 03:09:50.000000000 +0200
++++ gluegen-v2.0-rc9/src/junit/com/jogamp/common/util/TestTempJarCache.java 2012-07-02 02:52:48.122572551 +0200
@@ -192,8 +192,8 @@
@Test
public void testTempJarCache02AddNativeLibs() throws IOException {
@@ -22,16 +22,34 @@
JNILibLoaderBase.addNativeJarLibs(TempJarCache.class, libBaseName);
Assert.assertTrue(JNILibLoaderBase.isLoaded(libBaseName));
-Index: gluegen-v2.0-rc8/src/java/com/jogamp/common/os/Platform.java
+Index: gluegen-v2.0-rc9/src/java/com/jogamp/common/os/Platform.java
===================================================================
---- gluegen-v2.0-rc8.orig/src/java/com/jogamp/common/os/Platform.java 2012-04-25 13:09:30.000000000 +0200
-+++ gluegen-v2.0-rc8/src/java/com/jogamp/common/os/Platform.java 2012-05-15 14:30:43.000000000 +0200
-@@ -53,7 +53,7 @@
- public class Platform {
-
+--- gluegen-v2.0-rc9.orig/src/java/com/jogamp/common/os/Platform.java 2012-06-20 03:09:50.000000000 +0200
++++ gluegen-v2.0-rc9/src/java/com/jogamp/common/os/Platform.java 2012-07-02 02:53:15.982571929 +0200
+@@ -139,7 +139,7 @@
+ private static final String useTempJarCachePropName = "jogamp.gluegen.UseTempJarCache";
+
/** fixed basename of JAR file and native library */
-- private static final String libBaseName = "gluegen-rt";
-+ private static final String libBaseName = "gluegen2-rt";
+- private static final String libBaseName = "gluegen-rt";
++ private static final String libBaseName = "gluegen2-rt";
+
+ //
+ // static initialization order:
+@@ -170,7 +170,7 @@
+
+ loadGlueGenRTImpl();
+
+- JVMUtil.initSingleton(); // requires gluegen-rt, one-time init.
++ JVMUtil.initSingleton(); // requires gluegen2-rt, one-time init.
+
+ MachineDescription md = MachineDescriptionRuntime.getRuntime();
+ if(null == md) {
+@@ -244,7 +244,7 @@
+ }
/**
- * System property: 'jogamp.gluegen.UseTempJarCache',
+- * kick off static initialization of <i>platform property information</i> and <i>native gluegen-rt lib loading</i>
++ * kick off static initialization of <i>platform property information</i> and <i>native gluegen2-rt lib loading</i>
+ */
+ public static void initSingleton() { }
+
Modified: trunk/gluegen2/debian/patches/series
===================================================================
--- trunk/gluegen2/debian/patches/series 2012-07-02 00:43:13 UTC (rev 16223)
+++ trunk/gluegen2/debian/patches/series 2012-07-02 01:20:16 UTC (rev 16224)
@@ -13,4 +13,4 @@
#s390x.diff
#duplicatedeclaration.diff
-disable_android2.diff
+#disable_android2.diff
More information about the pkg-java-commits
mailing list