Author: malat
Date: 2012-09-20 08:18:14 +0000 (Thu, 20 Sep 2012)
New Revision: 12239
Modified:
trunk/packages/bio-formats/trunk/debian/patches/bioformats-codeclib-removal.patch
Log:
quilt push -f
Modified: trunk/packages/bio-formats/trunk/debian/patches/bioformats-codeclib-removal.patch
===================================================================
--- trunk/packages/bio-formats/trunk/debian/patches/bioformats-codeclib-removal.patch 2012-09-20 08:14:59 UTC (rev 12238)
+++ trunk/packages/bio-formats/trunk/debian/patches/bioformats-codeclib-removal.patch 2012-09-20 08:18:14 UTC (rev 12239)
@@ -1,7 +1,7 @@
Index: bio-formats-4.4.2/ant/toplevel.properties
===================================================================
--- bio-formats-4.4.2.orig/ant/toplevel.properties 2012-08-22 20:24:05.000000000 +0000
-+++ bio-formats-4.4.2/ant/toplevel.properties 2012-09-20 08:12:11.100196124 +0000
++++ bio-formats-4.4.2/ant/toplevel.properties 2012-09-20 08:16:06.712187619 +0000
@@ -8,8 +8,7 @@
### Javadoc generation ###
@@ -23,7 +23,7 @@
Index: bio-formats-4.4.2/build.xml
===================================================================
--- bio-formats-4.4.2.orig/build.xml 2012-08-22 20:24:05.000000000 +0000
-+++ bio-formats-4.4.2/build.xml 2012-09-20 08:12:11.100196124 +0000
++++ bio-formats-4.4.2/build.xml 2012-09-20 08:16:06.712187619 +0000
@@ -215,13 +215,6 @@
Notes: used by LOCI plugins for ImageJ and OME plugins for ImageJ
License: Public domain
@@ -41,7 +41,7 @@
Index: bio-formats-4.4.2/components/forks/jai/build.properties
===================================================================
--- bio-formats-4.4.2.orig/components/forks/jai/build.properties 2012-08-22 20:24:05.000000000 +0000
-+++ bio-formats-4.4.2/components/forks/jai/build.properties 2012-09-20 08:12:11.100196124 +0000
++++ bio-formats-4.4.2/components/forks/jai/build.properties 2012-09-20 08:16:06.712187619 +0000
@@ -9,7 +9,7 @@
component.name = jai_imageio
component.jar = jai_imageio.jar
@@ -54,7 +54,7 @@
Index: bio-formats-4.4.2/components/forks/jai/pom.xml
===================================================================
--- bio-formats-4.4.2.orig/components/forks/jai/pom.xml 2012-08-22 20:24:05.000000000 +0000
-+++ bio-formats-4.4.2/components/forks/jai/pom.xml 2012-09-20 08:12:11.100196124 +0000
++++ bio-formats-4.4.2/components/forks/jai/pom.xml 2012-09-20 08:16:06.712187619 +0000
@@ -27,14 +27,6 @@
</license>
</licenses>
@@ -73,7 +73,7 @@
Index: bio-formats-4.4.2/components/forks/jai/src/com/sun/media/imageioimpl/common/PackageUtil.java
===================================================================
--- bio-formats-4.4.2.orig/components/forks/jai/src/com/sun/media/imageioimpl/common/PackageUtil.java 2012-08-22 20:24:05.000000000 +0000
-+++ bio-formats-4.4.2/components/forks/jai/src/com/sun/media/imageioimpl/common/PackageUtil.java 2012-09-20 08:12:11.104196124 +0000
++++ bio-formats-4.4.2/components/forks/jai/src/com/sun/media/imageioimpl/common/PackageUtil.java 2012-09-20 08:16:06.716187619 +0000
@@ -82,15 +82,9 @@
import java.security.AccessController;
@@ -5444,7 +5444,7 @@
Index: bio-formats-4.4.2/components/forks/jai/src/com/sun/media/imageioimpl/plugins/jpeg2000/J2KImageReaderSpi.java
===================================================================
--- bio-formats-4.4.2.orig/components/forks/jai/src/com/sun/media/imageioimpl/plugins/jpeg2000/J2KImageReaderSpi.java 2012-08-22 20:24:05.000000000 +0000
-+++ bio-formats-4.4.2/components/forks/jai/src/com/sun/media/imageioimpl/plugins/jpeg2000/J2KImageReaderSpi.java 2012-09-20 08:12:11.112196124 +0000
++++ bio-formats-4.4.2/components/forks/jai/src/com/sun/media/imageioimpl/plugins/jpeg2000/J2KImageReaderSpi.java 2012-09-20 08:16:06.724187619 +0000
@@ -91,8 +91,6 @@
import com.sun.media.imageioimpl.common.PackageUtil;
@@ -6562,7 +6562,7 @@
Index: bio-formats-4.4.2/components/forks/jai/src/com/sun/media/imageioimpl/plugins/jpeg2000/J2KImageWriterSpi.java
===================================================================
--- bio-formats-4.4.2.orig/components/forks/jai/src/com/sun/media/imageioimpl/plugins/jpeg2000/J2KImageWriterSpi.java 2012-08-22 20:24:05.000000000 +0000
-+++ bio-formats-4.4.2/components/forks/jai/src/com/sun/media/imageioimpl/plugins/jpeg2000/J2KImageWriterSpi.java 2012-09-20 08:12:11.116196124 +0000
++++ bio-formats-4.4.2/components/forks/jai/src/com/sun/media/imageioimpl/plugins/jpeg2000/J2KImageWriterSpi.java 2012-09-20 08:16:06.724187619 +0000
@@ -96,8 +96,6 @@
import com.sun.media.imageioimpl.common.PackageUtil;
@@ -14662,7 +14662,7 @@
Index: bio-formats-4.4.2/components/forks/jai/src/com/sun/media/imageioimpl/plugins/tiff/TIFFImageReader.java
===================================================================
--- bio-formats-4.4.2.orig/components/forks/jai/src/com/sun/media/imageioimpl/plugins/tiff/TIFFImageReader.java 2012-08-22 20:24:05.000000000 +0000
-+++ bio-formats-4.4.2/components/forks/jai/src/com/sun/media/imageioimpl/plugins/tiff/TIFFImageReader.java 2012-09-20 08:12:11.120196124 +0000
++++ bio-formats-4.4.2/components/forks/jai/src/com/sun/media/imageioimpl/plugins/tiff/TIFFImageReader.java 2012-09-20 08:16:06.732187619 +0000
@@ -1263,23 +1263,6 @@
}
} else if (compression ==
@@ -14714,7 +14714,7 @@
Index: bio-formats-4.4.2/components/forks/jai/src/com/sun/media/imageioimpl/plugins/tiff/TIFFImageWriter.java
===================================================================
--- bio-formats-4.4.2.orig/components/forks/jai/src/com/sun/media/imageioimpl/plugins/tiff/TIFFImageWriter.java 2012-08-22 20:24:05.000000000 +0000
-+++ bio-formats-4.4.2/components/forks/jai/src/com/sun/media/imageioimpl/plugins/tiff/TIFFImageWriter.java 2012-09-20 08:12:11.124196124 +0000
++++ bio-formats-4.4.2/components/forks/jai/src/com/sun/media/imageioimpl/plugins/tiff/TIFFImageWriter.java 2012-09-20 08:16:06.732187619 +0000
@@ -877,20 +877,6 @@
if (compressor == null) {
@@ -14781,7 +14781,7 @@
Index: bio-formats-4.4.2/scan-deps.pl
===================================================================
--- bio-formats-4.4.2.orig/scan-deps.pl 2012-08-22 20:24:05.000000000 +0000
-+++ bio-formats-4.4.2/scan-deps.pl 2012-09-20 08:12:11.124196124 +0000
++++ bio-formats-4.4.2/scan-deps.pl 2012-09-20 08:16:06.732187619 +0000
@@ -379,20 +379,6 @@
VERSION => "1.43o"
);
@@ -14811,16 +14811,3 @@
\%junit,
\%log4j,
\%netcdf,
-Index: bio-formats-4.4.2/ant/java.xml
-===================================================================
---- bio-formats-4.4.2.orig/ant/java.xml 2012-09-20 08:08:29.748204115 +0000
-+++ bio-formats-4.4.2/ant/java.xml 2012-09-20 08:08:32.356204021 +0000
-@@ -224,7 +224,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 -->