[med-svn] r10686 - in trunk/packages/bio-formats/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat
Date: 2012-05-04 12:36:30 +0000 (Fri, 04 May 2012)
New Revision: 10686

Modified:
   trunk/packages/bio-formats/trunk/debian/control
   trunk/packages/bio-formats/trunk/debian/patches/ij.patch
   trunk/packages/bio-formats/trunk/debian/rules
Log:
Some progress now that netcdf is in exp

Modified: trunk/packages/bio-formats/trunk/debian/control
===================================================================
--- trunk/packages/bio-formats/trunk/debian/control	2012-05-04 11:53:55 UTC (rev 10685)
+++ trunk/packages/bio-formats/trunk/debian/control	2012-05-04 12:36:30 UTC (rev 10686)
@@ -6,7 +6,7 @@
 Build-Depends-Indep: default-jdk, default-jdk-doc, ant, bnd,
  libnet-luminis-build-plugin-java, testng, libslf4j-java, liblog4j1.2-java,
  imagej, libcommons-logging-java, libjgoodies-forms-java, velocity,
- libjai-imageio-core-java, libnetcdf-java
+ libnetcdf-java
 Standards-Version: 3.9.3
 Section: java
 Homepage: http://www.loci.wisc.edu/software/bio-formats

Modified: trunk/packages/bio-formats/trunk/debian/patches/ij.patch
===================================================================
--- trunk/packages/bio-formats/trunk/debian/patches/ij.patch	2012-05-04 11:53:55 UTC (rev 10685)
+++ trunk/packages/bio-formats/trunk/debian/patches/ij.patch	2012-05-04 12:36:30 UTC (rev 10686)
@@ -1,8 +1,6 @@
-Index: bio-formats-4.3.1/components/loci-plugins/build/src/loci/plugins/util/RecordedImageProcessor.java
-===================================================================
---- bio-formats-4.3.1.orig/components/loci-plugins/build/src/loci/plugins/util/RecordedImageProcessor.java	2012-04-10 15:01:12.000000000 +0200
-+++ bio-formats-4.3.1/components/loci-plugins/build/src/loci/plugins/util/RecordedImageProcessor.java	2012-04-10 15:02:16.000000000 +0200
-@@ -79,6 +79,7 @@
+--- bio-formats-4.3.3.orig/components/loci-plugins/src/loci/plugins/util/RecordedImageProcessor.java
++++ bio-formats-4.3.3/components/loci-plugins/src/loci/plugins/util/RecordedImageProcessor.java
+@@ -79,6 +79,7 @@ public class RecordedImageProcessor exte
      doRecording = true;
    }
  

Modified: trunk/packages/bio-formats/trunk/debian/rules
===================================================================
--- trunk/packages/bio-formats/trunk/debian/rules	2012-05-04 11:53:55 UTC (rev 10685)
+++ trunk/packages/bio-formats/trunk/debian/rules	2012-05-04 12:36:30 UTC (rev 10686)
@@ -1,15 +1,8 @@
 #!/usr/bin/make -f
 
 JAVA_HOME=/usr/lib/jvm/default-java
-# Help
-# ucar.ma2.Array is in netcdf-java
-# org.perf4j is in perf4j-0.9.13.jar
-#TODO=/home/mathieu/Projects/bio-formats/bio-formats/jar/loci-checks.jar:/home/mathieu/Projects/bio-formats/bio-formats/jar/netcdf-4.0.jar:/home/mathieu/Projects/bio-formats/bio-formats/jar/ome-java-deprecated.jar:/home/mathieu/Projects/bio-formats/bio-formats/jar/omero_client.jar:/home/mathieu/Projects/bio-formats/bio-formats/jar/perf4j-0.9.13.jar
-# Those jar gets generated as we go:
-TODO2=/home/mathieu/debian/debian-med/trunk/packages/bio-formats/trunk/bio-formats-4.3.1/artifacts/ome-xml.jar
-export CLASSPATH=/usr/share/java/clibwrapper_jiio.jar:/usr/share/java/velocity.jar:/usr/share/java/forms.jar:/usr/share/java/commons-logging.jar:/usr/share/java/ij.jar:/usr/share/java/slf4j-api.jar:/usr/share/java/bnd.jar:/usr/share/java/net.luminis.build.plugin.jar:/usr/share/java/testng.jar:$(TODO):$(TODO2):/usr/share/java/ncCore-4.3.jar
+export CLASSPATH=/usr/share/java/velocity.jar:/usr/share/java/forms.jar:/usr/share/java/commons-logging.jar:/usr/share/java/ij.jar:/usr/share/java/slf4j-api.jar:/usr/share/java/bnd.jar:/usr/share/java/net.luminis.build.plugin.jar:/usr/share/java/testng.jar:/usr/share/java/ncCore-4.3.jar
 ANT_OPTS=-Dbuild.sysclasspath=first
-#ANT_OPTS=-Dbuild.sysclasspath=only
 
 %:
 	dh $@ --with javahelper