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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-12 13:41:21 +0000 (Mon, 12 Sep 2011)
New Revision: 7764

Added:
   trunk/packages/bio-formats/trunk/debian/patches/remove_git.patch
Modified:
   trunk/packages/bio-formats/trunk/debian/libbio-formats-java.jlibs
   trunk/packages/bio-formats/trunk/debian/patches/series
   trunk/packages/bio-formats/trunk/debian/rules
Log:
bio-formats now build on my machine

Modified: trunk/packages/bio-formats/trunk/debian/libbio-formats-java.jlibs
===================================================================
--- trunk/packages/bio-formats/trunk/debian/libbio-formats-java.jlibs	2011-09-12 12:48:32 UTC (rev 7763)
+++ trunk/packages/bio-formats/trunk/debian/libbio-formats-java.jlibs	2011-09-12 13:41:21 UTC (rev 7764)
@@ -1 +1 @@
-dist/*.jar
+artifacts/*.jar

Added: trunk/packages/bio-formats/trunk/debian/patches/remove_git.patch
===================================================================
--- trunk/packages/bio-formats/trunk/debian/patches/remove_git.patch	                        (rev 0)
+++ trunk/packages/bio-formats/trunk/debian/patches/remove_git.patch	2011-09-12 13:41:21 UTC (rev 7764)
@@ -0,0 +1,30 @@
+Index: bio-formats-4.3.1/ant/common.xml
+===================================================================
+--- bio-formats-4.3.1.orig/ant/common.xml	2011-09-12 15:10:07.000000000 +0200
++++ bio-formats-4.3.1/ant/common.xml	2011-09-12 15:10:45.000000000 +0200
+@@ -34,14 +34,14 @@
+     <!-- check for Git versioning information -->
+     <property name="git.path" value="${root.dir}/.git"/>
+     <available file="${git.path}" property="git.present"/>
+-    <if>
++    <!--if>
+       <isset property="git.present"/>
+       <then>
+         <exec executable="git" outputproperty="git.info"
+           failifexecutionfails="false">
+           <arg value="show"/>
+           <arg value="-s"/>
+-          <arg value="--abbrev-commit"/>
++          <arg value="-abbrev-commit"/>
+           <arg value="HEAD"/>
+         </exec>
+         <propertyregex property="vcs.revision" input="${git.info}"
+@@ -49,7 +49,7 @@
+         <propertyregex property="vcs.date"
+           input="${git.info}" regexp="Date: +([^\n]*)" select="\1"/>
+       </then>
+-    </if>
++    </if-->
+ 
+     <!-- set release version from repository URL -->
+     <property name="release.version" value="4.3.1"/>

Modified: trunk/packages/bio-formats/trunk/debian/patches/series
===================================================================
--- trunk/packages/bio-formats/trunk/debian/patches/series	2011-09-12 12:48:32 UTC (rev 7763)
+++ trunk/packages/bio-formats/trunk/debian/patches/series	2011-09-12 13:41:21 UTC (rev 7764)
@@ -1 +1,2 @@
+remove_git.patch
 debian-changes-4.3.1-1

Modified: trunk/packages/bio-formats/trunk/debian/rules
===================================================================
--- trunk/packages/bio-formats/trunk/debian/rules	2011-09-12 12:48:32 UTC (rev 7763)
+++ trunk/packages/bio-formats/trunk/debian/rules	2011-09-12 13:41:21 UTC (rev 7764)
@@ -1,9 +1,14 @@
 #!/usr/bin/make -f
 
 JAVA_HOME=/usr/lib/jvm/default-java
-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
-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)
-ANT_OPTS=-Dbuild.sysclasspath=only
+# 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)
+ANT_OPTS=-Dbuild.sysclasspath=first
 
 %:
 	dh $@ --with javahelper