Author: sylvestre Date: 2011-10-06 17:13:30 +0000 (Thu, 06 Oct 2011) New Revision: 15157
Added: trunk/libjogl2-java/debian/patches/disable_android.diff Modified: trunk/libjogl2-java/debian/changelog trunk/libjogl2-java/debian/orig-tar.sh trunk/libjogl2-java/debian/patches/otherArchsoswin.diff trunk/libjogl2-java/debian/patches/series trunk/libjogl2-java/debian/patches/swt.diff trunk/libjogl2-java/debian/patches/variousFixes.diff trunk/libjogl2-java/debian/rules Log: libjogl2-java (2.0-rc3-1) unstable; urgency=low * New upstream release Modified: trunk/libjogl2-java/debian/changelog =================================================================== --- trunk/libjogl2-java/debian/changelog 2011-10-06 13:42:45 UTC (rev 15156) +++ trunk/libjogl2-java/debian/changelog 2011-10-06 17:13:30 UTC (rev 15157) @@ -1,3 +1,9 @@ +libjogl2-java (2.0-rc3-1) UNRELEASED; urgency=low + + * New upstream release + + -- Sylvestre Ledru <[email protected]> Thu, 06 Oct 2011 15:53:38 +0200 + libjogl2-java (2.0-rc2-4) unstable; urgency=low * Team upload. Modified: trunk/libjogl2-java/debian/orig-tar.sh =================================================================== --- trunk/libjogl2-java/debian/orig-tar.sh 2011-10-06 13:42:45 UTC (rev 15156) +++ trunk/libjogl2-java/debian/orig-tar.sh 2011-10-06 17:13:30 UTC (rev 15157) @@ -1,14 +1,21 @@ #!/bin/sh -e +VERSION="2.0-rc3" -# called by uscan with '--upstream-version' <version> <file> -DIR=jogl-$2 -TAR=../libjogl-java_$2.orig.tar.gz +DIR=libjogl2-java-$VERSION +TAR=libjogl2-java_$VERSION.orig.tar.gz # clean up the upstream tarball -unzip $3 -d $DIR -tar -c -z -f $TAR $DIR -rm -rf $DIR $3 +git clone git://jogamp.org/srv/scm/jogl.git $DIR +cd $DIR +git checkout $VERSION +rm $(find . -name .gitignore) +rm -rf .git .htaccess make/lib/ +cd .. +tar zcvf $TAR $DIR +rm -rf $DIR +mv $TAR ../../ + # move to directory 'tarballs' if [ -r .svn/deb-layout ]; then . .svn/deb-layout Added: trunk/libjogl2-java/debian/patches/disable_android.diff =================================================================== --- trunk/libjogl2-java/debian/patches/disable_android.diff (rev 0) +++ trunk/libjogl2-java/debian/patches/disable_android.diff 2011-10-06 17:13:30 UTC (rev 15157) @@ -0,0 +1,37 @@ +--- plpo/libjogl2-java-2.0-rc3/make/build-newt.xml 2011-10-06 15:52:37.000000000 +0200 ++++ libjogl2-java-2.0-rc3/make//build-newt.xml 2011-10-06 18:55:54.000000000 +0200 +@@ -139,7 +139,7 @@ + <isset property="setup.noOpenGL"/> + </condition> + +- <property name="java.excludes.all" value="${java.excludes.awt}, ${java.excludes.opengl}" /> ++ <property name="java.excludes.all" value="${java.excludes.awt}, ${java.excludes.opengl} jogamp/newt/driver/android/**" /> + <echo message="java.excludes.all: ${java.excludes.all}" /> + + </target> +@@ -575,7 +575,7 @@ + <javah destdir="${src.generated.c}/X11" classpath="${javah.classpath}" class="jogamp.newt.driver.x11.X11Window" /> + <javah destdir="${src.generated.c}/X11" classpath="${javah.classpath}" class="jogamp.newt.driver.x11.X11Screen" /> + <javah destdir="${src.generated.c}/X11" classpath="${javah.classpath}" class="jogamp.newt.driver.x11.X11Display" /> +- <javah destdir="${src.generated.c}/Android" classpath="${javah.classpath}:${android.jar}" class="jogamp.newt.driver.android.AndroidWindow" /> ++<!-- <javah destdir="${src.generated.c}/Android" classpath="${javah.classpath}:${android.jar}" class="jogamp.newt.driver.android.AndroidWindow" />--> + </target> + + <target name="c.build.newt.windowlib" unless="setup.nonatives"> +--- plpo/libjogl2-java-2.0-rc3/make/build-test.xml 2011-10-06 15:52:37.000000000 +0200 ++++ libjogl2-java-2.0-rc3/make//build-test.xml 2011-10-06 19:02:13.000000000 +0200 +@@ -78,12 +78,14 @@ + </target> + + <target name="test.compile" depends="test.compile.check" unless="test.compile.skip"> ++ <property name="java.excludes.all" value="jogamp/newt/driver/android/** com/jogamp/opengl/test/android/**" /> + <!-- Perform the junit pass Java compile --> + <javac destdir="${classes}" + source="${host.sourcelevel}" + fork="yes" + memoryMaximumSize="${javac.memorymax}" + includeAntRuntime="false" ++ excludes="${java.excludes.all}" + debug="${javacdebug}" debuglevel="${javacdebuglevel}"> + <classpath refid="junit_jogl_newt_android.compile.classpath"/> + <src path="${src.test}" /> Modified: trunk/libjogl2-java/debian/patches/otherArchsoswin.diff =================================================================== --- trunk/libjogl2-java/debian/patches/otherArchsoswin.diff 2011-10-06 13:42:45 UTC (rev 15156) +++ trunk/libjogl2-java/debian/patches/otherArchsoswin.diff 2011-10-06 17:13:30 UTC (rev 15157) @@ -1,18 +1,12 @@ Index: libjogl2-java-2.0-rc2/make/build-nativewindow.xml =================================================================== ---- libjogl2-java-2.0-rc2.orig/make/build-nativewindow.xml 2011-06-21 21:45:17.000000000 +0200 -+++ libjogl2-java-2.0-rc2/make/build-nativewindow.xml 2011-06-21 21:50:08.000000000 +0200 -@@ -437,7 +437,49 @@ +--- libjogl2-java-2.0-rc3.orig/make/build-nativewindow.xml 2011-10-06 16:17:29.000000000 +0200 ++++ libjogl2-java-2.0-rc3/make/build-nativewindow.xml 2011-10-06 16:20:23.000000000 +0200 +@@ -465,7 +465,43 @@ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" /> </target> -- <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.x11" if="isLinux" /> -+ <target name="c.configure.linux.armel" if="isLinuxArmel"> -+ <echo message="Linux.Armel" /> -+ <property name="compiler.cfg.id" value="compiler.cfg.linux" /> -+ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" /> -+ </target> -+ +- <target name="c.configure.linux" depends="c.configure.linux.armv7,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.x11" if="isLinux" /> + <target name="c.configure.linux.hppa" if="isLinuxHPPA"> + <echo message="Linux.HPPA" /> + <property name="compiler.cfg.id" value="compiler.cfg.linux" /> @@ -49,7 +43,7 @@ + <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" /> + </target> + -+ <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.armel,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" /> ++ <target name="c.configure.linux" depends="c.configure.linux.armv7,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" /> - <target name="c.configure.solaris32" depends="c.configure.x11" if="isSolaris32Bit"> - <echo message="Solaris" /> + <target name="c.configure.android" if="isAndroid"> + <echo message="Android" /> Modified: trunk/libjogl2-java/debian/patches/series =================================================================== --- trunk/libjogl2-java/debian/patches/series 2011-10-06 13:42:45 UTC (rev 15156) +++ trunk/libjogl2-java/debian/patches/series 2011-10-06 17:13:30 UTC (rev 15157) @@ -1,5 +1,6 @@ variousFixes.diff -disableOneDir.diff +#disableOneDir.diff swt.diff otherArchsoswin.diff +disable_android.diff Modified: trunk/libjogl2-java/debian/patches/swt.diff =================================================================== --- trunk/libjogl2-java/debian/patches/swt.diff 2011-10-06 13:42:45 UTC (rev 15156) +++ trunk/libjogl2-java/debian/patches/swt.diff 2011-10-06 17:13:30 UTC (rev 15157) @@ -2,7 +2,7 @@ =================================================================== --- jogl-v2.0-rc2.orig/make/build-common.xml 2011-04-19 09:40:43.000000000 +0200 +++ jogl-v2.0-rc2/make/build-common.xml 2011-04-19 09:42:06.000000000 +0200 -@@ -99,11 +99,8 @@ +@@ -130,14 +130,8 @@ <condition property="swt.jar" value="${project.root}/make/lib/swt/win32-win32-x86/swt-debug.jar"> <istrue value="${isWindowsX86}" /> </condition> @@ -11,8 +11,11 @@ - </condition> - <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar"> - <istrue value="${isLinuxX86}" /> +- </condition> +- <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar"> +- <istrue value="${isLinuxARMv7}" /> <!-- FIXME JAU .. hack --> + <condition property="swt.jar" value="/usr/share/java/swt.jar"> + <istrue value="${isLinux}" /> </condition> - <condition property="swt.jar" value="${project.root}/make/lib/swt/cocoa-macosx-x86_64/swt-debug.jar"> - <and> + <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar"> + <istrue value="${isAndroid}" /> <!-- FIXME JAU .. hack --> Modified: trunk/libjogl2-java/debian/patches/variousFixes.diff =================================================================== --- trunk/libjogl2-java/debian/patches/variousFixes.diff 2011-10-06 13:42:45 UTC (rev 15156) +++ trunk/libjogl2-java/debian/patches/variousFixes.diff 2011-10-06 17:13:30 UTC (rev 15157) @@ -1,7 +1,8 @@ -diff -ur jogl-v2.0-rc2.orig/make/build-common.xml jogl-v2.0-rc2/make/build-common.xml ---- jogl-v2.0-rc2.orig/make/build-common.xml 2011-03-02 20:52:40.000000000 +0100 -+++ jogl-v2.0-rc2/make/build-common.xml 2011-04-17 15:28:58.000000000 +0200 -@@ -13,13 +13,11 @@ +Index: libjogl2-java-2.0-rc3/make/build-common.xml +=================================================================== +--- libjogl2-java-2.0-rc3.orig/make/build-common.xml 2011-10-06 15:52:37.000000000 +0200 ++++ libjogl2-java-2.0-rc3/make/build-common.xml 2011-10-06 16:09:03.000000000 +0200 +@@ -13,13 +13,13 @@ </fail> <!-- Pull in GlueGen cpptasks build file --> @@ -9,14 +10,15 @@ + <property name="gluegen.root" value="/usr/share/gluegen2/" /> <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" /> - <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> - <isset property="rootrel.build"/> -@@ -150,7 +148,7 @@ +@@ -198,7 +192,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"/> @@ -25,16 +27,16 @@ <property name="ant.jar" value="${ant.home}/lib/ant.jar" /> <property name="ant-junit.jar" value="${ant.home}/lib/ant-junit.jar" /> -@@ -192,7 +190,7 @@ +@@ -373,7 +367,7 @@ </path> <!-- JavaSE combinations --> -- <property name="gluegen-rt.jar" value="${build.gluegen}/gluegen-rt.jar" /> -+ <property name="gluegen-rt.jar" value="/usr/share/java/gluegen2-rt.jar" /> - <property name="jogl.test.jar" value="${build.jogl}/jogl.test.jar"/> +- <property name="gluegen-rt.jar" value="${build.gluegen}/gluegen-rt.jar" /> ++ <property name="gluegen-rt.jar" value="/usr/share/java/gluegen2-rt.jar" /> + <property name="jogl.test.jar" value="${jar}/jogl.test.jar"/> <!-- JavaSE combinations . AWT --> -@@ -362,7 +360,10 @@ +@@ -494,7 +488,10 @@ <!-- Run the GlueGen build to ensure that the GlueGen ANT task - has been built. --> @@ -46,19 +48,11 @@ </target> -diff -ur jogl-v2.0-rc2.orig/make/build.xml jogl-v2.0-rc2/make/build.xml ---- jogl-v2.0-rc2.orig/make/build.xml 2011-03-02 20:52:40.000000000 +0100 -+++ jogl-v2.0-rc2/make/build.xml 2011-04-17 15:26:47.000000000 +0200 -@@ -86,7 +86,7 @@ - <delete includeEmptyDirs="true" quiet="true" dir="${jar}" failonerror="false" /> - <mkdir dir="${jar}" /> - <copy todir="${jar}"> -- <fileset dir="${gluegen.root}/${rootrel.build}" includes="gluegen-rt*.jar" /> -+<!-- <fileset dir="${gluegen.root}/${rootrel.build}" includes="gluegen-rt*.jar" />--> - <fileset dir="${build}/jogl" includes="*.jar" /> - <fileset dir="${build}/nativewindow" includes="*.jar" /> - <fileset dir="${build}/newt" includes="*.jar" /> -@@ -159,7 +159,7 @@ +Index: libjogl2-java-2.0-rc3/make/build.xml +=================================================================== +--- libjogl2-java-2.0-rc3.orig/make/build.xml 2011-10-06 15:52:37.000000000 +0200 ++++ libjogl2-java-2.0-rc3/make/build.xml 2011-10-06 16:03:43.000000000 +0200 +@@ -325,7 +325,7 @@ </target> <target name="tag.build" depends="init"> Modified: trunk/libjogl2-java/debian/rules =================================================================== --- trunk/libjogl2-java/debian/rules 2011-10-06 13:42:45 UTC (rev 15156) +++ trunk/libjogl2-java/debian/rules 2011-10-06 17:13:30 UTC (rev 15157) @@ -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 +DEB_ANT_ARGS := -Dsetup.noCDC=true -Done.dir.skip=true DEB_ANT_CLEAN_TARGET := clean DEB_ANT_BUILD_TARGET := all DEB_ANT_BUILDFILE := make/build.xml _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
