Author: sylvestre Date: 2011-12-27 23:53:22 +0000 (Tue, 27 Dec 2011) New Revision: 15607
Added: trunk/libjogl2-java/debian/patches/TARGET_PLATFORM_LIBS_2.diff Modified: trunk/libjogl2-java/debian/changelog trunk/libjogl2-java/debian/patches/series trunk/libjogl2-java/debian/rules Log: libjogl2-java (2.0-rc5-1~exp2) experimental; urgency=low * Only build the doc once * Disable some TARGET_PLATFORM_LIBS variables Modified: trunk/libjogl2-java/debian/changelog =================================================================== --- trunk/libjogl2-java/debian/changelog 2011-12-27 23:26:07 UTC (rev 15606) +++ trunk/libjogl2-java/debian/changelog 2011-12-27 23:53:22 UTC (rev 15607) @@ -1,3 +1,10 @@ +libjogl2-java (2.0-rc5-1~exp2) experimental; urgency=low + + * Only build the doc once + * Disable some TARGET_PLATFORM_LIBS variables + + -- Sylvestre Ledru <sylves...@debian.org> Tue, 27 Dec 2011 23:22:05 +0100 + libjogl2-java (2.0-rc5-1~exp1) experimental; urgency=low * New upstream release Added: trunk/libjogl2-java/debian/patches/TARGET_PLATFORM_LIBS_2.diff =================================================================== --- trunk/libjogl2-java/debian/patches/TARGET_PLATFORM_LIBS_2.diff (rev 0) +++ trunk/libjogl2-java/debian/patches/TARGET_PLATFORM_LIBS_2.diff 2011-12-27 23:53:22 UTC (rev 15607) @@ -0,0 +1,26 @@ +Index: libjogl2-java-2.0-rc5/make/build-jogl.xml +=================================================================== +--- libjogl2-java-2.0-rc5.orig/make/build-jogl.xml 2011-12-26 09:54:09.000000000 +0100 ++++ libjogl2-java-2.0-rc5/make/build-jogl.xml 2011-12-27 23:14:19.109596268 +0100 +@@ -1092,7 +1092,7 @@ + </linker> + + <linker id="linker.cfg.linux.armv7.jogl.x11" extends="linker.cfg.linux.armv7"> +- <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="X11"/> ++ <syslibset libs="X11"/> + </linker> + + <linker id="linker.cfg.android.jogl" extends="linker.cfg.android"> +Index: libjogl2-java-2.0-rc5/make/build-newt.xml +=================================================================== +--- libjogl2-java-2.0-rc5.orig/make/build-newt.xml 2011-12-26 09:54:09.000000000 +0100 ++++ libjogl2-java-2.0-rc5/make/build-newt.xml 2011-12-27 23:14:25.001596434 +0100 +@@ -276,7 +276,7 @@ + </linker> + + <linker id="linker.cfg.android.newt" extends="linker.cfg.android"> +- <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="android" /> ++ <syslibset libs="android" /> + </linker> + + <linker id="linker.cfg.solaris.newt.x11" extends="linker.cfg.solaris"> Modified: trunk/libjogl2-java/debian/patches/series =================================================================== --- trunk/libjogl2-java/debian/patches/series 2011-12-27 23:26:07 UTC (rev 15606) +++ trunk/libjogl2-java/debian/patches/series 2011-12-27 23:53:22 UTC (rev 15607) @@ -9,3 +9,4 @@ linker.cfg.id.os.diff otherArchsoswin_2.diff disable_android_3.diff +TARGET_PLATFORM_LIBS_2.diff Modified: trunk/libjogl2-java/debian/rules =================================================================== --- trunk/libjogl2-java/debian/rules 2011-12-27 23:26:07 UTC (rev 15606) +++ trunk/libjogl2-java/debian/rules 2011-12-27 23:53:22 UTC (rev 15607) @@ -11,16 +11,12 @@ DEB_ANT_BUILD_TARGET := all DEB_ANT_BUILDFILE := make/build.xml -common-build-indep:: doc-build -doc-build: +build-indep: $(DEB_ANT_INVOKE) javadoc.all common-install-prehook-indep:: mv build/jar/jogl.all.jar build/jar/jogl2.jar -install/libjogl2-java-doc:: - $(DEB_ANT_INVOKE) javadoc.all - clean:: $(RM) -r gluegen/build _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits