The following commit has been merged in the master branch:
commit e10a04ef831514516d66a91b713d1c8c250e87f0
Author: David Paleino <da...@debian.org>
Date: Thu Mar 6 00:24:07 2014 +0100
Added DEP-3 header to 07-downgrade-metadata-extractor.patch
diff --git a/debian/changelog b/debian/changelog
index 295e323..0d16fd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,10 +11,11 @@ josm (0.0.svn6502+dfsg3-1) UNRELEASED; urgency=medium
* Removed references to embedded jmapviewer in debian/copyright
* De-fuzzed 00-build.patch, 05-fix_version.patch and
06-move_data_out_of_jar.patch
+ * Added DEP-3 header to 07-downgrade-metadata-extractor.patch
* Bumped debhelper compatibility to 9
* Bumped Standards-Version to 3.9.5, no changes needed
- -- David Paleino <da...@debian.org> Thu, 06 Mar 2014 00:19:35 +0100
+ -- David Paleino <da...@debian.org> Thu, 06 Mar 2014 00:23:37 +0100
josm (0.0.svn6502+dfsg1-1) unstable; urgency=medium
diff --git a/debian/patches/07-downgrade-metadata-extractor.patch
b/debian/patches/07-downgrade-metadata-extractor.patch
index c37fa74..c29a47e 100644
--- a/debian/patches/07-downgrade-metadata-extractor.patch
+++ b/debian/patches/07-downgrade-metadata-extractor.patch
@@ -1,6 +1,16 @@
---- a/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
-+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
-@@ -68,7 +68,7 @@
+From: Andrew Shadura <andre...@debian.org>
+Subject: require older version of metadata-extractor
+Origin: vendor
+Forwarded: no
+
+---
+ src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java | 21 ++---
+ src/org/openstreetmap/josm/tools/ExifReader.java | 38
++++------
+ 2 files changed, 29 insertions(+), 30 deletions(-)
+
+--- josm.orig/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
++++ josm/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
+@@ -68,7 +68,7 @@ import com.drew.lang.CompoundException;
import com.drew.metadata.Directory;
import com.drew.metadata.Metadata;
import com.drew.metadata.MetadataException;
@@ -9,7 +19,7 @@
import com.drew.metadata.exif.GpsDirectory;
/**
-@@ -557,21 +557,17 @@
+@@ -557,21 +557,17 @@ public class GeoImageLayer extends Layer
try {
metadata = JpegMetadataReader.readMetadata(e.getFile());
@@ -34,7 +44,7 @@
e.setExifOrientation(orientation);
}
} catch (MetadataException ex) {
-@@ -617,7 +613,12 @@
+@@ -617,7 +613,12 @@ public class GeoImageLayer extends Layer
// 1) GPS_TIME_STAMP not set -> date/time will be null
// 2) GPS_DATE_STAMP not set -> use EXIF date or set to default
// 3) GPS_TIME_STAMP and GPS_DATE_STAMP are set
@@ -48,7 +58,7 @@
if (timeStampComps != null) {
int gpsHour = timeStampComps[0];
int gpsMin = timeStampComps[1];
-@@ -626,7 +627,7 @@
+@@ -626,7 +627,7 @@ public class GeoImageLayer extends Layer
// We have the time. Next step is to check if the GPS date stamp
is set.
// dirGps.getString() always succeeds, but the return value might
be null.
@@ -57,9 +67,9 @@
if (dateStampStr != null &&
dateStampStr.matches("^\\d+:\\d+:\\d+$")) {
String[] dateStampComps = dateStampStr.split(":");
cal.set(Calendar.YEAR, Integer.parseInt(dateStampComps[0]));
---- a/src/org/openstreetmap/josm/tools/ExifReader.java
-+++ b/src/org/openstreetmap/josm/tools/ExifReader.java
-@@ -5,6 +5,7 @@
+--- josm.orig/src/org/openstreetmap/josm/tools/ExifReader.java
++++ josm/src/org/openstreetmap/josm/tools/ExifReader.java
+@@ -5,6 +5,7 @@ import java.io.File;
import java.io.IOException;
import java.text.ParseException;
import java.util.Date;
@@ -67,7 +77,7 @@
import org.openstreetmap.josm.data.coor.LatLon;
-@@ -15,8 +16,7 @@
+@@ -15,8 +16,7 @@ import com.drew.metadata.Directory;
import com.drew.metadata.Metadata;
import com.drew.metadata.MetadataException;
import com.drew.metadata.Tag;
@@ -77,7 +87,7 @@
import com.drew.metadata.exif.GpsDirectory;
/**
-@@ -41,14 +41,15 @@
+@@ -41,14 +41,15 @@ public final class ExifReader {
Metadata metadata = JpegMetadataReader.readMetadata(filename);
String dateStr = null;
OUTER:
@@ -98,7 +108,7 @@
dateStr = tag.getDescription();
}
}
-@@ -83,14 +84,12 @@
+@@ -83,14 +84,12 @@ public final class ExifReader {
public static Integer readOrientation(File filename) {
try {
final Metadata metadata =
JpegMetadataReader.readMetadata(filename);
@@ -115,7 +125,7 @@
}
return null;
}
-@@ -104,12 +103,10 @@
+@@ -104,12 +103,10 @@ public final class ExifReader {
public static LatLon readLatLon(File filename) {
try {
final Metadata metadata =
JpegMetadataReader.readMetadata(filename);
@@ -129,7 +139,7 @@
} catch (MetadataException e) {
e.printStackTrace();
}
-@@ -141,12 +138,10 @@
+@@ -141,12 +138,10 @@ public final class ExifReader {
public static Double readDirection(File filename) {
try {
final Metadata metadata =
JpegMetadataReader.readMetadata(filename);
@@ -143,7 +153,7 @@
}
return null;
}
-@@ -159,9 +154,12 @@
+@@ -159,9 +154,12 @@ public final class ExifReader {
*/
public static Double readDirection(GpsDirectory dirGps) {
if (dirGps != null) {
--
Editor for OpenStreetMap
_______________________________________________
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
