[med-svn] r7770 - trunk/packages/visad/trunk/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-12 16:15:35 +0000 (Mon, 12 Sep 2011)
New Revision: 7770

Added:
   trunk/packages/visad/trunk/debian/libvisad-java.jlibs
Removed:
   trunk/packages/visad/trunk/debian/libjai-core-java-doc.javadoc
   trunk/packages/visad/trunk/debian/libjai-core-java.install
   trunk/packages/visad/trunk/debian/libjai-core-java.jlibs
   trunk/packages/visad/trunk/debian/patches/
Modified:
   trunk/packages/visad/trunk/debian/control
   trunk/packages/visad/trunk/debian/rules
Log:
visad compiles on my machine now

Modified: trunk/packages/visad/trunk/debian/control
===================================================================
--- trunk/packages/visad/trunk/debian/control	2011-09-12 16:13:44 UTC (rev 7769)
+++ trunk/packages/visad/trunk/debian/control	2011-09-12 16:15:35 UTC (rev 7770)
@@ -5,30 +5,17 @@
 DM-Upload-Allowed: yes
 Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>
 Build-Depends: debhelper (>= 8), javahelper (>=0.25)
-Build-Depends-Indep: default-jdk, default-jdk-doc, ant
+Build-Depends-Indep: default-jdk, default-jdk-doc, ant, libjava3d-java, libvecmath-java
 Standards-Version: 3.9.2
-Homepage: http://java.net/projects/jai-core/
-Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/jai-core/trunk/
-Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/jai-core/trunk/
+Homepage: http://www.ssec.wisc.edu/~billh/visad.html
+Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/visad/trunk/
+Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/visad/trunk/
 
-
-Package: libjai-core-java
-Architecture: i386 amd64
-Depends: ${java:Depends}, ${misc:Depends}, ${shlibs:Depends}
-Recommends: ${java:Recommends}
-Description: Java Advanced Imaging API reference implementation
- This project contains the source code for the core Java Advanced Imaging API
- reference implementation containing the packages javax.media.jai.* and
- com.sun.media.jai.*.
-
-Package: libjai-core-java-doc
-Section: non-free/doc
+Package: libvisad-java
 Architecture: all
 Depends: ${java:Depends}, ${misc:Depends}
 Recommends: ${java:Recommends}
-Description: Java Advanced Imaging API reference implementation (documentation)
+Description: Java Advanced Imaging API reference implementation
  This project contains the source code for the core Java Advanced Imaging API
  reference implementation containing the packages javax.media.jai.* and
  com.sun.media.jai.*.
- .
- This package provides the documentation for the library

Deleted: trunk/packages/visad/trunk/debian/libjai-core-java-doc.javadoc
===================================================================
--- trunk/packages/visad/trunk/debian/libjai-core-java-doc.javadoc	2011-09-12 16:13:44 UTC (rev 7769)
+++ trunk/packages/visad/trunk/debian/libjai-core-java-doc.javadoc	2011-09-12 16:15:35 UTC (rev 7770)
@@ -1 +0,0 @@
-build/linux-amd64/javadocs/docs-jcp usr/share/doc/libjai-core-java/api

Deleted: trunk/packages/visad/trunk/debian/libjai-core-java.install
===================================================================
--- trunk/packages/visad/trunk/debian/libjai-core-java.install	2011-09-12 16:13:44 UTC (rev 7769)
+++ trunk/packages/visad/trunk/debian/libjai-core-java.install	2011-09-12 16:15:35 UTC (rev 7770)
@@ -1 +0,0 @@
-build/linux-*/opt/lib/*/libmlib_jai.so usr/lib/jni

Deleted: trunk/packages/visad/trunk/debian/libjai-core-java.jlibs
===================================================================
--- trunk/packages/visad/trunk/debian/libjai-core-java.jlibs	2011-09-12 16:13:44 UTC (rev 7769)
+++ trunk/packages/visad/trunk/debian/libjai-core-java.jlibs	2011-09-12 16:15:35 UTC (rev 7770)
@@ -1 +0,0 @@
-build/linux-*/opt/lib/ext/*.jar

Added: trunk/packages/visad/trunk/debian/libvisad-java.jlibs
===================================================================
--- trunk/packages/visad/trunk/debian/libvisad-java.jlibs	                        (rev 0)
+++ trunk/packages/visad/trunk/debian/libvisad-java.jlibs	2011-09-12 16:15:35 UTC (rev 7770)
@@ -0,0 +1 @@
+visad.jar

Modified: trunk/packages/visad/trunk/debian/rules
===================================================================
--- trunk/packages/visad/trunk/debian/rules	2011-09-12 16:13:44 UTC (rev 7769)
+++ trunk/packages/visad/trunk/debian/rules	2011-09-12 16:15:35 UTC (rev 7770)
@@ -1,12 +1,13 @@
 #!/usr/bin/make -f
 
 JAVA_HOME=/usr/lib/jvm/default-java
+export CLASSPATH=/usr/share/java/j3dcore.jar:/usr/share/java/j3dutils.jar:/usr/share/java/vecmath.jar
 
 %:
 	dh $@ --with javahelper
 
 override_dh_auto_build:
-	ant -DBUILD_TYPE=fcs -f build.xml all
+	ant build jar
 
 get-orig-source:
 	./debian/get-orig-source