Author: sylvestre Date: 2012-06-13 18:31:27 +0000 (Wed, 13 Jun 2012) New Revision: 16129
Added: trunk/libjogl2-java/debian/patches/armhfbuild.diff trunk/libjogl2-java/debian/patches/s390x.diff Modified: trunk/libjogl2-java/debian/changelog trunk/libjogl2-java/debian/patches/series Log: * Upload to unstable * Support of armhf & s390x added. Modified: trunk/libjogl2-java/debian/changelog =================================================================== --- trunk/libjogl2-java/debian/changelog 2012-06-13 12:32:14 UTC (rev 16128) +++ trunk/libjogl2-java/debian/changelog 2012-06-13 18:31:27 UTC (rev 16129) @@ -1,3 +1,10 @@ +libjogl2-java (2.0-rc8-1) unstable; urgency=low + + * Upload to unstable + * Support of armhf & s390x added. + + -- Sylvestre Ledru <[email protected]> Wed, 13 Jun 2012 18:34:05 +0200 + libjogl2-java (2.0-rc8-1~exp2) experimental; urgency=low * Force also the version of gluegen2 in the package themself Added: trunk/libjogl2-java/debian/patches/armhfbuild.diff =================================================================== --- trunk/libjogl2-java/debian/patches/armhfbuild.diff (rev 0) +++ trunk/libjogl2-java/debian/patches/armhfbuild.diff 2012-06-13 18:31:27 UTC (rev 16129) @@ -0,0 +1,17 @@ +Index: libjogl2-java-2.0-rc8/make/build-nativewindow.xml +=================================================================== +--- libjogl2-java-2.0-rc8.orig/make/build-nativewindow.xml 2012-05-02 03:28:29.000000000 +0200 ++++ libjogl2-java-2.0-rc8/make/build-nativewindow.xml 2012-06-13 18:25:52.000000000 +0200 +@@ -397,9 +397,9 @@ + </linker> + + <linker id="linker.cfg.linux.armv7.nativewindow.x11" extends="linker.cfg.linux.armv7"> +- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11" /> +- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xxf86vm" /> +- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrender" /> ++ <syslibset libs="X11" /> ++ <syslibset libs="Xxf86vm" /> ++ <syslibset libs="Xrender" /> + </linker> + + <linker id="linker.cfg.solaris.nativewindow.x11" extends="linker.cfg.solaris"> Added: trunk/libjogl2-java/debian/patches/s390x.diff =================================================================== --- trunk/libjogl2-java/debian/patches/s390x.diff (rev 0) +++ trunk/libjogl2-java/debian/patches/s390x.diff 2012-06-13 18:31:27 UTC (rev 16129) @@ -0,0 +1,80 @@ +Index: libjogl2-java-2.0-rc8/make/build-jogl.xml +=================================================================== +--- libjogl2-java-2.0-rc8.orig/make/build-jogl.xml 2012-06-13 18:24:37.000000000 +0200 ++++ libjogl2-java-2.0-rc8/make/build-jogl.xml 2012-06-13 18:28:51.000000000 +0200 +@@ -1285,13 +1285,19 @@ + <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" /> + </target> + ++ <target name="c.configure.linux.s390x" if="isLinuxs390x"> ++ <echo message="Linux.S390x" /> ++ <property name="compiler.cfg.id" value="compiler.cfg.linux" /> ++ <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" /> ++ </target> ++ + <target name="c.configure.linux.sparc" if="isLinuxSparc"> + <echo message="Linux.SPARC" /> + <property name="compiler.cfg.id" value="compiler.cfg.linux" /> + <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.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.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.s390x,c.configure.linux.sparc,c.configure.x11" if="isLinux" /> + + <target name="c.configure.android" if="isAndroid"> + <echo message="Android" /> +Index: libjogl2-java-2.0-rc8/make/build-nativewindow.xml +=================================================================== +--- libjogl2-java-2.0-rc8.orig/make/build-nativewindow.xml 2012-06-13 18:25:52.000000000 +0200 ++++ libjogl2-java-2.0-rc8/make/build-nativewindow.xml 2012-06-13 18:27:24.000000000 +0200 +@@ -529,13 +529,19 @@ + <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" /> + </target> + ++ <target name="c.configure.linux.s390x" if="isLinuxs390x"> ++ <echo message="Linux.S390x" /> ++ <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.sparc" if="isLinuxSparc"> + <echo message="Linux.SPARC" /> + <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.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.s390x,c.configure.linux.sparc,c.configure.x11" if="isLinux" /> + + <target name="c.configure.android" if="isAndroid"> + <echo message="Android" /> +Index: libjogl2-java-2.0-rc8/make/build-newt.xml +=================================================================== +--- libjogl2-java-2.0-rc8.orig/make/build-newt.xml 2012-06-13 18:24:37.000000000 +0200 ++++ libjogl2-java-2.0-rc8/make/build-newt.xml 2012-06-13 18:28:33.000000000 +0200 +@@ -423,6 +423,16 @@ + <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> + </target> + ++ <target name="c.configure.linux.s390x" if="isLinuxs390x"> ++ <echo message="Linux.S390x" /> ++ <property name="compiler.cfg.id" value="compiler.cfg.linux" /> ++ <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" ++ else="linker.cfg.linux"> ++ <isset property="isX11" /> ++ </condition> ++ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> ++ </target> ++ + <target name="c.configure.linux.sparc" if="isLinuxSparc"> + <echo message="Linux.sparc" /> + <property name="compiler.cfg.id" value="compiler.cfg.linux" /> +@@ -439,7 +449,7 @@ + <property name="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" /> + </target> + +- <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv7,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.linux.ia64,c.configure.x11" if="isLinux"/> ++ <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv7,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.linux.ia64,c.configure.x11" if="isLinux"/> + + <target name="c.configure.android" if="isAndroid"> + <echo message="Android" /> Modified: trunk/libjogl2-java/debian/patches/series =================================================================== --- trunk/libjogl2-java/debian/patches/series 2012-06-13 12:32:14 UTC (rev 16128) +++ trunk/libjogl2-java/debian/patches/series 2012-06-13 18:31:27 UTC (rev 16129) @@ -11,3 +11,5 @@ disable_android_3.diff TARGET_PLATFORM_LIBS_2.diff manifest.diff +armhfbuild.diff +s390x.diff _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
