Author: malat Date: 2012-04-10 15:37:10 +0000 (Tue, 10 Apr 2012) New Revision: 10359
Modified: trunk/packages/bio-formats/trunk/debian/changelog trunk/packages/bio-formats/trunk/debian/libbio-formats-java.jlibs trunk/packages/bio-formats/trunk/debian/orig-tar.sh trunk/packages/bio-formats/trunk/debian/patches/remove_git.patch trunk/packages/bio-formats/trunk/debian/patches/series trunk/packages/bio-formats/trunk/debian/rules Log: minor tweaks Modified: trunk/packages/bio-formats/trunk/debian/changelog =================================================================== --- trunk/packages/bio-formats/trunk/debian/changelog 2012-04-10 15:16:14 UTC (rev 10358) +++ trunk/packages/bio-formats/trunk/debian/changelog 2012-04-10 15:37:10 UTC (rev 10359) @@ -2,4 +2,4 @@ * Initial Debian Upload (Closes: #641448) - -- Mathieu Malaterre <[email protected]> Wed, 07 Sep 2011 17:46:40 +0200 + -- Mathieu Malaterre <[email protected]> Tue, 10 Apr 2012 17:21:38 +0200 Modified: trunk/packages/bio-formats/trunk/debian/libbio-formats-java.jlibs =================================================================== --- trunk/packages/bio-formats/trunk/debian/libbio-formats-java.jlibs 2012-04-10 15:16:14 UTC (rev 10358) +++ trunk/packages/bio-formats/trunk/debian/libbio-formats-java.jlibs 2012-04-10 15:37:10 UTC (rev 10359) @@ -1 +1,9 @@ -artifacts/*.jar +artifacts/loci-common.jar +artifacts/lwf-stubs.jar +artifacts/mdbtools-java.jar +artifacts/metakit.jar +artifacts/ome-xml.jar +artifacts/poi-loci.jar +artifacts/bio-formats.jar +artifacts/bf-autogen.jar +artifacts/loci_plugins.jar Modified: trunk/packages/bio-formats/trunk/debian/orig-tar.sh =================================================================== --- trunk/packages/bio-formats/trunk/debian/orig-tar.sh 2012-04-10 15:16:14 UTC (rev 10358) +++ trunk/packages/bio-formats/trunk/debian/orig-tar.sh 2012-04-10 15:37:10 UTC (rev 10359) @@ -1,7 +1,7 @@ #!/bin/sh -ex # called by uscan with '--upstream-version' <version> <file> -TAR=../bio-formats-java_$2.orig.tar.gz +TAR=../bio-formats-$2.orig.tar.gz DIR=bio-formats-$2 # clean up the upstream tarball Modified: trunk/packages/bio-formats/trunk/debian/patches/remove_git.patch =================================================================== --- trunk/packages/bio-formats/trunk/debian/patches/remove_git.patch 2012-04-10 15:16:14 UTC (rev 10358) +++ trunk/packages/bio-formats/trunk/debian/patches/remove_git.patch 2012-04-10 15:37:10 UTC (rev 10359) @@ -1,7 +1,7 @@ -Index: bio-formats-4.3.1/ant/common.xml +Index: bio-formats-4.3.3/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 +--- bio-formats-4.3.3.orig/ant/common.xml 2011-10-18 16:34:17.000000000 +0200 ++++ bio-formats-4.3.3/ant/common.xml 2012-04-10 17:16:55.069900403 +0200 @@ -34,14 +34,14 @@ <!-- check for Git versioning information --> <property name="git.path" value="${root.dir}/.git"/> @@ -27,4 +27,4 @@ + </if--> <!-- set release version from repository URL --> - <property name="release.version" value="4.3.1"/> + <property name="release.version" value="4.3.3"/> Modified: trunk/packages/bio-formats/trunk/debian/patches/series =================================================================== --- trunk/packages/bio-formats/trunk/debian/patches/series 2012-04-10 15:16:14 UTC (rev 10358) +++ trunk/packages/bio-formats/trunk/debian/patches/series 2012-04-10 15:37:10 UTC (rev 10359) @@ -1,4 +1,4 @@ remove_git.patch bla.patch +b.patch ij.patch -b.patch Modified: trunk/packages/bio-formats/trunk/debian/rules =================================================================== --- trunk/packages/bio-formats/trunk/debian/rules 2012-04-10 15:16:14 UTC (rev 10358) +++ trunk/packages/bio-formats/trunk/debian/rules 2012-04-10 15:37:10 UTC (rev 10359) @@ -12,11 +12,11 @@ #ANT_OPTS=-Dbuild.sysclasspath=only %: - dh $@ #--with ant + dh $@ --with javahelper override_dh_auto_build: -mkdir jar - ant $(ANT_OPTS) -f build.xml + ant $(ANT_OPTS) -f build.xml jar-autogen jar-common jar-formats jar-jai jar-loci-plugins jar-lwf-stubs jar-mdbtools jar-metakit jar-ome-xml jar-poi-loci get-orig-source: uscan --verbose --force-download _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
