changes to fix FTBFS
Onkar Shinde
14 years ago
|
0 |
java3d (1.5.2+dfsg-2) unstable; urgency=low
|
|
1 |
|
|
2 |
* debian/control
|
|
3 |
- Add myself to uploaders.
|
|
4 |
- Move default-jdk to Build-Depends as there is no easy way to split builds
|
|
5 |
of arch:all and arch:any packages.
|
|
6 |
* debian/rules
|
|
7 |
- Include simple patchsys makefile.
|
|
8 |
- Add echo target for debugging purpose.
|
|
9 |
- Add ant argument to set build type.
|
|
10 |
* debian/patches/01_fix_powerpc_ftbfs.patch
|
|
11 |
- Add fix for FTBFS on powerpc.
|
|
12 |
* debian/patches/02_fix_generic_ftbfs.patch
|
|
13 |
- Add fix for FTBFS on architectures not handled by current build system.
|
|
14 |
|
|
15 |
-- Onkar Shinde <onkarshinde@ubuntu.com> Thu, 13 Aug 2009 10:23:33 +0530
|
|
16 |
|
0 | 17 |
java3d (1.5.2+dfsg-1) unstable; urgency=low
|
1 | 18 |
|
2 | 19 |
[ Sylvestre Ledru ]
|
2 | 2 |
Priority: optional
|
3 | 3 |
Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
|
4 | 4 |
Uploaders: Petter Reinholdtsen <pere@debian.org>, Jonny Lamb
|
5 | |
<jonny@debian.org>, Sylvestre Ledru <sylvestre.ledru@inria.fr>
|
6 | |
Build-Depends: debhelper (>= 5), cdbs, ant-optional, libvecmath-java, mesa-common-dev, libgl1-mesa-dev, libxext-dev, libxt-dev
|
7 | |
Build-Depends-Indep: default-jdk
|
|
5 |
<jonny@debian.org>, Sylvestre Ledru <sylvestre.ledru@inria.fr>,
|
|
6 |
Onkar Shinde <onkarshinde@ubuntu.com>
|
|
7 |
Build-Depends: debhelper (>= 5), cdbs, default-jdk, ant-optional, libvecmath-java, mesa-common-dev, libgl1-mesa-dev, libxext-dev, libxt-dev
|
8 | 8 |
Standards-Version: 3.8.2
|
9 | 9 |
Homepage: http://java3d.dev.java.net
|
10 | 10 |
Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/java3d/
|
|
0 |
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
|
|
1 |
--- java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-ppc.xml 2008-02-29 01:48:00.000000000 +0530
|
|
2 |
+++ java3d-1.5.2+dfsg.new/j3d-core/src/native/ogl/build-linux-ppc.xml 2009-08-11 20:37:25.000000000 +0530
|
|
3 |
@@ -28,7 +28,7 @@
|
|
4 |
|
|
5 |
<!-- Create the library file-->
|
|
6 |
<exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld">
|
|
7 |
- <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"/>
|
|
8 |
+ <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"/>
|
|
9 |
</exec>
|
|
10 |
|
|
11 |
<!-- Copy the copyright library file -->
|
1 | 1 |
|
2 | 2 |
include /usr/share/cdbs/1/rules/debhelper.mk
|
3 | 3 |
include /usr/share/cdbs/1/class/ant.mk
|
|
4 |
include /usr/share/cdbs/1/rules/simple-patchsys.mk
|
4 | 5 |
|
5 | 6 |
JAVA_HOME := /usr/lib/jvm/default-java
|
6 | 7 |
DEB_JARS := ant-nodeps vecmath
|
7 | 8 |
DEB_ANT_BUILDFILE := j3d-core/build.xml
|
8 | 9 |
DEB_ANT_CLEAN_TARGET := clean
|
9 | |
DEB_ANT_BUILD_TARGET := jar docs
|
|
10 |
DEB_ANT_BUILD_TARGET := echo jar docs
|
|
11 |
DEB_ANT_ARGS := -Dbuild.type=fcs
|
10 | 12 |
|
11 | 13 |
install/libjava3d-java::
|
12 | 14 |
set -e ; for jar in j3dcore j3dutils ; do \
|