[med-svn] r7882 - in trunk/packages/visad/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-19 15:41:24 +0000 (Mon, 19 Sep 2011)
New Revision: 7882

Added:
   trunk/packages/visad/trunk/debian/patches/
   trunk/packages/visad/trunk/debian/patches/fixopendap.patch
   trunk/packages/visad/trunk/debian/patches/remove_uncompressinputstream.patch
   trunk/packages/visad/trunk/debian/patches/series
Modified:
   trunk/packages/visad/trunk/debian/control
   trunk/packages/visad/trunk/debian/get-orig-source
   trunk/packages/visad/trunk/debian/rules
Log:
trying to get visad to compile

Modified: trunk/packages/visad/trunk/debian/control
===================================================================
--- trunk/packages/visad/trunk/debian/control	2011-09-19 08:31:37 UTC (rev 7881)
+++ trunk/packages/visad/trunk/debian/control	2011-09-19 15:41:24 UTC (rev 7882)
@@ -5,7 +5,7 @@
 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/

Modified: trunk/packages/visad/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/visad/trunk/debian/get-orig-source	2011-09-19 08:31:37 UTC (rev 7881)
+++ trunk/packages/visad/trunk/debian/get-orig-source	2011-09-19 15:41:24 UTC (rev 7882)
@@ -23,6 +23,10 @@
 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}

Added: trunk/packages/visad/trunk/debian/patches/fixopendap.patch
===================================================================
--- trunk/packages/visad/trunk/debian/patches/fixopendap.patch	                        (rev 0)
+++ trunk/packages/visad/trunk/debian/patches/fixopendap.patch	2011-09-19 15:41:24 UTC (rev 7882)
@@ -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;

Added: trunk/packages/visad/trunk/debian/patches/remove_uncompressinputstream.patch
===================================================================
--- trunk/packages/visad/trunk/debian/patches/remove_uncompressinputstream.patch	                        (rev 0)
+++ trunk/packages/visad/trunk/debian/patches/remove_uncompressinputstream.patch	2011-09-19 15:41:24 UTC (rev 7882)
@@ -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

Added: trunk/packages/visad/trunk/debian/patches/series
===================================================================
--- trunk/packages/visad/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/visad/trunk/debian/patches/series	2011-09-19 15:41:24 UTC (rev 7882)
@@ -0,0 +1,2 @@
+remove_uncompressinputstream.patch
+fixopendap.patch

Modified: trunk/packages/visad/trunk/debian/rules
===================================================================
--- trunk/packages/visad/trunk/debian/rules	2011-09-19 08:31:37 UTC (rev 7881)
+++ trunk/packages/visad/trunk/debian/rules	2011-09-19 15:41:24 UTC (rev 7882)
@@ -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