[med-svn] [visad] 07/15: trying to get visad to compile

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository visad.

commit e92d0895dbc5bc0b0e3239323cf79419ba097481
Author: Mathieu Malaterre <malat at debian.org>
Date:   Mon Sep 19 15:41:24 2011 +0000

    trying to get visad to compile
---
 debian/control                                    |  2 +-
 debian/get-orig-source                            |  4 ++++
 debian/patches/fixopendap.patch                   | 13 +++++++++++++
 debian/patches/remove_uncompressinputstream.patch | 12 ++++++++++++
 debian/patches/series                             |  2 ++
 debian/rules                                      |  2 +-
 6 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 0209e15..1c3d6b0 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 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, libjava3d-java, libvecmath-java
+Build-Depends-Indep: default-jdk, default-jdk-doc, ant, libjava3d-java, libvecmath-java, libopendap-java
 Standards-Version: 3.9.2
 Homepage: http://www.ssec.wisc.edu/~billh/visad.html
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/visad/trunk/
diff --git a/debian/get-orig-source b/debian/get-orig-source
index 7a3bc1a..610c5cc 100755
--- a/debian/get-orig-source
+++ b/debian/get-orig-source
@@ -23,6 +23,10 @@ wget -c ftp://ftp.ssec.wisc.edu/pub/visad-2.0/visad_src.jar
 mkdir ${FOLDER}
 cd ${FOLDER}
 jar xvf ../visad_src.jar
+rm -rf dods
+rm -rf gnu
+rm -rf HTTPClient
+rm -rf ucar
 cd ..
 
 GZIP="--best --no-name" tar czf ${TARFILE} ${FOLDER}
diff --git a/debian/patches/fixopendap.patch b/debian/patches/fixopendap.patch
new file mode 100644
index 0000000..eaeced0
--- /dev/null
+++ b/debian/patches/fixopendap.patch
@@ -0,0 +1,13 @@
+Index: visad-2.0/visad/data/dods/Adapter.java
+===================================================================
+--- visad-2.0.orig/visad/data/dods/Adapter.java	2011-09-19 17:39:21.000000000 +0200
++++ visad-2.0/visad/data/dods/Adapter.java	2011-09-19 17:39:28.000000000 +0200
+@@ -22,7 +22,7 @@
+ 
+ package visad.data.dods;
+ 
+-import dods.dap.*;
++import opendap.*;
+ import visad.*;
+ import visad.data.*;
+ import visad.data.units.Parser;
diff --git a/debian/patches/remove_uncompressinputstream.patch b/debian/patches/remove_uncompressinputstream.patch
new file mode 100644
index 0000000..a40d6d8
--- /dev/null
+++ b/debian/patches/remove_uncompressinputstream.patch
@@ -0,0 +1,12 @@
+Index: visad-2.0/edu/wisc/ssec/mcidas/adde/AddeURLConnection.java
+===================================================================
+--- visad-2.0.orig/edu/wisc/ssec/mcidas/adde/AddeURLConnection.java	2011-09-19 17:36:01.000000000 +0200
++++ visad-2.0/edu/wisc/ssec/mcidas/adde/AddeURLConnection.java	2011-09-19 17:36:06.000000000 +0200
+@@ -40,7 +40,6 @@
+ import java.util.StringTokenizer;
+ import java.util.zip.GZIPInputStream;
+ import edu.wisc.ssec.mcidas.McIDASUtil;
+-import HTTPClient.UncompressInputStream;
+ 
+ /**
+  * This class extends URLConnection, providing the guts of the
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..18a1f10
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+remove_uncompressinputstream.patch
+fixopendap.patch
diff --git a/debian/rules b/debian/rules
index 6e7c59e..9db3445 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/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
+export CLASSPATH=/usr/share/java/j3dcore.jar:/usr/share/java/j3dutils.jar:/usr/share/java/vecmath.jar:/usr/share/java/opendap.jar
 
 %:
 	dh $@ --with javahelper

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/visad.git