[gpsprune] 04/05: Drop metadata-extractor.patch, applied upstream.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository gpsprune.

commit 828c0cf7f8f435915aefcf679d90379cc16d009e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jul 22 09:18:57 2015 +0200

    Drop metadata-extractor.patch, applied upstream.
---
 debian/changelog                        |  1 +
 debian/patches/metadata-extractor.patch | 71 ---------------------------------
 debian/patches/series                   |  1 -
 3 files changed, 1 insertion(+), 72 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 03cef8a..e4454c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 gpsprune (18-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop metadata-extractor.patch, applied upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 22 Jul 2015 09:14:40 +0200
 
diff --git a/debian/patches/metadata-extractor.patch b/debian/patches/metadata-extractor.patch
deleted file mode 100644
index 9ff6c7d..0000000
--- a/debian/patches/metadata-extractor.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Description: Rename symbols for metadata-extractor 2.7.2.
-Author: Bas Couwenberg <sebastic at debian.org>
-
---- a/tim/prune/jpeg/ExternalExifLibrary.java
-+++ b/tim/prune/jpeg/ExternalExifLibrary.java
-@@ -37,48 +37,48 @@ public class ExternalExifLibrary impleme
- 			if (metadata.containsDirectory(GpsDirectory.class))
- 			{
- 				Directory gpsdir = metadata.getDirectory(GpsDirectory.class);
--				if (gpsdir.containsTag(GpsDirectory.TAG_GPS_LATITUDE)
--					&& gpsdir.containsTag(GpsDirectory.TAG_GPS_LONGITUDE)
--					&& gpsdir.containsTag(GpsDirectory.TAG_GPS_LATITUDE_REF)
--					&& gpsdir.containsTag(GpsDirectory.TAG_GPS_LONGITUDE_REF))
-+				if (gpsdir.containsTag(GpsDirectory.TAG_LATITUDE)
-+					&& gpsdir.containsTag(GpsDirectory.TAG_LONGITUDE)
-+					&& gpsdir.containsTag(GpsDirectory.TAG_LATITUDE_REF)
-+					&& gpsdir.containsTag(GpsDirectory.TAG_LONGITUDE_REF))
- 				{
--					data.setLatitudeRef(gpsdir.getString(GpsDirectory.TAG_GPS_LATITUDE_REF));
--					Rational[] latRats = gpsdir.getRationalArray(GpsDirectory.TAG_GPS_LATITUDE);
-+					data.setLatitudeRef(gpsdir.getString(GpsDirectory.TAG_LATITUDE_REF));
-+					Rational[] latRats = gpsdir.getRationalArray(GpsDirectory.TAG_LATITUDE);
- 					double seconds = ExifGateway.convertToPositiveValue(latRats[2].getNumerator(), latRats[2].getDenominator());
- 					data.setLatitude(new double[] {latRats[0].doubleValue(),
- 						latRats[1].doubleValue(), seconds});
--					data.setLongitudeRef(gpsdir.getString(GpsDirectory.TAG_GPS_LONGITUDE_REF));
--					Rational[] lonRats = gpsdir.getRationalArray(GpsDirectory.TAG_GPS_LONGITUDE);
-+					data.setLongitudeRef(gpsdir.getString(GpsDirectory.TAG_LONGITUDE_REF));
-+					Rational[] lonRats = gpsdir.getRationalArray(GpsDirectory.TAG_LONGITUDE);
- 					seconds = ExifGateway.convertToPositiveValue(lonRats[2].getNumerator(), lonRats[2].getDenominator());
- 					data.setLongitude(new double[] {lonRats[0].doubleValue(),
- 						lonRats[1].doubleValue(), seconds});
- 				}
- 
- 				// Altitude (if present)
--				if (gpsdir.containsTag(GpsDirectory.TAG_GPS_ALTITUDE) && gpsdir.containsTag(GpsDirectory.TAG_GPS_ALTITUDE_REF))
-+				if (gpsdir.containsTag(GpsDirectory.TAG_ALTITUDE) && gpsdir.containsTag(GpsDirectory.TAG_ALTITUDE_REF))
- 				{
--					data.setAltitude(gpsdir.getRational(GpsDirectory.TAG_GPS_ALTITUDE).intValue());
--					byte altRef = (byte) gpsdir.getInt(GpsDirectory.TAG_GPS_ALTITUDE_REF);
-+					data.setAltitude(gpsdir.getRational(GpsDirectory.TAG_ALTITUDE).intValue());
-+					byte altRef = (byte) gpsdir.getInt(GpsDirectory.TAG_ALTITUDE_REF);
- 					data.setAltitudeRef(altRef);
- 				}
- 
- 				// Timestamp and datestamp (if present)
--				final int TAG_GPS_DATESTAMP = 0x001d;
--				if (gpsdir.containsTag(GpsDirectory.TAG_GPS_TIME_STAMP) && gpsdir.containsTag(TAG_GPS_DATESTAMP))
-+				final int TAG_DATE_STAMP = 0x001d;
-+				if (gpsdir.containsTag(GpsDirectory.TAG_TIME_STAMP) && gpsdir.containsTag(TAG_DATE_STAMP))
- 				{
--					Rational[] times = gpsdir.getRationalArray(GpsDirectory.TAG_GPS_TIME_STAMP);
-+					Rational[] times = gpsdir.getRationalArray(GpsDirectory.TAG_TIME_STAMP);
- 					data.setGpsTimestamp(new int[] {times[0].intValue(), times[1].intValue(),
- 						times[2].intValue()});
--					Rational[] dates = gpsdir.getRationalArray(TAG_GPS_DATESTAMP);
-+					Rational[] dates = gpsdir.getRationalArray(TAG_DATE_STAMP);
- 					if (dates != null) {
- 						data.setGpsDatestamp(new int[] {dates[0].intValue(), dates[1].intValue(), dates[2].intValue()});
- 					}
- 				}
- 
- 				// Image bearing (if present)
--				if (gpsdir.containsTag(GpsDirectory.TAG_GPS_IMG_DIRECTION) && gpsdir.containsTag(GpsDirectory.TAG_GPS_IMG_DIRECTION_REF))
-+				if (gpsdir.containsTag(GpsDirectory.TAG_IMG_DIRECTION) && gpsdir.containsTag(GpsDirectory.TAG_IMG_DIRECTION_REF))
- 				{
--					Rational bearing = gpsdir.getRational(GpsDirectory.TAG_GPS_IMG_DIRECTION);
-+					Rational bearing = gpsdir.getRational(GpsDirectory.TAG_IMG_DIRECTION);
- 					if (bearing != null) {
- 						data.setBearing(bearing.doubleValue());
- 					}
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ac2d4ce..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-metadata-extractor.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gpsprune.git