This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository gpsprune.
commit dd59463208890d014c17e034ecb2d932915351ee Author: Bas Couwenberg <[email protected]> Date: Mon Jul 3 23:16:40 2017 +0200 Add patches to fix FTBFS with metadata extractor 2.10.1. Thanks to Markus Koschany for the initial patch. (closes: #866762) --- debian/changelog | 8 ++++ debian/control | 2 +- ...ata-extractor-2.10.1-disable-hasThumbnail.patch | 34 +++++++++++++ debian/patches/metadata-extractor-2.10.1.patch | 55 ++++++++++++++++++++++ debian/patches/series | 2 + 5 files changed, 100 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c92883c..f064674 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +gpsprune (18.6-2) UNRELEASED; urgency=medium + + * Add patches to fix FTBFS with metadata extractor 2.10.1. + Thanks to Markus Koschany for the initial patch. + (closes: #866762) + + -- Bas Couwenberg <[email protected]> Mon, 03 Jul 2017 23:15:49 +0200 + gpsprune (18.6-1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index c25b2a2..0cc63f8 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: ant, fastjar, libjava3d-java, libvecmath-java, - libmetadata-extractor-java (>= 2.7.2) + libmetadata-extractor-java (>= 2.10.1) Standards-Version: 3.9.8 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/gpsprune.git Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gpsprune.git diff --git a/debian/patches/metadata-extractor-2.10.1-disable-hasThumbnail.patch b/debian/patches/metadata-extractor-2.10.1-disable-hasThumbnail.patch new file mode 100644 index 0000000..55d3ab1 --- /dev/null +++ b/debian/patches/metadata-extractor-2.10.1-disable-hasThumbnail.patch @@ -0,0 +1,34 @@ +Description: Disable hasThumbnailData() call. + metadata extractor 2.10.1 no longer provides this method. +Author: Bas Couwenberg <[email protected]> +Bug-Debian: https://bugs.debian.org/866762 + +--- a/tim/prune/jpeg/ExternalExifLibrary.java ++++ b/tim/prune/jpeg/ExternalExifLibrary.java +@@ -110,6 +110,7 @@ public class ExternalExifLibrary impleme + } + } + ++ /* hasThumbnailData() is no longer support in metadata extractor 2.10.1 + if (metadata.containsDirectoryOfType(ExifThumbnailDirectory.class)) + { + ExifThumbnailDirectory exifdir = metadata.getFirstDirectoryOfType(ExifThumbnailDirectory.class); +@@ -124,6 +125,7 @@ public class ExternalExifLibrary impleme + data.setThumbnailImage(thumb); + } + } ++ */ + + } + catch (Exception e) { +--- a/tim/prune/load/JpegLoader.java ++++ b/tim/prune/load/JpegLoader.java +@@ -245,7 +245,7 @@ public class JpegLoader implements Runna + if (timestamp == null && jpegData.getDigitizedTimestamp() != null) { + timestamp = createTimestamp(jpegData.getDigitizedTimestamp()); + } +- photo.setExifThumbnail(jpegData.getThumbnailImage()); ++ //photo.setExifThumbnail(jpegData.getThumbnailImage()); + // Also extract orientation tag for setting rotation state of photo + photo.setRotation(jpegData.getRequiredRotation()); + // Set bearing, if any diff --git a/debian/patches/metadata-extractor-2.10.1.patch b/debian/patches/metadata-extractor-2.10.1.patch new file mode 100644 index 0000000..2f8c312 --- /dev/null +++ b/debian/patches/metadata-extractor-2.10.1.patch @@ -0,0 +1,55 @@ +Description: metadata extractor 2.10.1 support. +Author: Markus Koschany <[email protected]> +Bug-Debian: https://bugs.debian.org/866762 +Bug: https://github.com/activityworkshop/GpsPrune/issues/13 + +--- a/tim/prune/jpeg/ExternalExifLibrary.java ++++ b/tim/prune/jpeg/ExternalExifLibrary.java +@@ -34,9 +34,9 @@ public class ExternalExifLibrary impleme + try + { + Metadata metadata = ImageMetadataReader.readMetadata(inFile); +- if (metadata.containsDirectory(GpsDirectory.class)) ++ if (metadata.containsDirectoryOfType(GpsDirectory.class)) + { +- Directory gpsdir = metadata.getDirectory(GpsDirectory.class); ++ Directory gpsdir = metadata.getFirstDirectoryOfType(GpsDirectory.class); + if (gpsdir.containsTag(GpsDirectory.TAG_LATITUDE) + && gpsdir.containsTag(GpsDirectory.TAG_LONGITUDE) + && gpsdir.containsTag(GpsDirectory.TAG_LATITUDE_REF) +@@ -86,9 +86,9 @@ public class ExternalExifLibrary impleme + } + + // Tags from Exif directory +- if (metadata.containsDirectory(ExifSubIFDDirectory.class)) ++ if (metadata.containsDirectoryOfType(ExifSubIFDDirectory.class)) + { +- Directory exifdir = metadata.getDirectory(ExifSubIFDDirectory.class); ++ Directory exifdir = metadata.getFirstDirectoryOfType(ExifSubIFDDirectory.class); + + // Take time and date from exif tags + if (exifdir.containsTag(ExifSubIFDDirectory.TAG_DATETIME_ORIGINAL)) { +@@ -99,9 +99,9 @@ public class ExternalExifLibrary impleme + data.setDigitizedTimestamp(exifdir.getString(ExifSubIFDDirectory.TAG_DATETIME_DIGITIZED)); + } + } +- if (metadata.containsDirectory(ExifIFD0Directory.class)) ++ if (metadata.containsDirectoryOfType(ExifIFD0Directory.class)) + { +- Directory exifdir = metadata.getDirectory(ExifIFD0Directory.class); ++ Directory exifdir = metadata.getFirstDirectoryOfType(ExifIFD0Directory.class); + + // Photo rotation code + if (exifdir.containsTag(ExifIFD0Directory.TAG_ORIENTATION)) { +@@ -110,9 +110,9 @@ public class ExternalExifLibrary impleme + } + } + +- if (metadata.containsDirectory(ExifThumbnailDirectory.class)) ++ if (metadata.containsDirectoryOfType(ExifThumbnailDirectory.class)) + { +- ExifThumbnailDirectory exifdir = metadata.getDirectory(ExifThumbnailDirectory.class); ++ ExifThumbnailDirectory exifdir = metadata.getFirstDirectoryOfType(ExifThumbnailDirectory.class); + + // TODO: Check this thumbnail stuff + if (exifdir.hasThumbnailData()) diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..9e5a64e --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +metadata-extractor-2.10.1.patch +metadata-extractor-2.10.1-disable-hasThumbnail.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gpsprune.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
