Commit 0ae1a2fc9bb4844ba0f39d495db6bd76af3abc40 - java3d

+16

-2

debian/changelog less more

0		java3d (1.5.2+dfsg-5) UNRELEASED; urgency=low
	0	java3d (1.5.2+dfsg-5) unstable; urgency=low
1	1
2	2	[ Sylvestre Ledru ]
3	3	* Remove myself from the package
4	4
5		-- Sylvestre Ledru <sylvestre@debian.org> Sun, 20 Sep 2009 11:23:53 +0200
	5	[ Onkar Shinde ]
	6	* debian/control
	7	- Change build dependency default-jdk to openjdk-6-jdk. This library uses
	8	Sun specific APIs.
	9	This change will put package in DEPWAIT on certain arch. But DEPWAIT is
	10	better than FTBFS. (Closes: #559768)
	11	- Change dependency default-jre to openjdk-6-jre.
	12	- Remove -XS-Autobuild. Not needed anymore.
	13	- Update standards version to 3.8.3.
	14	* debian/rules
	15	- Change JAVA_HOME to correspond to openjdk.
	16	* debian/patches/02_fix_generic_ftbfs.patch
	17	- Allow the build to continue on kFreeBSD as well. (Closes: #559766)
	18
	19	-- Onkar Shinde <onkarshinde@ubuntu.com> Sat, 09 Jan 2010 18:19:12 +0530
6	20
7	21	java3d (1.5.2+dfsg-4) unstable; urgency=low
8	22

+3

-4

debian/control less more

4	4	Uploaders: Petter Reinholdtsen <pere@debian.org>, Jonny Lamb
5	5	<jonny@debian.org>, Onkar Shinde <onkarshinde@ubuntu.com>,
6	6	Torsten Werner <twerner@debian.org>
7		Build-Depends: debhelper (>= 5), cdbs, default-jdk, ant-optional, libvecmath-java, mesa-common-dev, libgl1-mesa-dev, libxext-dev, libxt-dev, quilt
8		Standards-Version: 3.8.2
	7	Build-Depends: debhelper (>= 5), cdbs, openjdk-6-jdk, ant-optional, libvecmath-java, mesa-common-dev, libgl1-mesa-dev, libxext-dev, libxt-dev, quilt
	8	Standards-Version: 3.8.3
9	9	Homepage: http://java3d.dev.java.net
10	10	Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/java3d/
11	11	Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/java3d/
12		XS-Autobuild: yes
13	12	DM-Upload-Allowed: yes
14	13
15	14	Package: libjava3d-java
16	15	Architecture: all
17	16	Section: java
18	17	Suggests: libjava3d-java-doc
19		Depends: ${misc:Depends}, default-jre \| java5-runtime, libjava3d-jni (>= ${source:Version}),
	18	Depends: ${misc:Depends}, openjdk-6-jre \| java5-runtime, libjava3d-jni (>= ${source:Version}),
20	19	libvecmath-java
21	20	Description: Java 3D API (java library)
22	21	The Java 3D API enables the creation of three-dimensional graphics

+9

-6

debian/patches/02_fix_generic_ftbfs.patch less more

0	0	Index: java3d-1.5.2+dfsg/j3d-core/build.xml
1	1	===================================================================
2		--- java3d-1.5.2+dfsg.orig/j3d-core/build.xml 2008-05-23 22:31:19.000000000 +0200
3		+++ java3d-1.5.2+dfsg/j3d-core/build.xml 2009-09-15 11:56:34.000000000 +0200
	2	--- java3d-1.5.2+dfsg.orig/j3d-core/build.xml 2010-01-09 18:52:55.000000000 +0530
	3	+++ java3d-1.5.2+dfsg/j3d-core/build.xml 2010-01-09 20:24:13.000000000 +0530
4	4	@@ -196,6 +196,15 @@
5	5	<property name="install.bin" value="lib/ppc"/>
6	6	</target>

26	26	<property name="build-debug-gen" location="${build}/${platform}/debug/gen"/>
27	27	<property name="build-opt-gen" location="${build}/${platform}/opt/gen"/>
28	28	<property name="docname" value="${build.relprefix}-${version_file}-doc"/>
29		@@ -382,6 +391,10 @@
	29	@@ -382,6 +391,13 @@
30	30	<os name="linux" arch="ppc"/>
31	31	</condition>
32	32
33	33	+ <condition property="isLinuxGeneric">
	34	+ <or>
34	35	+ <os name="linux"/>
	36	+ <os name="GNU/kFreeBSD"/>
	37	+ </or>
35	38	+ </condition>
36	39	+
37	40	<condition property="isSolarisOnSparc">

39	42	</condition>
40	43	Index: java3d-1.5.2+dfsg/j3d-core/src/native/build.xml
41	44	===================================================================
42		--- java3d-1.5.2+dfsg.orig/j3d-core/src/native/build.xml 2008-02-28 21:17:58.000000000 +0100
43		+++ java3d-1.5.2+dfsg/j3d-core/src/native/build.xml 2009-09-15 11:56:34.000000000 +0200
	45	--- java3d-1.5.2+dfsg.orig/j3d-core/src/native/build.xml 2010-01-09 18:52:55.000000000 +0530
	46	+++ java3d-1.5.2+dfsg/j3d-core/src/native/build.xml 2010-01-09 20:23:04.000000000 +0530
44	47	@@ -45,6 +45,13 @@
45	48	<property name="osNativeScreenInfo" value="X11NativeScreenInfo"/>
46	49	</target>

90	93	Index: java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-generic.xml
91	94	===================================================================
92	95	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
93		+++ java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-generic.xml 2009-09-15 11:57:25.000000000 +0200
	96	+++ java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-generic.xml 2010-01-09 20:23:04.000000000 +0530
94	97	@@ -0,0 +1,74 @@
95	98	+<?xml version="1.0"?>
96	99	+

+1

-1

debian/rules less more

3	3	include /usr/share/cdbs/1/class/ant.mk
4	4	include /usr/share/cdbs/1/rules/patchsys-quilt.mk
5	5
6		JAVA_HOME := /usr/lib/jvm/default-java
	6	JAVA_HOME := /usr/lib/jvm/java-6-openjdk
7	7	DEB_JARS := ant-nodeps vecmath
8	8	DEB_ANT_BUILDFILE := j3d-core/build.xml
9	9	DEB_ANT_CLEAN_TARGET := clean