[tika] 01/02: Depend on libmetadata-extractor-java >= 2.7.2

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tika.

commit 338b1bccb9f348fd03b600212ad4eed74cab81ff
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun May 31 00:45:10 2015 +0200

    Depend on libmetadata-extractor-java >= 2.7.2
---
 debian/changelog                                   |  4 +-
 debian/control                                     |  2 +-
 .../07-metadata-extractor-2.7-compatibility.patch  | 50 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 95e15e7..e9f6416 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 tika (1.5-2) UNRELEASED; urgency=medium
 
-  * Tightened the dependency on libmetadata-extractor-java
-    and libapache-poi-java
+  * Depend on libmetadata-extractor-java >= 2.7.2
+  * Tightened the dependency on libapache-poi-java
   * Added a build dependency on libvorbis-java
   * Standards-Version updated to 3.9.6 (no changes)
 
diff --git a/debian/control b/debian/control
index fe12f1f..7677830 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends-Indep: bnd (>= 1.43.0),
                      libjempbox-java,
                      libjuniversalchardet-java,
                      libmaven-bundle-plugin-java,
-                     libmetadata-extractor-java (>= 2.6.4-1~),
+                     libmetadata-extractor-java (>= 2.7.2-1~),
                      libpdfbox-java,
                      librome-java,
                      libvorbis-java,
diff --git a/debian/patches/07-metadata-extractor-2.7-compatibility.patch b/debian/patches/07-metadata-extractor-2.7-compatibility.patch
new file mode 100644
index 0000000..0e4f68c
--- /dev/null
+++ b/debian/patches/07-metadata-extractor-2.7-compatibility.patch
@@ -0,0 +1,50 @@
+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 453f23f..be6ada8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 04-ignore-jhighlight.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