[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn6502+dfsg1-1-5-g29886bc
Andrew Shadura
andrew at shadura.me
Wed Jan 15 22:58:14 UTC 2014
The following commit has been merged in the master branch:
commit 30167ab578c307a86d9aaac2d30cf5702e1b70fa
Author: Andrew Shadura <andrew at 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 <andrewsh at 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="yyyy-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"/>
- <echo>Revision ${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}
+@@ -216,6 +223,7 @@
</uptodate>
<mkdir dir="build"/>
<mkdir dir="dist"/>
@@ -132,7 +114,7 @@ JARs and not depend on Internet connection.
</target>
<target name="javadoc">
<javadoc destdir="javadoc"
-@@ -211,6 +206,7 @@ Build-Date: ${build.tstamp}
+@@ -235,6 +243,7 @@
<delete dir="build"/>
<delete dir="dist"/>
<delete dir="${mapcss.dir}/parsergen"/>
@@ -140,8 +122,8 @@ JARs and not depend on Internet connection.
</target>
<path id="test.classpath">
<fileset dir="${test.dir}/lib">
---- josm.orig/i18n/build.xml
-+++ josm/i18n/build.xml
+--- a/i18n/build.xml
++++ b/i18n/build.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<project name="JOSM i18n" default="build" basedir=".">
@@ -162,7 +144,7 @@ JARs and not depend on Internet connection.
<target name="init" description="Loads the Ant gettext and contrib tasks">
<taskdef name="gettext-extract" classname="org.xnap.commons.ant.gettext.GettextExtractKeysTask" classpath="${gettexttasks.jar}"/>
<taskdef name="gettext-merge" classname="org.xnap.commons.ant.gettext.GettextMergeKeysTask" classpath="${gettexttasks.jar}"/>
-@@ -50,14 +50,14 @@
+@@ -51,14 +51,14 @@
<fileset dir="${plugin.dir}" includes="**/*.java"/>
</gettext-extract>
</target>
@@ -184,7 +166,7 @@ JARs and not depend on Internet connection.
</target>
<target name="singleplugintrans" depends="po/josm.pot,init">
<antcall target="plugintrans">
-@@ -103,15 +103,14 @@
+@@ -108,15 +108,14 @@
</if>
<delete dir="${po.build.dir}/plugin_${dir}"/>
</target>
diff --git a/debian/patches/02-elemstyles.patch b/debian/patches/02-elemstyles.patch
index 4338ad8..67f17e5 100644
--- a/debian/patches/02-elemstyles.patch
+++ b/debian/patches/02-elemstyles.patch
@@ -13,9 +13,9 @@ applications. This patch points josm to the shared directories.
src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java | 17 ++++++++--
3 files changed, 33 insertions(+), 9 deletions(-)
---- josm.orig/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
-+++ josm/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
-@@ -178,14 +178,19 @@ public final class MapPaintStyles {
+--- a/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
++++ b/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
+@@ -182,14 +182,19 @@
}
if (Main.pref.getBoolean("mappaint.icon.enable-defaults", true)) {
@@ -38,17 +38,17 @@ applications. This patch points josm to the shared directories.
public static void readFromPreferences() {
styles.clear();
---- josm.orig/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
-+++ josm/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
-@@ -41,6 +41,7 @@ import org.openstreetmap.josm.gui.Extend
- import org.openstreetmap.josm.gui.MapView;
+--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
++++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
+@@ -43,6 +43,7 @@
+ import org.openstreetmap.josm.gui.dialogs.properties.PresetListPanel;
import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Link;
import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Role;
-@@ -144,8 +145,15 @@ public class TaggingPreset extends Abstr
+@@ -146,8 +147,15 @@
* and the 16x16 icons for SMALL_ICON.
*/
public void setIcon(final String iconName) {
@@ -66,7 +66,7 @@ applications. This patch points josm to the shared directories.
imgProv.setDirs(s);
imgProv.setId("presets");
imgProv.setArchive(TaggingPresetReader.getZipIcons());
-@@ -162,7 +170,7 @@ public class TaggingPreset extends Abstr
+@@ -164,7 +172,7 @@
}
});
} else {
@@ -75,17 +75,17 @@ applications. This patch points josm to the shared directories.
}
}
});
---- josm.orig/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
-+++ josm/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
-@@ -47,6 +47,7 @@ import org.openstreetmap.josm.data.osm.O
+--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
++++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
+@@ -48,6 +48,7 @@
import org.openstreetmap.josm.data.osm.OsmUtils;
import org.openstreetmap.josm.data.osm.Tag;
import org.openstreetmap.josm.data.preferences.BooleanProperty;
+import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
+ import org.openstreetmap.josm.gui.dialogs.properties.PresetListPanel;
+ import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
- import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPriority;
- import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
-@@ -1401,11 +1402,21 @@ public final class TaggingPresetItems {
+@@ -1435,11 +1436,21 @@
return returnValue;
}
protected static ImageIcon loadImageIcon(String iconName, File zipIcons, Integer maxSize) {
diff --git a/debian/patches/03-default_look_and_feel.patch b/debian/patches/03-default_look_and_feel.patch
index 384f46b..bf82835 100644
--- a/debian/patches/03-default_look_and_feel.patch
+++ b/debian/patches/03-default_look_and_feel.patch
@@ -9,9 +9,9 @@ Patch rewritten for new code, original patch was from Ubuntu's
src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---- josm.orig/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
-+++ josm/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
-@@ -82,7 +82,7 @@ public class PlatformHookUnixoid impleme
+--- a/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
++++ b/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
+@@ -94,7 +94,7 @@
@Override
public String getDefaultStyle() {
diff --git a/debian/patches/05-fix_version.patch b/debian/patches/05-fix_version.patch
index 048c5b4..58d50f8 100644
--- a/debian/patches/05-fix_version.patch
+++ b/debian/patches/05-fix_version.patch
@@ -8,9 +8,9 @@ Forwarded: not-needed
src/org/openstreetmap/josm/data/Version.java | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
---- josm.orig/build.xml
-+++ josm/build.xml
-@@ -85,7 +85,7 @@ Debian-Release: ${debian.version}
+--- a/build.xml
++++ b/build.xml
+@@ -123,7 +123,7 @@
<!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
<manifest>
<attribute name="Main-class" value="JOSM"/>
@@ -19,9 +19,9 @@ Forwarded: not-needed
<attribute name="Main-Date" value="${version.entry.commit.date}"/>
<attribute name="Permissions" value="all-permissions"/>
<attribute name="Codebase" value="josm.openstreetmap.de"/>
---- josm.orig/src/org/openstreetmap/josm/data/Version.java
-+++ josm/src/org/openstreetmap/josm/data/Version.java
-@@ -238,9 +238,6 @@ public class Version {
+--- a/src/org/openstreetmap/josm/data/Version.java
++++ b/src/org/openstreetmap/josm/data/Version.java
+@@ -238,9 +238,6 @@
if (buildName != null) {
s += " " + buildName;
}
diff --git a/debian/patches/06-move_data_out_of_jar.patch b/debian/patches/06-move_data_out_of_jar.patch
index 5d2dfbf..85f8064 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -11,9 +11,9 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698608
src/org/openstreetmap/josm/tools/I18n.java | 7 +++++-
3 files changed, 22 insertions(+), 10 deletions(-)
---- josm.orig/build.xml
-+++ josm/build.xml
-@@ -93,9 +93,9 @@ Debian-Release: ${debian.version}
+--- a/build.xml
++++ b/build.xml
+@@ -131,9 +131,9 @@
<attribute name="Debian-Release" value="${debian.version}"/>
<attribute name="Class-Path" value="${classpathprop}"/>
</manifest>
@@ -26,9 +26,9 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698608
<zipfileset dir="src/org/openstreetmap/gui/jmapviewer/images" prefix="org/openstreetmap/gui/jmapviewer/images"/>
<!-- All jar files necessary to run only JOSM (no tests) -->
<!-- <zipfileset src="lib/metadata-extractor-2.3.1-nosun.jar"/> -->
---- josm.orig/src/org/openstreetmap/josm/tools/I18n.java
-+++ josm/src/org/openstreetmap/josm/tools/I18n.java
-@@ -7,6 +7,7 @@ import java.io.FileInputStream;
+--- a/src/org/openstreetmap/josm/tools/I18n.java
++++ b/src/org/openstreetmap/josm/tools/I18n.java
+@@ -7,6 +7,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
@@ -36,7 +36,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698608
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
-@@ -314,7 +315,11 @@ public final class I18n {
+@@ -314,7 +315,11 @@
}
private static URL getTranslationFile(String lang) {
@@ -49,9 +49,9 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698608
}
/**
---- josm.orig/src/org/openstreetmap/josm/io/MirroredInputStream.java
-+++ josm/src/org/openstreetmap/josm/io/MirroredInputStream.java
-@@ -77,13 +77,20 @@ public class MirroredInputStream extends
+--- a/src/org/openstreetmap/josm/io/MirroredInputStream.java
++++ b/src/org/openstreetmap/josm/io/MirroredInputStream.java
+@@ -77,13 +77,20 @@
}
} catch (java.net.MalformedURLException e) {
if (name.startsWith("resource://")) {
diff --git a/debian/patches/07-downgrade-metadata-extractor.patch b/debian/patches/07-downgrade-metadata-extractor.patch
index c37fa74..6633997 100644
--- a/debian/patches/07-downgrade-metadata-extractor.patch
+++ b/debian/patches/07-downgrade-metadata-extractor.patch
@@ -1,6 +1,6 @@
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
-@@ -68,7 +68,7 @@
+@@ -69,7 +69,7 @@
import com.drew.metadata.Directory;
import com.drew.metadata.Metadata;
import com.drew.metadata.MetadataException;
@@ -9,7 +9,7 @@
import com.drew.metadata.exif.GpsDirectory;
/**
-@@ -557,21 +557,17 @@
+@@ -554,21 +554,17 @@
try {
metadata = JpegMetadataReader.readMetadata(e.getFile());
@@ -34,7 +34,7 @@
e.setExifOrientation(orientation);
}
} catch (MetadataException ex) {
-@@ -617,7 +613,12 @@
+@@ -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
@@ -48,7 +48,7 @@
if (timeStampComps != null) {
int gpsHour = timeStampComps[0];
int gpsMin = timeStampComps[1];
-@@ -626,7 +627,7 @@
+@@ -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.
@@ -65,9 +65,9 @@
import java.util.Date;
+import java.util.Iterator;
+ import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.coor.LatLon;
-
-@@ -15,8 +16,7 @@
+@@ -16,8 +17,7 @@
import com.drew.metadata.Metadata;
import com.drew.metadata.MetadataException;
import com.drew.metadata.Tag;
@@ -77,7 +77,7 @@
import com.drew.metadata.exif.GpsDirectory;
/**
-@@ -41,14 +41,15 @@
+@@ -42,14 +42,15 @@
Metadata metadata = JpegMetadataReader.readMetadata(filename);
String dateStr = null;
OUTER:
@@ -98,7 +98,7 @@
dateStr = tag.getDescription();
}
}
-@@ -83,14 +84,12 @@
+@@ -84,14 +85,12 @@
public static Integer readOrientation(File filename) {
try {
final Metadata metadata = JpegMetadataReader.readMetadata(filename);
@@ -107,15 +107,15 @@
+ final Directory dir = metadata.getDirectory(ExifDirectory.class);
+ return dir.getInt(ExifDirectory.TAG_ORIENTATION);
} catch (JpegProcessingException e) {
- e.printStackTrace();
+ Main.error(e);
} catch (MetadataException e) {
- e.printStackTrace();
+ Main.error(e);
- } catch (IOException e) {
-- e.printStackTrace();
+- Main.error(e);
}
return null;
}
-@@ -104,12 +103,10 @@
+@@ -105,12 +104,10 @@
public static LatLon readLatLon(File filename) {
try {
final Metadata metadata = JpegMetadataReader.readMetadata(filename);
@@ -123,13 +123,13 @@
+ final GpsDirectory dirGps = (GpsDirectory) metadata.getDirectory(GpsDirectory.class);
return readLatLon(dirGps);
} catch (JpegProcessingException e) {
- e.printStackTrace();
+ Main.error(e);
- } catch (IOException e) {
-- e.printStackTrace();
+- Main.error(e);
} catch (MetadataException e) {
- e.printStackTrace();
+ Main.error(e);
}
-@@ -141,12 +138,10 @@
+@@ -142,12 +139,10 @@
public static Double readDirection(File filename) {
try {
final Metadata metadata = JpegMetadataReader.readMetadata(filename);
@@ -137,13 +137,13 @@
+ final GpsDirectory dirGps = (GpsDirectory) metadata.getDirectory(GpsDirectory.class);
return readDirection(dirGps);
} catch (JpegProcessingException e) {
- e.printStackTrace();
+ Main.error(e);
- } catch (IOException e) {
-- e.printStackTrace();
+- Main.error(e);
}
return null;
}
-@@ -159,9 +154,12 @@
+@@ -160,9 +155,12 @@
*/
public static Double readDirection(GpsDirectory dirGps) {
if (dirGps != null) {
--
Editor for OpenStreetMap
More information about the Pkg-osm-commits
mailing list