[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn6502+dfsg1-1-5-g29886bc
The following commit has been merged in the master branch: commit 54a8c9e6f4ddada7787d0239d0e5db135dba5020 Merge: 001e1a47fe2df7550f96252553e9822645aab1ef 03b42e2ed8c6e823caa900ad2b4acfe8bf41bb05 Author: Andrew Shadura and...@shadura.me Date: Wed Jan 15 23:12:33 2014 +0100 Merge tag 'upstream/0.0.svn6687+dfsg1' Upstream version 0.0.svn6687+dfsg1 -- 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
[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn6502+dfsg1-1-5-g29886bc
The following commit has been merged in the master branch:
commit 30167ab578c307a86d9aaac2d30cf5702e1b70fa
Author: Andrew Shadura and...@shadura.me
Date: Wed Jan 15 23:26:57 2014 +0100
Rebase patches to the new upstream source
diff --git a/debian/changelog b/debian/changelog
index 10f53f5..85c9893 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+josm (0.0.svn6687+dfsg1-1) UNRELEASED; urgency=low
+
+ * New development snapshot.
+
+ -- Andrew Shadura andre...@debian.org Wed, 15 Jan 2014 23:14:20 +0100
+
josm (0.0.svn6502+dfsg1-1) unstable; urgency=medium
[ David Paleino ]
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index 7011065..aa81e09 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -11,8 +11,8 @@ JARs and not depend on Internet connection.
i18n/build.xml | 33 -
2 files changed, 36 insertions(+), 41 deletions(-)
josm.orig/build.xml
-+++ josm/build.xml
+--- a/build.xml
b/build.xml
@@ -14,6 +14,7 @@
property name=build.dir location=build/
property name=javacc.home location=tools/
@@ -40,46 +40,28 @@ JARs and not depend on Internet connection.
!--
** Used by Eclipse ant builder for updating
-@@ -40,14 +47,7 @@
+@@ -72,10 +79,9 @@
+ !--
+ ** Creates the REVISION file to be included in the distribution
--
- target name=create-revision
+-target name=create-revision depends=init-svn-revision-xml,
init-git-revision-xml
++target name=create-revision
property name=revision.dir value=${build.dir}/
--exec append=false output=REVISION.XML executable=svn
failifexecutionfails=false
--env key=LANG value=C/
--arg value=info/
--arg value=--xml/
--arg value=./
--/exec
-xmlproperty file=REVISION.XML prefix=version keepRoot=false
collapseAttributes=true/
-delete file=REVISION.XML/
+xmlproperty file=REVISION prefix=version keepRoot=false
collapseAttributes=true/
tstamp
format property=build.tstamp pattern=-MM-dd HH:mm:ss/
/tstamp
-@@ -59,6 +59,7 @@
+@@ -88,6 +94,7 @@
Revision: ${version.entry.commit.revision}
Is-Local-Build: true
Build-Date: ${build.tstamp}
+Debian-Release: ${debian.version}
/echo
/target
- target name=check-schemas
-@@ -70,14 +71,7 @@ Build-Date: ${build.tstamp}
- /schemavalidate
- /target
- target name=dist depends=compile,create-revision,check-schemas
--exec append=false output=REVISION executable=svn
failifexecutionfails=false
--env key=LANG value=C/
--arg value=info/
--arg value=--xml/
--arg value=./
--/exec
- xmlproperty file=REVISION prefix=version keepRoot=false
collapseAttributes=true/
--delete file=REVISION/
- property name=version.entry.commit.revision value=UNKNOWN/
- property name=version.entry.commit.date value=UNKNOWN/
- echoRevision ${version.entry.commit.revision}/echo
-@@ -85,7 +79,8 @@ Build-Date: ${build.tstamp}
+ !--
+@@ -110,7 +117,8 @@
copy file=README todir=build/
copy file=LICENSE todir=build/
!-- create josm-custom.jar --
@@ -89,7 +71,7 @@ JARs and not depend on Internet connection.
jar destfile=dist/josm-custom.jar basedir=build
level=${clevel}
!-- add attribute excludes=**/*BZip2*,**/*Bzip2* to create a
non-bzip2 supporting jar --
manifest
-@@ -95,6 +90,8 @@ Build-Date: ${build.tstamp}
+@@ -120,6 +128,8 @@
attribute name=Permissions value=all-permissions/
attribute name=Codebase value=josm.openstreetmap.de/
attribute name=Application-Name value=JOSM - Java
OpenStreetMap Editor/
@@ -98,7 +80,7 @@ JARs and not depend on Internet connection.
/manifest
zipfileset dir=images prefix=images/
zipfileset dir=data prefix=data/
-@@ -168,10 +165,7 @@ Build-Date: ${build.tstamp}
+@@ -193,10 +203,7 @@
/target
target name=javacc depends=init unless=javacc.notRequired
mkdir dir=${mapcss.dir}/parsergen/
@@ -109,8 +91,8 @@ JARs and not depend on Internet connection.
+exec append=false executable=javacc failifexecutionfails=true
arg value=-JDK_VERSION=1.6/
arg value=-GRAMMAR_ENCODING=UTF-8/
- arg value=-UNICODE_INPUT/
-@@ -180,11 +174,11 @@ Build-Date: ${build.tstamp}
+ arg value=-OUTPUT_DIRECTORY=${mapcss.dir}/parsergen/
+@@ -204,11 +211,11 @@
/exec
/target
target name=compile depends=init,javacc
@@ -124,7 +106,7 @@ JARs and not depend on Internet connection.
/target
target name=init
uptodate property=javacc.notRequired
targetfile=${mapcss.dir}/parsergen/MapCSSParser.java
-@@ -192,6 +186,7 @@ Build-Date: ${build.tstamp}
[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn6502+dfsg1-1-5-g29886bc
The following commit has been merged in the master branch:
commit 0de6632747e22828dd3c95c25dd816813cddbd4b
Author: Andrew Shadura and...@shadura.me
Date: Wed Jan 15 23:34:01 2014 +0100
Build against libmetadata-extractor-java 2.6.4
diff --git a/debian/control b/debian/control
index d647a64..975e6c2 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
, default-jdk
, libcommons-codec-java
, libgettext-commons-java (= 0.9.6)
- , libmetadata-extractor-java ( 2.4.0)
+ , libmetadata-extractor-java (= 2.6.4)
, libgettext-ant-tasks-java
, liboauth-signpost-java (= 1.2)
, libsvgsalamander-java
@@ -31,7 +31,7 @@ Depends:
openjdk-6-jre | sun-java6-jre | openjdk-7-jre
, libcommons-codec-java
, libgettext-commons-java (= 0.9.6)
- , libmetadata-extractor-java ( 2.4.0)
+ , libmetadata-extractor-java (= 2.6.4)
, liboauth-signpost-java (= 1.2)
, libsvgsalamander-java
, openstreetmap-map-icons-classic
diff --git a/debian/patches/07-downgrade-metadata-extractor.patch
b/debian/patches/07-downgrade-metadata-extractor.patch
deleted file mode 100644
index 6633997..000
--- a/debian/patches/07-downgrade-metadata-extractor.patch
+++ /dev/null
@@ -1,161 +0,0 @@
a/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
-+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
-@@ -69,7 +69,7 @@
- import com.drew.metadata.Directory;
- import com.drew.metadata.Metadata;
- import com.drew.metadata.MetadataException;
--import com.drew.metadata.exif.ExifIFD0Directory;
-+import com.drew.metadata.exif.ExifDirectory;
- import com.drew.metadata.exif.GpsDirectory;
-
- /**
-@@ -554,21 +554,17 @@
-
- try {
- metadata = JpegMetadataReader.readMetadata(e.getFile());
--dirExif = metadata.getDirectory(ExifIFD0Directory.class);
--dirGps = metadata.getDirectory(GpsDirectory.class);
-+dirExif = metadata.getDirectory(ExifDirectory.class);
-+dirGps = (GpsDirectory) metadata.getDirectory(GpsDirectory.class);
- } catch (CompoundException p) {
- e.setExifCoor(null);
- e.setPos(null);
- return;
--} catch (IOException p) {
--e.setExifCoor(null);
--e.setPos(null);
--return;
- }
-
- try {
- if (dirExif != null) {
--int orientation =
dirExif.getInt(ExifIFD0Directory.TAG_ORIENTATION);
-+int orientation =
dirExif.getInt(ExifDirectory.TAG_ORIENTATION);
- e.setExifOrientation(orientation);
- }
- } catch (MetadataException ex) {
-@@ -614,7 +610,12 @@
- // 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
--int[] timeStampComps =
dirGps.getIntArray(GpsDirectory.TAG_GPS_TIME_STAMP);
-+int[] timeStampComps = null;
-+try {
-+timeStampComps =
dirGps.getIntArray(GpsDirectory.TAG_GPS_TIME_STAMP);
-+} catch (MetadataException ex) {
-+// Do nothing
-+}
- if (timeStampComps != null) {
- int gpsHour = timeStampComps[0];
- int gpsMin = timeStampComps[1];
-@@ -623,7 +624,7 @@
-
- // 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.
--String dateStampStr =
dirGps.getString(GpsDirectory.TAG_GPS_DATE_STAMP);
-+String dateStampStr = dirGps.getString(0x001D /*
GpsDirectory.TAG_GPS_DATE_STAMP */);
- 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 @@
- import java.io.IOException;
- import java.text.ParseException;
- import java.util.Date;
-+import java.util.Iterator;
-
- import org.openstreetmap.josm.Main;
- import org.openstreetmap.josm.data.coor.LatLon;
-@@ -16,8 +17,7 @@
- import com.drew.metadata.Metadata;
- import com.drew.metadata.MetadataException;
- import com.drew.metadata.Tag;
--import com.drew.metadata.exif.ExifIFD0Directory;
--import com.drew.metadata.exif.ExifSubIFDDirectory;
-+import com.drew.metadata.exif.ExifDirectory;
- import com.drew.metadata.exif.GpsDirectory;
-
- /**
-@@ -42,14 +42,15 @@
- Metadata metadata = JpegMetadataReader.readMetadata(filename);
- String dateStr = null;
- OUTER:
--for (Directory dirIt : metadata.getDirectories()) {
--for (Tag tag : dirIt.getTags()) {
--if (tag.getTagType() ==
ExifSubIFDDirectory.TAG_DATETIME_ORIGINAL /* 0x9003 */) {
