Author: malat Date: 2012-04-10 14:48:30 +0000 (Tue, 10 Apr 2012) New Revision: 10357
Added: trunk/packages/bio-formats/trunk/debian/patches/b.patch trunk/packages/bio-formats/trunk/debian/patches/bla.patch trunk/packages/bio-formats/trunk/debian/patches/ij.patch Modified: trunk/packages/bio-formats/trunk/debian/control trunk/packages/bio-formats/trunk/debian/patches/series trunk/packages/bio-formats/trunk/debian/rules Log: Try to get pass the build failure Modified: trunk/packages/bio-formats/trunk/debian/control =================================================================== --- trunk/packages/bio-formats/trunk/debian/control 2012-04-10 12:01:06 UTC (rev 10356) +++ trunk/packages/bio-formats/trunk/debian/control 2012-04-10 14:48:30 UTC (rev 10357) @@ -1,18 +1,17 @@ Source: bio-formats Priority: optional Maintainer: Debian Med Packaging Team <[email protected]> -DM-Upload-Allowed: yes -Uploaders: Mathieu Malaterre <[email protected]> -Build-Depends: debhelper (>= 8), javahelper (>=0.25) +Uploaders: Mathieu Malaterre <[email protected]> +Build-Depends: debhelper (>= 8), javahelper (>=0.25), ant-contrib 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 -Standards-Version: 3.9.2 + libjai-imageio-core-java, libnetcdf-java +Standards-Version: 3.9.3 Section: java Homepage: http://www.loci.wisc.edu/software/bio-formats -Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/bio-formats/trunk/ -Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/bio-formats/trunk/ +Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/bio-formats/trunk/ +Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/bio-formats/trunk/ Package: libbio-formats-java Added: trunk/packages/bio-formats/trunk/debian/patches/b.patch =================================================================== --- trunk/packages/bio-formats/trunk/debian/patches/b.patch (rev 0) +++ trunk/packages/bio-formats/trunk/debian/patches/b.patch 2012-04-10 14:48:30 UTC (rev 10357) @@ -0,0 +1,19 @@ +Index: bio-formats-4.3.1/ant/global.xml +=================================================================== +--- bio-formats-4.3.1.orig/ant/global.xml 2012-04-04 14:02:07.000000000 +0000 ++++ bio-formats-4.3.1/ant/global.xml 2012-04-10 13:34:42.000000000 +0000 +@@ -69,14 +69,6 @@ + <!--<taskdef resource="proguard/ant/task.properties" + classpath="${lib.dir}/proguard.jar"/>--> + +- <!-- +- OSGi Bundle Ant Task: +- https://opensource.luminis.net/wiki/display/SITE/OSGi+Bundle+Ant+Task +- https://opensource.luminis.net/wiki/display/SITE/Documentation +- --> +- <taskdef name="bundle" classname="net.luminis.build.plugin.bnd.BuildTask" +- classpath="${lib.dir}/net.luminis.build.plugin-0.2.0.jar"/> +- + <!-- Internal build targets --> + + <target name="info" depends="init"> Added: trunk/packages/bio-formats/trunk/debian/patches/bla.patch =================================================================== --- trunk/packages/bio-formats/trunk/debian/patches/bla.patch (rev 0) +++ trunk/packages/bio-formats/trunk/debian/patches/bla.patch 2012-04-10 14:48:30 UTC (rev 10357) @@ -0,0 +1,13 @@ +Index: bio-formats-4.3.1/ant/java.xml +=================================================================== +--- bio-formats-4.3.1.orig/ant/java.xml 2012-04-04 14:02:23.000000000 +0000 ++++ bio-formats-4.3.1/ant/java.xml 2012-04-10 12:51:42.000000000 +0000 +@@ -203,7 +203,7 @@ + <!-- Internal build targets --> + + <target name="init" +- depends="init-title, init-timestamp, init-version, init-manifest-cp"/> ++ depends="init-title, init-timestamp, init-version"/> + + <target name="init-manifest-cp"> + <!-- construct manifest classpath --> Added: trunk/packages/bio-formats/trunk/debian/patches/ij.patch =================================================================== --- trunk/packages/bio-formats/trunk/debian/patches/ij.patch (rev 0) +++ trunk/packages/bio-formats/trunk/debian/patches/ij.patch 2012-04-10 14:48:30 UTC (rev 10357) @@ -0,0 +1,12 @@ +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 @@ + doRecording = true; + } + ++ public void swapPixelArrays() {} + public RecordedImageProcessor(ImageProcessor proc, int channelNum, + ImageProcessor[] otherChannels) + { Modified: trunk/packages/bio-formats/trunk/debian/patches/series =================================================================== --- trunk/packages/bio-formats/trunk/debian/patches/series 2012-04-10 12:01:06 UTC (rev 10356) +++ trunk/packages/bio-formats/trunk/debian/patches/series 2012-04-10 14:48:30 UTC (rev 10357) @@ -1,2 +1,4 @@ remove_git.patch -hack_regex.patch +bla.patch +ij.patch +b.patch Modified: trunk/packages/bio-formats/trunk/debian/rules =================================================================== --- trunk/packages/bio-formats/trunk/debian/rules 2012-04-10 12:01:06 UTC (rev 10356) +++ trunk/packages/bio-formats/trunk/debian/rules 2012-04-10 14:48:30 UTC (rev 10357) @@ -4,18 +4,18 @@ # 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 +#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) +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 ANT_OPTS=-Dbuild.sysclasspath=first -ANT_OPTS=-Dbuild.sysclasspath=only +#ANT_OPTS=-Dbuild.sysclasspath=only %: - dh $@ --with ant + dh $@ #--with ant override_dh_auto_build: - mkdir jar + -mkdir jar ant $(ANT_OPTS) -f build.xml get-orig-source: _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
