[med-svn] r10320 - trunk/packages/bio-formats/trunk/debian

[Mathieu Malaterre]

Author: malat
Date: 2012-04-04 14:05:12 +0000 (Wed, 04 Apr 2012)
New Revision: 10320

Modified:
   trunk/packages/bio-formats/trunk/debian/get-orig-source
   trunk/packages/bio-formats/trunk/debian/rules
   trunk/packages/bio-formats/trunk/debian/watch
Log:
Use ant instead of javahelper. Fix watch file, fix get-orig-source

Modified: trunk/packages/bio-formats/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/bio-formats/trunk/debian/get-orig-source	2012-04-04 13:18:21 UTC (rev 10319)
+++ trunk/packages/bio-formats/trunk/debian/get-orig-source	2012-04-04 14:05:12 UTC (rev 10320)
@@ -24,7 +24,9 @@
 
 FOLDER=${PACKAGE}-${VERSION}
 
-git clone git://dev.loci.wisc.edu/bio-formats.git ${FOLDER}
+#git clone git://dev.loci.wisc.edu/bio-formats.git ${FOLDER}
+# new git rep is on github:
+git clone git://github.com/openmicroscopy/bioformats.git ${FOLDER}
 cd ${FOLDER}
 git checkout v${REVISION}
 # some kind of dll ?

Modified: trunk/packages/bio-formats/trunk/debian/rules
===================================================================
--- trunk/packages/bio-formats/trunk/debian/rules	2012-04-04 13:18:21 UTC (rev 10319)
+++ trunk/packages/bio-formats/trunk/debian/rules	2012-04-04 14:05:12 UTC (rev 10320)
@@ -9,9 +9,10 @@
 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
+ANT_OPTS=-Dbuild.sysclasspath=only
 
 %:
-	dh $@ --with javahelper
+	dh $@ --with ant
 
 override_dh_auto_build:
 	mkdir jar

Modified: trunk/packages/bio-formats/trunk/debian/watch
===================================================================
--- trunk/packages/bio-formats/trunk/debian/watch	2012-04-04 13:18:21 UTC (rev 10319)
+++ trunk/packages/bio-formats/trunk/debian/watch	2012-04-04 14:05:12 UTC (rev 10320)
@@ -1,3 +1,3 @@
-# TODO need to check git tag since there is no upstream tarball
-# we could check binary release to get the version right
-# http://www.loci.wisc.edu/bio-formats/source-code
+version=3
+#http://githubredir.debian.net/github/openmicroscopy/bioformats
+https://github.com/openmicroscopy/bioformats/tags .*/tarball/v(\d.\d.\d)