Author: sylvestre Date: 2011-12-26 01:07:35 +0000 (Mon, 26 Dec 2011) New Revision: 15595
Modified: trunk/libjogl2-java/debian/changelog trunk/libjogl2-java/debian/control trunk/libjogl2-java/debian/orig-tar.sh trunk/libjogl2-java/debian/patches/otherArchsoswin_2.diff trunk/libjogl2-java/debian/patches/swt.diff trunk/libjogl2-java/debian/watch Log: libjogl2-java (2.0-rc5-1~exp1) experimental; urgency=low * New upstream release * watch + repack script added Modified: trunk/libjogl2-java/debian/changelog =================================================================== --- trunk/libjogl2-java/debian/changelog 2011-12-26 00:51:58 UTC (rev 15594) +++ trunk/libjogl2-java/debian/changelog 2011-12-26 01:07:35 UTC (rev 15595) @@ -1,3 +1,10 @@ +libjogl2-java (2.0-rc5-1~exp1) experimental; urgency=low + + * New upstream release + * watch + repack script added + + -- Sylvestre Ledru <sylves...@debian.org> Mon, 26 Dec 2011 02:06:41 +0100 + libjogl2-java (2.0-rc3-7) unstable; urgency=low * Drop patch sparc.diff since it is now managed into gluegen2 Modified: trunk/libjogl2-java/debian/control =================================================================== --- trunk/libjogl2-java/debian/control 2011-12-26 00:51:58 UTC (rev 15594) +++ trunk/libjogl2-java/debian/control 2011-12-26 01:07:35 UTC (rev 15595) @@ -5,7 +5,7 @@ Uploaders: Sylvestre Ledru <sylves...@debian.org> Build-Depends: debhelper (>= 5), cdbs, quilt, default-jdk, ant-optional, libgl1-mesa-dev, libglu1-mesa-dev, libxxf86vm-dev, - x11proto-xf86vidmode-dev, libxt-dev, libgluegen2-build-java (>= 2.0-rc3-6), + x11proto-xf86vidmode-dev, libxt-dev, libgluegen2-build-java (>= 2.0-rc5-1), ant-contrib, ant-contrib-cpptasks, libxinerama-dev, libxrandr-dev, libgluegen2-rt-java, junit4, libswt-gtk-3-java Standards-Version: 3.9.2 Modified: trunk/libjogl2-java/debian/orig-tar.sh =================================================================== --- trunk/libjogl2-java/debian/orig-tar.sh 2011-12-26 00:51:58 UTC (rev 15594) +++ trunk/libjogl2-java/debian/orig-tar.sh 2011-12-26 01:07:35 UTC (rev 15595) @@ -1,20 +1,17 @@ #!/bin/sh -e -VERSION="2.0-rc3" -DIR=libjogl2-java-$VERSION -TAR=libjogl2-java_$VERSION.orig.tar.gz +VERSION=$2 +DIR=jogl-v$VERSION +TAR=libjogl2-java_$VERSION.orig.tar.bz2 # clean up the upstream tarball - -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/ +p7zip -d $3 +tar xvf jogl-v$VERSION.tar +cd $DIR* +rm -rf .gitignore .htaccess make/lib/ cd .. -tar zcvf $TAR $DIR -rm -rf $DIR -mv $TAR ../../ +tar jcvf ../$TAR $DIR +rm -rf $DIR jogl-v$VERSION.tar # move to directory 'tarballs' if [ -r .svn/deb-layout ]; then Modified: trunk/libjogl2-java/debian/patches/otherArchsoswin_2.diff =================================================================== --- trunk/libjogl2-java/debian/patches/otherArchsoswin_2.diff 2011-12-26 00:51:58 UTC (rev 15594) +++ trunk/libjogl2-java/debian/patches/otherArchsoswin_2.diff 2011-12-26 01:07:35 UTC (rev 15595) @@ -1,8 +1,8 @@ -Index: libjogl2-java-2.0-rc3/make/build-nativewindow.xml +Index: jogl-v2.0-rc5/make/build-nativewindow.xml =================================================================== ---- libjogl2-java-2.0-rc3.orig/make/build-nativewindow.xml 2011-11-20 17:10:07.000000000 +0100 -+++ libjogl2-java-2.0-rc3/make/build-nativewindow.xml 2011-11-20 21:34:35.923874821 +0100 -@@ -380,10 +380,10 @@ +--- jogl-v2.0-rc5.orig/make/build-nativewindow.xml 2011-12-26 01:56:35.000000000 +0100 ++++ jogl-v2.0-rc5/make/build-nativewindow.xml 2011-12-26 01:57:04.666059156 +0100 +@@ -398,10 +398,10 @@ </linker> <linker id="linker.cfg.linux.armv7.nativewindow.x11" extends="linker.cfg.linux.armv7"> @@ -17,7 +17,7 @@ </linker> <linker id="linker.cfg.solaris.nativewindow.x11" extends="linker.cfg.solaris"> -@@ -627,6 +627,7 @@ +@@ -668,6 +668,7 @@ </patternset> <echo message="Compiling @{output.lib.name}" /> @@ -25,7 +25,7 @@ <!-- have to wrap cc task with outofdate, because otherwise cc links a new library even when no files have been compiled --> -@@ -666,7 +667,7 @@ +@@ -707,7 +708,7 @@ <!-- This must come last to not override real include paths --> <!-- includepath path="stub_includes/macosx" if="isOSX" / --> </compiler> @@ -34,24 +34,22 @@ <linker extends="@{linker.cfg.id}"> <syslibset dir="${java.lib.dir.platform}" libs="jawt" if="@{output.lib.name}.useLibJAWT"/> <syslibset dir="${java.lib.dir.platform}/server" libs="jvm" if="@{output.lib.name}.useLibJVM"/> -Index: libjogl2-java-2.0-rc3/make/build-newt.xml +Index: jogl-v2.0-rc5/make/build-newt.xml =================================================================== ---- libjogl2-java-2.0-rc3.orig/make/build-newt.xml 2011-11-20 17:10:07.000000000 +0100 -+++ libjogl2-java-2.0-rc3/make/build-newt.xml 2011-11-20 18:44:37.728372518 +0100 -@@ -274,9 +274,9 @@ +--- jogl-v2.0-rc5.orig/make/build-newt.xml 2011-12-26 01:56:33.000000000 +0100 ++++ jogl-v2.0-rc5/make/build-newt.xml 2011-12-26 01:58:23.326061322 +0100 +@@ -271,8 +271,8 @@ </linker> <linker id="linker.cfg.linux.armv7.newt.x11" extends="linker.cfg.linux.armv7"> - <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="X11" /> - <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xrandr" /> -- <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xxf86vm" /> + <syslibset libs="X11" /> + <syslibset libs="Xrandr" /> -+ <syslibset libs="Xxf86vm" /> </linker> <linker id="linker.cfg.android.newt" extends="linker.cfg.android"> -@@ -367,13 +367,73 @@ +@@ -368,13 +368,73 @@ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> </target> Modified: trunk/libjogl2-java/debian/patches/swt.diff =================================================================== --- trunk/libjogl2-java/debian/patches/swt.diff 2011-12-26 00:51:58 UTC (rev 15594) +++ trunk/libjogl2-java/debian/patches/swt.diff 2011-12-26 01:07:35 UTC (rev 15595) @@ -1,10 +1,10 @@ -Index: jogl-v2.0-rc2/make/build-common.xml +Index: jogl-v2.0-rc5/make/build-common.xml =================================================================== ---- 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 -@@ -130,14 +130,8 @@ - <condition property="swt.jar" value="${project.root}/make/lib/swt/win32-win32-x86/swt-debug.jar"> - <istrue value="${isWindowsX86}" /> +--- jogl-v2.0-rc5.orig/make/build-common.xml 2011-12-26 02:00:28.000000000 +0100 ++++ jogl-v2.0-rc5/make/build-common.xml 2011-12-26 02:00:34.658064939 +0100 +@@ -133,14 +133,8 @@ + <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-freebsd-x86_64/swt.jar"> + <istrue value="${isFreeBSDAMD64}" /> </condition> - <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86_64/swt-debug.jar"> - <istrue value="${isLinuxAMD64}" /> Modified: trunk/libjogl2-java/debian/watch =================================================================== --- trunk/libjogl2-java/debian/watch 2011-12-26 00:51:58 UTC (rev 15594) +++ trunk/libjogl2-java/debian/watch 2011-12-26 01:07:35 UTC (rev 15595) @@ -1,7 +1,4 @@ version=3 -#opts="uversionmangle=s/-rc/~rc/,dversionmangle=s/\+dak\d+$//" \ -#http://download.java.net/media/jogl/builds/archive/jsr-231-([\d\.]+)/ \ -#jogl-([\d\.]+)-src\.zip debian debian/orig-tar.sh -http://download.java.net/media/jogl/builds/archive/jsr-231-(.*)/ \ -jogl-(.*)-src\.zip debian debian/orig-tar.sh +http://jogamp.org/deployment/jogamp-current/archive/Sources/ jogl-v(.*).tar.7z \ +debian debian/orig-tar.sh _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits