[pkg-java] r15593 - in trunk/gluegen2/debian: . patches
Sylvestre Ledru
sylvestre at alioth.debian.org
Mon Dec 26 00:49:35 UTC 2011
Author: sylvestre
Date: 2011-12-26 00:49:35 +0000 (Mon, 26 Dec 2011)
New Revision: 15593
Added:
trunk/gluegen2/debian/watch
Modified:
trunk/gluegen2/debian/changelog
trunk/gluegen2/debian/orig-tar.sh
trunk/gluegen2/debian/patches/disable-test-zip-archive.diff
trunk/gluegen2/debian/patches/hideException.diff
trunk/gluegen2/debian/patches/renamedLibrary.diff
Log:
gluegen2 (2.0-rc5-1~exp1) experimental; urgency=low
* New upstream release
* watch now possible and integrated
Modified: trunk/gluegen2/debian/changelog
===================================================================
--- trunk/gluegen2/debian/changelog 2011-12-25 23:29:31 UTC (rev 15592)
+++ trunk/gluegen2/debian/changelog 2011-12-26 00:49:35 UTC (rev 15593)
@@ -1,3 +1,10 @@
+gluegen2 (2.0-rc5-1~exp1) experimental; urgency=low
+
+ * New upstream release
+ * watch now possible and integrated
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Mon, 26 Dec 2011 01:18:19 +0100
+
gluegen2 (2.0-rc3-6) unstable; urgency=low
* Fix an issue under Arm and an other one for sparc which were causing issues
Modified: trunk/gluegen2/debian/orig-tar.sh
===================================================================
--- trunk/gluegen2/debian/orig-tar.sh 2011-12-25 23:29:31 UTC (rev 15592)
+++ trunk/gluegen2/debian/orig-tar.sh 2011-12-26 00:49:35 UTC (rev 15593)
@@ -1,18 +1,17 @@
#!/bin/sh -e
-VERSION="2.0-rc3"
-DIR=gluegen-$VERSION
-TAR=gluegen2_$VERSION.orig.tar.gz
+VERSION=$2
+DIR=gluegen-v$VERSION
+TAR=gluegen2_$VERSION.orig.tar.bz2
# clean up the upstream tarball
-
-git clone git://jogamp.org/srv/scm/gluegen.git $DIR
-cd $DIR
-git checkout $VERSION
-rm -rf .git .gitignore .htaccess make/lib/
+p7zip -d $3
+tar xvf gluegen-v$VERSION.tar
+cd $DIR*
+rm -rf .gitignore .htaccess make/lib/
cd ..
-tar zcvf $TAR $DIR
-rm -rf $DIR
+tar jcvf ../$TAR $DIR
+rm -rf $DIR gluegen-v$VERSION.tar
# move to directory 'tarballs'
if [ -r .svn/deb-layout ]; then
Modified: trunk/gluegen2/debian/patches/disable-test-zip-archive.diff
===================================================================
--- trunk/gluegen2/debian/patches/disable-test-zip-archive.diff 2011-12-25 23:29:31 UTC (rev 15592)
+++ trunk/gluegen2/debian/patches/disable-test-zip-archive.diff 2011-12-26 00:49:35 UTC (rev 15593)
@@ -1,13 +1,13 @@
-Index: gluegen2-2.0-rc3/make/build-test.xml
+Index: gluegen-v2.0-rc5/make/build-test.xml
===================================================================
---- gluegen2-2.0-rc3.orig/make/build-test.xml 2011-10-06 14:44:54.000000000 +0200
-+++ gluegen2-2.0-rc3/make/build-test.xml 2011-10-06 14:45:05.000000000 +0200
-@@ -377,7 +377,7 @@
- </target>
+--- gluegen-v2.0-rc5.orig/make/build-test.xml 2011-12-18 23:11:17.000000000 +0100
++++ gluegen-v2.0-rc5/make/build-test.xml 2011-12-26 01:26:55.194009328 +0100
+@@ -399,7 +399,7 @@
+ <target name="junit.run.tests" depends="junit.run.local, junit.run.remote.ssh, junit.run.remote.adb"/>
- <target name="junit.run" depends="init,gluegen.cpptasks.detect.os,junit.run.settings,junit.run.local,junit.run.remote.ssh,junit.run.remote.adb">
+ <target name="junit.run" depends="init, gluegen.cpptasks.detect.os, junit.run.settings, junit.run.d32, junit.run.tests">
- <antcall target="test-zip-archive" inheritRefs="true" />
-+<!-- <antcall target="test-zip-archive" inheritRefs="true" /> -->
++<!-- <antcall target="test-zip-archive" inheritRefs="true" />-->
</target>
<!--
Modified: trunk/gluegen2/debian/patches/hideException.diff
===================================================================
--- trunk/gluegen2/debian/patches/hideException.diff 2011-12-25 23:29:31 UTC (rev 15592)
+++ trunk/gluegen2/debian/patches/hideException.diff 2011-12-26 00:49:35 UTC (rev 15593)
@@ -1,37 +1,35 @@
-Index: gluegen2-2.0-rc3/src/java/com/jogamp/common/os/Platform.java
+Index: gluegen-v2.0-rc5/src/java/com/jogamp/common/os/Platform.java
===================================================================
---- gluegen2-2.0-rc3.orig/src/java/com/jogamp/common/os/Platform.java 2011-11-20 17:44:15.396627341 +0100
-+++ gluegen2-2.0-rc3/src/java/com/jogamp/common/os/Platform.java 2011-11-20 17:51:18.500617899 +0100
-@@ -298,19 +298,19 @@
-
+--- gluegen-v2.0-rc5.orig/src/java/com/jogamp/common/os/Platform.java 2011-12-18 23:11:17.000000000 +0100
++++ gluegen-v2.0-rc5/src/java/com/jogamp/common/os/Platform.java 2011-12-26 01:28:23.362011756 +0100
+@@ -302,18 +302,18 @@
+ private static void loadGlueGenRTImpl() {
AccessController.doPrivileged(new PrivilegedAction<Object>() {
public Object run() {
-- if(USE_TEMP_JAR_CACHE && TempJarCache.initSingleton()) {
-- final String nativeJarName = "gluegen2-rt-natives-"+os_and_arch+".jar";
+- 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.getJarURLDirname(
-- JarUtil.getJarURL(Platform.class.getName(), cl) );
-- final URL nativeJarURL = JarUtil.getJarURL(jarUrlRoot, nativeJarName);
-- final JarFile nativeJar = JarUtil.getJarFile(nativeJarURL, cl);
-- TempJarCache.bootstrapNativeLib(Platform.class, libBaseName, nativeJar);
+- final URL jarUrlRoot = JarUtil.getURLDirname(
+- JarUtil.getJarSubURL(Platform.class.getName(), cl) );
+- final URL nativeJarURL = JarUtil.getJarFileURL(jarUrlRoot, nativeJarName);
+- TempJarCache.bootstrapNativeLib(Platform.class, libBaseName, nativeJarURL, cl);
- } catch (IOException ioe) {
- ioe.printStackTrace();
- }
-- }
-+// if(USE_TEMP_JAR_CACHE && TempJarCache.initSingleton()) {
-+// final String nativeJarName = "gluegen2-rt-natives-"+os_and_arch+".jar";
-+// final ClassLoader cl = Platform.class.getClassLoader();
-+// try {
-+// final URL jarUrlRoot = JarUtil.getJarURLDirname(
-+// JarUtil.getJarURL(Platform.class.getName(), cl) );
-+// final URL nativeJarURL = JarUtil.getJarURL(jarUrlRoot, nativeJarName);
-+// final JarFile nativeJar = JarUtil.getJarFile(nativeJarURL, cl);
-+// TempJarCache.bootstrapNativeLib(Platform.class, libBaseName, nativeJar);
-+// } catch (IOException ioe) {
-+// // ioe.printStackTrace();
-+// }
-+// }
- DynamicLibraryBundle.GlueJNILibLoader.loadLibrary(libBaseName, false);
- return null;
+- }
++ // 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) );
++ // final URL nativeJarURL = JarUtil.getJarFileURL(jarUrlRoot, nativeJarName);
++ // TempJarCache.bootstrapNativeLib(Platform.class, libBaseName, nativeJarURL, cl);
++ // } catch (IOException ioe) {
++ // ioe.printStackTrace();
++ // }
++ // }
+ DynamicLibraryBundle.GlueJNILibLoader.loadLibrary(libBaseName, false);
+ return null;
}
Modified: trunk/gluegen2/debian/patches/renamedLibrary.diff
===================================================================
--- trunk/gluegen2/debian/patches/renamedLibrary.diff 2011-12-25 23:29:31 UTC (rev 15592)
+++ trunk/gluegen2/debian/patches/renamedLibrary.diff 2011-12-26 00:49:35 UTC (rev 15593)
@@ -1,27 +1,8 @@
-Index: gluegen2-2.0-rc3/src/java/com/jogamp/common/os/Platform.java
+Index: gluegen-v2.0-rc5/src/junit/com/jogamp/common/util/TestTempJarCache.java
===================================================================
---- gluegen2-2.0-rc3.orig/src/java/com/jogamp/common/os/Platform.java 2011-10-06 13:34:29.000000000 +0200
-+++ gluegen2-2.0-rc3/src/java/com/jogamp/common/os/Platform.java 2011-10-06 13:34:43.000000000 +0200
-@@ -294,12 +294,12 @@
- }
-
- private static void loadGlueGenRTImpl() {
-- final String libBaseName = "gluegen-rt";
-+ final String libBaseName = "gluegen2-rt";
-
- AccessController.doPrivileged(new PrivilegedAction<Object>() {
- public Object run() {
- if(USE_TEMP_JAR_CACHE && TempJarCache.initSingleton()) {
-- final String nativeJarName = "gluegen-rt-natives-"+os_and_arch+".jar";
-+ final String nativeJarName = "gluegen2-rt-natives-"+os_and_arch+".jar";
- final ClassLoader cl = Platform.class.getClassLoader();
- try {
- final URL jarUrlRoot = JarUtil.getJarURLDirname(
-Index: gluegen2-2.0-rc3/src/junit/com/jogamp/common/util/TestTempJarCache.java
-===================================================================
---- gluegen2-2.0-rc3.orig/src/junit/com/jogamp/common/util/TestTempJarCache.java 2011-10-06 13:32:58.000000000 +0200
-+++ gluegen2-2.0-rc3/src/junit/com/jogamp/common/util/TestTempJarCache.java 2011-10-06 13:34:11.000000000 +0200
-@@ -181,8 +181,8 @@
+--- gluegen-v2.0-rc5.orig/src/junit/com/jogamp/common/util/TestTempJarCache.java 2011-12-26 01:24:24.000000000 +0100
++++ gluegen-v2.0-rc5/src/junit/com/jogamp/common/util/TestTempJarCache.java 2011-12-26 01:25:19.782006701 +0100
+@@ -183,8 +183,8 @@
@Test
public void testTempJarCache02AddNativeLibs() throws IOException {
@@ -31,8 +12,8 @@
+ final String libBaseName = "gluegen2-rt";
final ClassLoader cl = getClass().getClassLoader();
- URL jarUrlRoot = JarUtil.getJarURL(TempJarCache.class.getName(), cl);
-@@ -201,7 +201,7 @@
+ URL jarUrlRoot = JarUtil.getJarSubURL(TempJarCache.class.getName(), cl);
+@@ -202,7 +202,7 @@
@Test
public void testTempJarCache03AddNativeJarLibs() throws IOException {
Added: trunk/gluegen2/debian/watch
===================================================================
--- trunk/gluegen2/debian/watch (rev 0)
+++ trunk/gluegen2/debian/watch 2011-12-26 00:49:35 UTC (rev 15593)
@@ -0,0 +1,4 @@
+version=3
+http://jogamp.org/deployment/jogamp-current/archive/Sources/ gluegen-v(.*).tar.7z \
+debian debian/orig-tar.sh
+
More information about the pkg-java-commits
mailing list