This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository tika.
commit 02f0315ed380dfc7eda45b92b7c029b235478d30 Author: Markus Koschany <[email protected]> Date: Mon Nov 30 15:28:31 2015 +0000 Drop 07-metadata-extractor-2.7-compatibility.patch. Fixed upstream. --- .../07-metadata-extractor-2.7-compatibility.patch | 50 ---------------------- debian/patches/series | 1 - 2 files changed, 51 deletions(-) diff --git a/debian/patches/07-metadata-extractor-2.7-compatibility.patch b/debian/patches/07-metadata-extractor-2.7-compatibility.patch deleted file mode 100644 index 0e4f68c..0000000 --- a/debian/patches/07-metadata-extractor-2.7-compatibility.patch +++ /dev/null @@ -1,50 +0,0 @@ -Description: Upgrade metadata-extractor to version 2.7.2 -Origin: backport, https://svn.apache.org/r1666778 -Bug: https://issues.apache.org/jira/browse/TIKA-1576 ---- a/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java -+++ b/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java -@@ -36,7 +36,9 @@ - - import com.drew.imaging.jpeg.JpegMetadataReader; - import com.drew.imaging.jpeg.JpegProcessingException; -+import com.drew.imaging.jpeg.JpegSegmentType; - import com.drew.imaging.tiff.TiffMetadataReader; -+import com.drew.imaging.tiff.TiffProcessingException; - import com.drew.lang.GeoLocation; - import com.drew.lang.Rational; - import com.drew.metadata.Directory; -@@ -104,6 +106,8 @@ - handle(tiffMetadata); - } catch (MetadataException e) { - throw new TikaException("Can't read TIFF metadata", e); -+ } catch (TiffProcessingException e) { -+ throw new TikaException("Can't read TIFF metadata", e); - } - } - -@@ -218,11 +222,11 @@ - //Exif.Image.ImageLength Short 1 75 - // and the values are found in "Thumbnail Image Width" (and Height) from Metadata Extractor - set(directory, metadata, ExifThumbnailDirectory.TAG_THUMBNAIL_IMAGE_WIDTH, Metadata.IMAGE_WIDTH); -- set(directory, metadata, JpegDirectory.TAG_JPEG_IMAGE_WIDTH, Metadata.IMAGE_WIDTH); -+ set(directory, metadata, JpegDirectory.TAG_IMAGE_WIDTH, Metadata.IMAGE_WIDTH); - set(directory, metadata, ExifThumbnailDirectory.TAG_THUMBNAIL_IMAGE_HEIGHT, Metadata.IMAGE_LENGTH); -- set(directory, metadata, JpegDirectory.TAG_JPEG_IMAGE_HEIGHT, Metadata.IMAGE_LENGTH); -+ set(directory, metadata, JpegDirectory.TAG_IMAGE_HEIGHT, Metadata.IMAGE_LENGTH); - // Bits per sample, two methods of extracting, exif overrides jpeg -- set(directory, metadata, JpegDirectory.TAG_JPEG_DATA_PRECISION, Metadata.BITS_PER_SAMPLE); -+ set(directory, metadata, JpegDirectory.TAG_DATA_PRECISION, Metadata.BITS_PER_SAMPLE); - set(directory, metadata, ExifSubIFDDirectory.TAG_BITS_PER_SAMPLE, Metadata.BITS_PER_SAMPLE); - // Straightforward - set(directory, metadata, ExifSubIFDDirectory.TAG_SAMPLES_PER_PIXEL, Metadata.SAMPLES_PER_PIXEL); -@@ -242,8 +246,8 @@ - return directoryType == JpegCommentDirectory.class; - } - public void handle(Directory directory, Metadata metadata) throws MetadataException { -- if (directory.containsTag(JpegCommentDirectory.TAG_JPEG_COMMENT)) { -- metadata.add(TikaCoreProperties.COMMENTS, directory.getString(JpegCommentDirectory.TAG_JPEG_COMMENT)); -+ if (directory.containsTag(JpegCommentDirectory.TAG_COMMENT)) { -+ metadata.add(TikaCoreProperties.COMMENTS, directory.getString(JpegCommentDirectory.TAG_COMMENT)); - } - } - } diff --git a/debian/patches/series b/debian/patches/series index 9c6136e..0418cf5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,4 +3,3 @@ 03-ignore-netcdf.patch 05-osgi-compatibility.patch 06-optional-parser-dependencies.patch -07-metadata-extractor-2.7-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tika.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
