[med-svn] r11917 - in trunk/packages/bio-formats/trunk/debian: . patches
Mathieu Malaterre
malat at alioth.debian.org
Fri Jul 27 14:55:29 UTC 2012
Author: malat
Date: 2012-07-27 14:55:29 +0000 (Fri, 27 Jul 2012)
New Revision: 11917
Modified:
trunk/packages/bio-formats/trunk/debian/changelog
trunk/packages/bio-formats/trunk/debian/orig-tar.sh
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
trunk/packages/bio-formats/trunk/debian/patches/remove_git.patch
trunk/packages/bio-formats/trunk/debian/rules
Log:
Refresh patches
Modified: trunk/packages/bio-formats/trunk/debian/changelog
===================================================================
--- trunk/packages/bio-formats/trunk/debian/changelog 2012-07-27 13:54:14 UTC (rev 11916)
+++ trunk/packages/bio-formats/trunk/debian/changelog 2012-07-27 14:55:29 UTC (rev 11917)
@@ -1,4 +1,4 @@
-bio-formats (4.3.3-1) UNRELEASED; urgency=low
+bio-formats (4.4.1-1) UNRELEASED; urgency=low
* Initial Debian Upload (Closes: #641448)
Modified: trunk/packages/bio-formats/trunk/debian/orig-tar.sh
===================================================================
--- trunk/packages/bio-formats/trunk/debian/orig-tar.sh 2012-07-27 13:54:14 UTC (rev 11916)
+++ trunk/packages/bio-formats/trunk/debian/orig-tar.sh 2012-07-27 14:55:29 UTC (rev 11917)
@@ -1,7 +1,7 @@
#!/bin/sh -ex
# called by uscan with '--upstream-version' <version> <file>
-TAR=../bio-formats-$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/b.patch
===================================================================
--- trunk/packages/bio-formats/trunk/debian/patches/b.patch 2012-07-27 13:54:14 UTC (rev 11916)
+++ trunk/packages/bio-formats/trunk/debian/patches/b.patch 2012-07-27 14:55:29 UTC (rev 11917)
@@ -1,8 +1,8 @@
-Index: bio-formats-4.3.1/ant/global.xml
+Index: bio-formats-4.4.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 @@
+--- bio-formats-4.4.1.orig/ant/global.xml 2012-07-19 19:54:00.000000000 +0000
++++ bio-formats-4.4.1/ant/global.xml 2012-07-27 14:51:15.182868383 +0000
+@@ -65,14 +65,6 @@
<!--<taskdef resource="proguard/ant/task.properties"
classpath="${lib.dir}/proguard.jar"/>-->
Modified: trunk/packages/bio-formats/trunk/debian/patches/bla.patch
===================================================================
--- trunk/packages/bio-formats/trunk/debian/patches/bla.patch 2012-07-27 13:54:14 UTC (rev 11916)
+++ trunk/packages/bio-formats/trunk/debian/patches/bla.patch 2012-07-27 14:55:29 UTC (rev 11917)
@@ -1,8 +1,8 @@
-Index: bio-formats-4.3.1/ant/java.xml
+Index: bio-formats-4.4.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 @@
+--- bio-formats-4.4.1.orig/ant/java.xml 2012-07-19 19:54:00.000000000 +0000
++++ bio-formats-4.4.1/ant/java.xml 2012-07-27 14:51:12.214868487 +0000
+@@ -224,7 +224,7 @@
<!-- Internal build targets -->
<target name="init"
Modified: trunk/packages/bio-formats/trunk/debian/patches/ij.patch
===================================================================
--- trunk/packages/bio-formats/trunk/debian/patches/ij.patch 2012-07-27 13:54:14 UTC (rev 11916)
+++ trunk/packages/bio-formats/trunk/debian/patches/ij.patch 2012-07-27 14:55:29 UTC (rev 11917)
@@ -1,6 +1,8 @@
---- 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
+Index: bio-formats-4.4.1/components/loci-plugins/src/loci/plugins/util/RecordedImageProcessor.java
+===================================================================
+--- bio-formats-4.4.1.orig/components/loci-plugins/src/loci/plugins/util/RecordedImageProcessor.java 2012-07-19 19:54:00.000000000 +0000
++++ bio-formats-4.4.1/components/loci-plugins/src/loci/plugins/util/RecordedImageProcessor.java 2012-07-27 14:51:17.370868301 +0000
+@@ -81,6 +81,7 @@
doRecording = true;
}
Modified: trunk/packages/bio-formats/trunk/debian/patches/remove_git.patch
===================================================================
--- trunk/packages/bio-formats/trunk/debian/patches/remove_git.patch 2012-07-27 13:54:14 UTC (rev 11916)
+++ trunk/packages/bio-formats/trunk/debian/patches/remove_git.patch 2012-07-27 14:55:29 UTC (rev 11917)
@@ -1,7 +1,7 @@
-Index: bio-formats-4.3.3/ant/common.xml
+Index: bio-formats-4.4.1/ant/common.xml
===================================================================
---- 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
+--- bio-formats-4.4.1.orig/ant/common.xml 2012-07-27 14:51:05.774868720 +0000
++++ bio-formats-4.4.1/ant/common.xml 2012-07-27 14:51:08.738868615 +0000
@@ -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.3"/>
+ <property name="release.version" value="4.4.1"/>
Modified: trunk/packages/bio-formats/trunk/debian/rules
===================================================================
--- trunk/packages/bio-formats/trunk/debian/rules 2012-07-27 13:54:14 UTC (rev 11916)
+++ trunk/packages/bio-formats/trunk/debian/rules 2012-07-27 14:55:29 UTC (rev 11917)
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
JAVA_HOME=/usr/lib/jvm/default-java
-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
+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:/usr/share/java/ant-contrib.jar
ANT_OPTS=-Dbuild.sysclasspath=first
%:
More information about the debian-med-commit
mailing list