[pkg-java] r9964 - in trunk/java3d/debian: . patches
Onkar Shinde
onkarshinde-guest at alioth.debian.org
Thu Aug 13 04:54:47 UTC 2009
Author: onkarshinde-guest
Date: 2009-08-13 04:54:46 +0000 (Thu, 13 Aug 2009)
New Revision: 9964
Added:
trunk/java3d/debian/patches/
trunk/java3d/debian/patches/01_fix_powerpc_ftbfs.patch
Modified:
trunk/java3d/debian/changelog
trunk/java3d/debian/control
trunk/java3d/debian/rules
Log:
changes to fix FTBFS
Modified: trunk/java3d/debian/changelog
===================================================================
--- trunk/java3d/debian/changelog 2009-08-12 20:15:06 UTC (rev 9963)
+++ trunk/java3d/debian/changelog 2009-08-13 04:54:46 UTC (rev 9964)
@@ -1,3 +1,20 @@
+java3d (1.5.2+dfsg-2) unstable; urgency=low
+
+ * debian/control
+ - Add myself to uploaders.
+ - Move default-jdk to Build-Depends as there is no easy way to split builds
+ of arch:all and arch:any packages.
+ * debian/rules
+ - Include simple patchsys makefile.
+ - Add echo target for debugging purpose.
+ - Add ant argument to set build type.
+ * debian/patches/01_fix_powerpc_ftbfs.patch
+ - Add fix for FTBFS on powerpc.
+ * debian/patches/02_fix_generic_ftbfs.patch
+ - Add fix for FTBFS on architectures not handled by current build system.
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com> Thu, 13 Aug 2009 10:23:33 +0530
+
java3d (1.5.2+dfsg-1) unstable; urgency=low
[ Sylvestre Ledru ]
Modified: trunk/java3d/debian/control
===================================================================
--- trunk/java3d/debian/control 2009-08-12 20:15:06 UTC (rev 9963)
+++ trunk/java3d/debian/control 2009-08-13 04:54:46 UTC (rev 9964)
@@ -3,9 +3,9 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Petter Reinholdtsen <pere at debian.org>, Jonny Lamb
- <jonny at debian.org>, Sylvestre Ledru <sylvestre.ledru at inria.fr>
-Build-Depends: debhelper (>= 5), cdbs, ant-optional, libvecmath-java, mesa-common-dev, libgl1-mesa-dev, libxext-dev, libxt-dev
-Build-Depends-Indep: default-jdk
+ <jonny at debian.org>, Sylvestre Ledru <sylvestre.ledru at inria.fr>,
+ Onkar Shinde <onkarshinde at ubuntu.com>
+Build-Depends: debhelper (>= 5), cdbs, default-jdk, ant-optional, libvecmath-java, mesa-common-dev, libgl1-mesa-dev, libxext-dev, libxt-dev
Standards-Version: 3.8.2
Homepage: http://java3d.dev.java.net
Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/java3d/
Added: trunk/java3d/debian/patches/01_fix_powerpc_ftbfs.patch
===================================================================
--- trunk/java3d/debian/patches/01_fix_powerpc_ftbfs.patch (rev 0)
+++ trunk/java3d/debian/patches/01_fix_powerpc_ftbfs.patch 2009-08-13 04:54:46 UTC (rev 9964)
@@ -0,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-ppc.xml java3d-1.5.2+dfsg.new/j3d-core/src/native/ogl/build-linux-ppc.xml
+--- java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-ppc.xml 2008-02-29 01:48:00.000000000 +0530
++++ java3d-1.5.2+dfsg.new/j3d-core/src/native/ogl/build-linux-ppc.xml 2009-08-11 20:37:25.000000000 +0530
+@@ -28,7 +28,7 @@
+
+ <!-- Create the library file-->
+ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld">
+- <arg line="DrawingSurfaceObjectAWT.o Canvas3D.o GraphicsContext3D.o NativeScreenInfo.o NativeConfigTemplate3D.o MasterControl.o GeometryArrayRetained.o Attributes.o CgShaderProgram.o GLSLShaderProgram.o Lights.o -G -z defs -L/usr/X11R6/lib -ldl -lGL -lX11 -lXext -lm -lnsl -lc -R/usr/openwin/lib -L${java.home}/bin -ljawt -L${java.home}/bin/classic -ljvm -o libj3dcore-ogl.so"/>
++ <arg line="DrawingSurfaceObjectAWT.o Canvas3D.o GraphicsContext3D.o NativeScreenInfo.o NativeConfigTemplate3D.o MasterControl.o GeometryArrayRetained.o Attributes.o CgShaderProgram.o GLSLShaderProgram.o Lights.o -G -z defs -L/usr/X11R6/lib -ldl -lGL -lX11 -lXext -lm -lnsl -lc -L${java.home}/lib/ppc -R/usr/openwin/lib -L${java.home}/bin -ljawt -L${java.home}/lib/ppc/server -L${java.home}/bin/classic -ljvm -o libj3dcore-ogl.so"/>
+ </exec>
+
+ <!-- Copy the copyright library file -->
Modified: trunk/java3d/debian/rules
===================================================================
--- trunk/java3d/debian/rules 2009-08-12 20:15:06 UTC (rev 9963)
+++ trunk/java3d/debian/rules 2009-08-13 04:54:46 UTC (rev 9964)
@@ -2,12 +2,14 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
JAVA_HOME := /usr/lib/jvm/default-java
DEB_JARS := ant-nodeps vecmath
DEB_ANT_BUILDFILE := j3d-core/build.xml
DEB_ANT_CLEAN_TARGET := clean
-DEB_ANT_BUILD_TARGET := jar docs
+DEB_ANT_BUILD_TARGET := echo jar docs
+DEB_ANT_ARGS := -Dbuild.type=fcs
install/libjava3d-java::
set -e ; for jar in j3dcore j3dutils ; do \
More information about the pkg-java-commits
mailing list