Author: onkarshinde-guest Date: 2010-01-16 19:50:20 +0000 (Sat, 16 Jan 2010) New Revision: 11353
Modified: trunk/java3d/debian/changelog trunk/java3d/debian/control trunk/java3d/debian/patches/02_fix_generic_ftbfs.patch trunk/java3d/debian/rules Log: java3d 1.5.2+dfsg-5 Modified: trunk/java3d/debian/changelog =================================================================== --- trunk/java3d/debian/changelog 2010-01-16 15:24:27 UTC (rev 11352) +++ trunk/java3d/debian/changelog 2010-01-16 19:50:20 UTC (rev 11353) @@ -1,10 +1,24 @@ -java3d (1.5.2+dfsg-5) UNRELEASED; urgency=low +java3d (1.5.2+dfsg-5) unstable; urgency=low [ Sylvestre Ledru ] * Remove myself from the package - -- Sylvestre Ledru <sylves...@debian.org> Sun, 20 Sep 2009 11:23:53 +0200 + [ Onkar Shinde ] + * debian/control + - Change build dependency default-jdk to openjdk-6-jdk. This library uses + Sun specific APIs. + This change will put package in DEPWAIT on certain arch. But DEPWAIT is + better than FTBFS. (Closes: #559768) + - Change dependency default-jre to openjdk-6-jre. + - Remove -XS-Autobuild. Not needed anymore. + - Update standards version to 3.8.3. + * debian/rules + - Change JAVA_HOME to correspond to openjdk. + * debian/patches/02_fix_generic_ftbfs.patch + - Allow the build to continue on kFreeBSD as well. (Closes: #559766) + -- Onkar Shinde <onkarshi...@ubuntu.com> Sat, 09 Jan 2010 18:19:12 +0530 + java3d (1.5.2+dfsg-4) unstable; urgency=low * Add missing compiler option -fPIC. (hopefully closes: #545840) Modified: trunk/java3d/debian/control =================================================================== --- trunk/java3d/debian/control 2010-01-16 15:24:27 UTC (rev 11352) +++ trunk/java3d/debian/control 2010-01-16 19:50:20 UTC (rev 11353) @@ -5,19 +5,18 @@ Uploaders: Petter Reinholdtsen <p...@debian.org>, Jonny Lamb <jo...@debian.org>, Onkar Shinde <onkarshi...@ubuntu.com>, Torsten Werner <twer...@debian.org> -Build-Depends: debhelper (>= 5), cdbs, default-jdk, ant-optional, libvecmath-java, mesa-common-dev, libgl1-mesa-dev, libxext-dev, libxt-dev, quilt -Standards-Version: 3.8.2 +Build-Depends: debhelper (>= 5), cdbs, openjdk-6-jdk, ant-optional, libvecmath-java, mesa-common-dev, libgl1-mesa-dev, libxext-dev, libxt-dev, quilt +Standards-Version: 3.8.3 Homepage: http://java3d.dev.java.net Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/java3d/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/java3d/ -XS-Autobuild: yes DM-Upload-Allowed: yes Package: libjava3d-java Architecture: all Section: java Suggests: libjava3d-java-doc -Depends: ${misc:Depends}, default-jre | java5-runtime, libjava3d-jni (>= ${source:Version}), +Depends: ${misc:Depends}, openjdk-6-jre | java5-runtime, libjava3d-jni (>= ${source:Version}), libvecmath-java Description: Java 3D API (java library) The Java 3D API enables the creation of three-dimensional graphics Modified: trunk/java3d/debian/patches/02_fix_generic_ftbfs.patch =================================================================== --- trunk/java3d/debian/patches/02_fix_generic_ftbfs.patch 2010-01-16 15:24:27 UTC (rev 11352) +++ trunk/java3d/debian/patches/02_fix_generic_ftbfs.patch 2010-01-16 19:50:20 UTC (rev 11353) @@ -1,7 +1,7 @@ Index: java3d-1.5.2+dfsg/j3d-core/build.xml =================================================================== ---- java3d-1.5.2+dfsg.orig/j3d-core/build.xml 2008-05-23 22:31:19.000000000 +0200 -+++ java3d-1.5.2+dfsg/j3d-core/build.xml 2009-09-15 11:56:34.000000000 +0200 +--- java3d-1.5.2+dfsg.orig/j3d-core/build.xml 2010-01-09 18:52:55.000000000 +0530 ++++ java3d-1.5.2+dfsg/j3d-core/build.xml 2010-01-09 20:24:13.000000000 +0530 @@ -196,6 +196,15 @@ <property name="install.bin" value="lib/ppc"/> </target> @@ -27,12 +27,15 @@ <property name="build-debug-gen" location="${build}/${platform}/debug/gen"/> <property name="build-opt-gen" location="${build}/${platform}/opt/gen"/> <property name="docname" value="${build.relprefix}-${version_file}-doc"/> -@@ -382,6 +391,10 @@ +@@ -382,6 +391,13 @@ <os name="linux" arch="ppc"/> </condition> + <condition property="isLinuxGeneric"> ++ <or> + <os name="linux"/> ++ <os name="GNU/kFreeBSD"/> ++ </or> + </condition> + <condition property="isSolarisOnSparc"> @@ -40,8 +43,8 @@ </condition> Index: java3d-1.5.2+dfsg/j3d-core/src/native/build.xml =================================================================== ---- java3d-1.5.2+dfsg.orig/j3d-core/src/native/build.xml 2008-02-28 21:17:58.000000000 +0100 -+++ java3d-1.5.2+dfsg/j3d-core/src/native/build.xml 2009-09-15 11:56:34.000000000 +0200 +--- java3d-1.5.2+dfsg.orig/j3d-core/src/native/build.xml 2010-01-09 18:52:55.000000000 +0530 ++++ java3d-1.5.2+dfsg/j3d-core/src/native/build.xml 2010-01-09 20:23:04.000000000 +0530 @@ -45,6 +45,13 @@ <property name="osNativeScreenInfo" value="X11NativeScreenInfo"/> </target> @@ -91,7 +94,7 @@ Index: java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-generic.xml =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-generic.xml 2009-09-15 11:57:25.000000000 +0200 ++++ java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-generic.xml 2010-01-09 20:23:04.000000000 +0530 @@ -0,0 +1,74 @@ +<?xml version="1.0"?> + Modified: trunk/java3d/debian/rules =================================================================== --- trunk/java3d/debian/rules 2010-01-16 15:24:27 UTC (rev 11352) +++ trunk/java3d/debian/rules 2010-01-16 19:50:20 UTC (rev 11353) @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/class/ant.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -JAVA_HOME := /usr/lib/jvm/default-java +JAVA_HOME := /usr/lib/jvm/java-6-openjdk DEB_JARS := ant-nodeps vecmath DEB_ANT_BUILDFILE := j3d-core/build.xml DEB_ANT_CLEAN_TARGET := clean _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits