[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn6115+dfsg1-1-4-g615b235
David Paleino
dapal at debian.org
Fri Dec 20 22:02:50 UTC 2013
The following commit has been merged in the master branch:
commit 615b2351e3fdd52e13ca76fe4e412347c26a2505
Author: David Paleino <dapal at debian.org>
Date: Fri Dec 20 23:01:02 2013 +0100
Patches refreshed to apply to new upstream source
diff --git a/debian/changelog b/debian/changelog
index 759c86f..6733f73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
josm (0.0.svn6520+dfsg1-1) UNRELEASED; urgency=medium
* New tested snapshot (Closes: #725011)
+ * Patches refreshed to apply to new upstream source
- -- David Paleino <dapal at debian.org> Fri, 20 Dec 2013 22:58:34 +0100
+ -- David Paleino <dapal at debian.org> Fri, 20 Dec 2013 23:00:53 +0100
josm (0.0.svn6115+dfsg1-1) unstable; urgency=low
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index 04fa38b..7011065 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -7,13 +7,13 @@ Adjustements to the ant build.xml files, mainly to use system-provided
JARs and not depend on Internet connection.
---
- build.xml | 45 +++++++++++++++++++++------------------------
+ build.xml | 44 ++++++++++++++++++++------------------------
i18n/build.xml | 33 ++++++++++++++++-----------------
- 2 files changed, 37 insertions(+), 41 deletions(-)
+ 2 files changed, 36 insertions(+), 41 deletions(-)
--- josm.orig/build.xml
+++ josm/build.xml
-@@ -15,6 +15,7 @@
+@@ -14,6 +14,7 @@
<property name="build.dir" location="build"/>
<property name="javacc.home" location="tools"/>
<property name="mapcss.dir" location="${src.dir}/org/openstreetmap/josm/gui/mappaint/mapcss"/>
@@ -21,7 +21,7 @@ JARs and not depend on Internet connection.
<!-- build parameter: compression level (ant -Dclevel=N)
N ranges from 0 (no compression) to 9 (maximum compression)
default: 9 -->
-@@ -23,10 +24,16 @@
+@@ -22,10 +23,16 @@
</condition>
<!-- Java classpath addition (all jar files to compile tests with this) -->
<path id="classpath">
@@ -39,9 +39,9 @@ JARs and not depend on Internet connection.
+ <property name="classpathprop-colon" refid="classpath"/>
<!--
- ** Used by Eclipse ant builder for updating
-@@ -41,14 +48,7 @@
- -->
+ ** Used by Eclipse ant builder for updating
+@@ -40,14 +47,7 @@
+ -->
<target name="create-revision">
<property name="revision.dir" value="${build.dir}"/>
- <exec append="false" output="REVISION.XML" executable="svn" failifexecutionfails="false">
@@ -56,14 +56,18 @@ JARs and not depend on Internet connection.
<tstamp>
<format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
</tstamp>
-@@ -60,31 +60,29 @@
+@@ -59,6 +59,7 @@
Revision: ${version.entry.commit.revision}
Is-Local-Build: true
Build-Date: ${build.tstamp}
+Debian-Release: ${debian.version}
</echo>
</target>
- <target name="dist" depends="compile,create-revision">
+ <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"/>
@@ -75,10 +79,9 @@ JARs and not depend on Internet connection.
<property name="version.entry.commit.revision" value="UNKNOWN"/>
<property name="version.entry.commit.date" value="UNKNOWN"/>
<echo>Revision ${version.entry.commit.revision}</echo>
- <copy file="CONTRIBUTION" todir="build"/>
+@@ -85,7 +79,8 @@ Build-Date: ${build.tstamp}
<copy file="README" todir="build"/>
<copy file="LICENSE" todir="build"/>
-+
<!-- create josm-custom.jar -->
- <delete file="dist/josm-custom.jar"/>
+ <propertyregex property="classpathprop" input="${classpathprop-colon}" global="true"
@@ -86,15 +89,16 @@ 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>
- <attribute name="Main-class" value="JOSM"/>
- <attribute name="Main-Version" value="${version.entry.commit.revision} SVN"/>
- <attribute name="Main-Date" value="${version.entry.commit.date}"/>
-+ <attribute name="Debian-Release" value="${debian.version}"/>
-+ <attribute name="Class-Path" value="${classpathprop}"/>
+@@ -95,6 +90,8 @@ Build-Date: ${build.tstamp}
+ <attribute name="Permissions" value="all-permissions"/>
+ <attribute name="Codebase" value="josm.openstreetmap.de"/>
+ <attribute name="Application-Name" value="JOSM - Java OpenStreetMap Editor"/>
++ <attribute name="Debian-Release" value="${debian.version}"/>
++ <attribute name="Class-Path" value="${classpathprop}"/>
</manifest>
<zipfileset dir="images" prefix="images"/>
<zipfileset dir="data" prefix="data"/>
-@@ -110,21 +108,18 @@ Build-Date: ${build.tstamp}
+@@ -168,10 +165,7 @@ Build-Date: ${build.tstamp}
</target>
<target name="javacc" depends="init" unless="javacc.notRequired">
<mkdir dir="${mapcss.dir}/parsergen"/>
@@ -103,15 +107,16 @@ JARs and not depend on Internet connection.
- <arg value="${javacc.home}/javacc.jar"/>
- <arg value="javacc"/>
+ <exec append="false" executable="javacc" failifexecutionfails="true">
- <arg value="-OUTPUT_DIRECTORY=${mapcss.dir}/parsergen"/>
- <arg value="${mapcss.dir}/MapCSSParser.jj"/>
+ <arg value="-JDK_VERSION=1.6"/>
+ <arg value="-GRAMMAR_ENCODING=UTF-8"/>
+ <arg value="-UNICODE_INPUT"/>
+@@ -180,11 +174,11 @@ Build-Date: ${build.tstamp}
</exec>
- <!-- <javacc target="${mapcss.dir}/MapCSSParser.jj" javacchome="${javacc.home}" outputdirectory="${mapcss.dir}/parsergen"/>-->
</target>
<target name="compile" depends="init,javacc">
- <javac srcdir="src" includes="com/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.6" source="1.6" debug="on" includeantruntime="false" encoding="iso-8859-1"/>
- <javac srcdir="src" excludes="com/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.6" source="1.6" debug="on" includeantruntime="false" encoding="UTF-8">
-+ <javac srcdir="src" classpathref="classpath" excludes="com/**,oauth/**,org/apache/**" destdir="build" target="1.5" source="1.5" debug="on" encoding="UTF-8">
++ <javac srcdir="src" classpathref="classpath" excludes="com/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.6" source="1.6" debug="on" includeantruntime="false" encoding="UTF-8">
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:unchecked"/>
</javac>
@@ -119,7 +124,7 @@ JARs and not depend on Internet connection.
</target>
<target name="init">
<uptodate property="javacc.notRequired" targetfile="${mapcss.dir}/parsergen/MapCSSParser.java" >
-@@ -132,6 +127,7 @@ Build-Date: ${build.tstamp}
+@@ -192,6 +186,7 @@ Build-Date: ${build.tstamp}
</uptodate>
<mkdir dir="build"/>
<mkdir dir="dist"/>
@@ -127,7 +132,7 @@ JARs and not depend on Internet connection.
</target>
<target name="javadoc">
<javadoc destdir="javadoc"
-@@ -151,6 +147,7 @@ Build-Date: ${build.tstamp}
+@@ -211,6 +206,7 @@ Build-Date: ${build.tstamp}
<delete dir="build"/>
<delete dir="dist"/>
<delete dir="${mapcss.dir}/parsergen"/>
@@ -177,9 +182,9 @@ JARs and not depend on Internet connection.
- </foreach>
+ <touch file="build-timestamp"/>
</target>
- <target name="buildcore" depends="po/josm.pot,init">
- <gettext-merge keysFile="josm.pot" poDirectory="po"/>
-@@ -98,15 +98,14 @@
+ <target name="singleplugintrans" depends="po/josm.pot,init">
+ <antcall target="plugintrans">
+@@ -103,15 +103,14 @@
</if>
<delete dir="${po.build.dir}/plugin_${dir}"/>
</target>
diff --git a/debian/patches/01-bts.patch b/debian/patches/01-bts.patch
index b0f06a4..dfa6a84 100644
--- a/debian/patches/01-bts.patch
+++ b/debian/patches/01-bts.patch
@@ -8,13 +8,14 @@ bug triaging.
---
src/org/openstreetmap/josm/actions/AboutAction.java | 7 +++
+ src/org/openstreetmap/josm/actions/ShowStatusReportAction.java | 3 -
src/org/openstreetmap/josm/data/Version.java | 7 +++
src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java | 20 +++-------
- 3 files changed, 19 insertions(+), 15 deletions(-)
+ 4 files changed, 20 insertions(+), 17 deletions(-)
---- a/src/org/openstreetmap/josm/actions/AboutAction.java
-+++ b/src/org/openstreetmap/josm/actions/AboutAction.java
-@@ -8,6 +8,9 @@
+--- josm.orig/src/org/openstreetmap/josm/actions/AboutAction.java
++++ josm/src/org/openstreetmap/josm/actions/AboutAction.java
+@@ -8,6 +8,9 @@ import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
@@ -24,7 +25,7 @@ bug triaging.
import javax.swing.BorderFactory;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
-@@ -79,6 +82,8 @@
+@@ -79,6 +82,8 @@ public class AboutAction extends JosmAct
info.add(GBC.glue(0,10), GBC.eol());
info.add(new JLabel(tr("Version {0}", version.getVersionString())), GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
info.add(GBC.glue(0,5), GBC.eol());
@@ -33,8 +34,8 @@ bug triaging.
info.add(new JLabel(tr("Last change at {0}",version.getTime())), GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
info.add(GBC.glue(0,5), GBC.eol());
info.add(new JLabel(tr("Java Version {0}",System.getProperty("java.version"))), GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
-@@ -87,7 +92,7 @@
- info.add(new UrlLabel("http://josm.openstreetmap.de",2), GBC.eol().fill(GBC.HORIZONTAL));
+@@ -87,7 +92,7 @@ public class AboutAction extends JosmAct
+ info.add(new UrlLabel(Main.JOSM_WEBSITE,2), GBC.eol().fill(GBC.HORIZONTAL));
info.add(GBC.glue(0,5), GBC.eol());
info.add(new JLabel(tr("Bug Reports")), GBC.std().insets(10,0,10,0));
- info.add(BugReportExceptionHandler.getBugReportUrlLabel(Utils.strip(ShowStatusReportAction.getReportHeader())), GBC.eol().fill(GBC.HORIZONTAL));
@@ -42,9 +43,9 @@ bug triaging.
about.addTab(tr("Info"), info);
about.addTab(tr("Readme"), createScrollPane(readme));
---- a/src/org/openstreetmap/josm/data/Version.java
-+++ b/src/org/openstreetmap/josm/data/Version.java
-@@ -69,6 +69,7 @@
+--- josm.orig/src/org/openstreetmap/josm/data/Version.java
++++ josm/src/org/openstreetmap/josm/data/Version.java
+@@ -70,6 +70,7 @@ public class Version {
private int version;
private String releaseDescription;
@@ -52,7 +53,7 @@ bug triaging.
private String time;
private String buildName;
private boolean isLocalBuild;
-@@ -119,6 +120,8 @@
+@@ -120,6 +121,8 @@ public class Version {
version = JOSM_UNKNOWN_VERSION;
}
@@ -61,7 +62,7 @@ bug triaging.
// the last changed data
//
time = properties.get("Last Changed Date");
-@@ -175,6 +178,10 @@
+@@ -176,6 +179,10 @@ public class Version {
return version == 0 ? tr("UNKNOWN") : Integer.toString(version);
}
@@ -72,9 +73,9 @@ bug triaging.
/**
* Replies a text with the release attributes
*
---- a/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
-+++ b/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
-@@ -95,8 +95,8 @@
+--- josm.orig/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
++++ josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
+@@ -96,8 +96,8 @@ public final class BugReportExceptionHan
pnl.add(new JLabel(
"<html>"
+ tr("An unexpected exception occurred.<br>" +
@@ -85,13 +86,13 @@ bug triaging.
)
+ "</html>"), GBC.eol());
JCheckBox cbSuppress = null;
-@@ -132,21 +132,13 @@
+@@ -133,21 +133,13 @@ public final class BugReportExceptionHan
JPanel p = new JPanel(new GridBagLayout());
p.add(new JMultilineLabel(
- tr("You have encountered an error in JOSM. Before you file a bug report " +
- "make sure you have updated to the latest version of JOSM here:")), GBC.eol());
-- p.add(new UrlLabel("http://josm.openstreetmap.de",2), GBC.eop().insets(8,0,0,0));
+- p.add(new UrlLabel(Main.JOSM_WEBSITE,2), GBC.eop().insets(8,0,0,0));
+ tr("Please report a bug against JOSM.")), GBC.eol());
p.add(new JMultilineLabel(
- tr("You should also update your plugins. If neither of those help please " +
@@ -106,14 +107,14 @@ bug triaging.
p.add(new JMultilineLabel(
- tr("Alternatively, if that does not work you can manually fill in the information " +
- "below at this URL:")), GBC.eol());
-- p.add(new UrlLabel("http://josm.openstreetmap.de/newticket",2), GBC.eop().insets(8,0,0,0));
+- p.add(new UrlLabel(Main.JOSM_WEBSITE+"/newticket",2), GBC.eop().insets(8,0,0,0));
+ tr("Be sure to include the following information:")), GBC.eop());
if (Utils.copyToClipboard(text)) {
p.add(new JLabel(tr("(The text has already been copied to your clipboard.)")), GBC.eop());
}
---- a/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
-+++ b/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
-@@ -183,8 +183,7 @@
+--- josm.orig/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
++++ josm/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
+@@ -183,8 +183,7 @@ public final class ShowStatusReportActio
switch (ed.showDialog().getValue()) {
case 1: Utils.copyToClipboard(text.toString()); break;
diff --git a/debian/patches/02-elemstyles.patch b/debian/patches/02-elemstyles.patch
index 90d7902..4338ad8 100644
--- a/debian/patches/02-elemstyles.patch
+++ b/debian/patches/02-elemstyles.patch
@@ -8,13 +8,14 @@ the openstreetmap-map-icons-* packages, so they can be used also by other
applications. This patch points josm to the shared directories.
---
- src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java | 11 +++-
- src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java | 30 +++++++++---
- 2 files changed, 32 insertions(+), 9 deletions(-)
+ src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java | 11 ++++--
+ src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java | 14 ++++++--
+ src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java | 17 ++++++++--
+ 3 files changed, 33 insertions(+), 9 deletions(-)
---- a/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
-+++ b/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
-@@ -175,14 +175,19 @@
+--- 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 {
}
if (Main.pref.getBoolean("mappaint.icon.enable-defaults", true)) {
@@ -37,9 +38,9 @@ applications. This patch points josm to the shared directories.
public static void readFromPreferences() {
styles.clear();
---- a/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
-+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
-@@ -41,6 +41,7 @@
+--- 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;
import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
import org.openstreetmap.josm.gui.layer.Layer;
@@ -47,7 +48,7 @@ applications. This patch points josm to the shared directories.
import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Link;
import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Role;
-@@ -131,8 +132,15 @@
+@@ -144,8 +145,15 @@ public class TaggingPreset extends Abstr
* and the 16x16 icons for SMALL_ICON.
*/
public void setIcon(final String iconName) {
@@ -65,26 +66,26 @@ applications. This patch points josm to the shared directories.
imgProv.setDirs(s);
imgProv.setId("presets");
imgProv.setArchive(TaggingPresetReader.getZipIcons());
-@@ -149,7 +157,7 @@
+@@ -162,7 +170,7 @@ public class TaggingPreset extends Abstr
}
});
} else {
-- System.out.println("Could not get presets icon " + iconName);
-+ System.out.println("Could not get presets icon " + realIconName);
+- Main.warn("Could not get presets icon " + iconName);
++ Main.warn("Could not get presets icon " + realIconName);
}
}
});
---- a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
-+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
-@@ -45,6 +45,7 @@
+--- 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
+ 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.QuadStateCheckBox;
+import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
- import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPritority;
+ import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPriority;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
-@@ -1356,11 +1357,21 @@
+@@ -1401,11 +1402,21 @@ public final class TaggingPresetItems {
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 6be38fa..384f46b 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(-)
---- a/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
-+++ b/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
-@@ -75,7 +75,7 @@
+--- 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
@Override
public String getDefaultStyle() {
diff --git a/debian/patches/05-fix_version.patch b/debian/patches/05-fix_version.patch
index 13151c2..048c5b4 100644
--- a/debian/patches/05-fix_version.patch
+++ b/debian/patches/05-fix_version.patch
@@ -8,20 +8,20 @@ Forwarded: not-needed
src/org/openstreetmap/josm/data/Version.java | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
---- a/build.xml
-+++ b/build.xml
-@@ -79,7 +79,7 @@
+--- josm.orig/build.xml
++++ josm/build.xml
+@@ -85,7 +85,7 @@ Debian-Release: ${debian.version}
<!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
<manifest>
<attribute name="Main-class" value="JOSM"/>
- <attribute name="Main-Version" value="${version.entry.commit.revision} SVN"/>
+ <attribute name="Main-Version" value="${version.entry.commit.revision}"/>
<attribute name="Main-Date" value="${version.entry.commit.date}"/>
- <attribute name="Debian-Release" value="${debian.version}"/>
- <attribute name="Class-Path" value="${classpathprop}"/>
---- a/src/org/openstreetmap/josm/data/Version.java
-+++ b/src/org/openstreetmap/josm/data/Version.java
-@@ -237,9 +237,6 @@
+ <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 {
if (buildName != null) {
s += " " + buildName;
}
@@ -29,5 +29,5 @@ Forwarded: not-needed
- s += " SVN";
- }
String result = "JOSM/1.5 ("+ s+" "+LanguageInfo.getJOSMLocaleCode()+")";
- if (includeOsDetails) {
+ if (includeOsDetails && Main.platform != null) {
result += " " + Main.platform.getOSDescription();
diff --git a/debian/patches/06-move_data_out_of_jar.patch b/debian/patches/06-move_data_out_of_jar.patch
index e480427..5d2dfbf 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -11,11 +11,11 @@ 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(-)
---- a/build.xml
-+++ b/build.xml
-@@ -84,9 +84,9 @@
- <attribute name="Debian-Release" value="${debian.version}"/>
- <attribute name="Class-Path" value="${classpathprop}"/>
+--- josm.orig/build.xml
++++ josm/build.xml
+@@ -93,9 +93,9 @@ Debian-Release: ${debian.version}
+ <attribute name="Debian-Release" value="${debian.version}"/>
+ <attribute name="Class-Path" value="${classpathprop}"/>
</manifest>
- <zipfileset dir="images" prefix="images"/>
- <zipfileset dir="data" prefix="data"/>
@@ -26,17 +26,17 @@ 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"/> -->
---- a/src/org/openstreetmap/josm/tools/I18n.java
-+++ b/src/org/openstreetmap/josm/tools/I18n.java
-@@ -7,6 +7,7 @@
- import java.io.InputStream;
+--- 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;
import java.io.IOException;
+ import java.io.InputStream;
import java.net.URL;
+import java.net.MalformedURLException;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
-@@ -308,7 +309,11 @@
+@@ -314,7 +315,11 @@ public final class I18n {
}
private static URL getTranslationFile(String lang) {
@@ -49,9 +49,9 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698608
}
/**
---- a/src/org/openstreetmap/josm/io/MirroredInputStream.java
-+++ b/src/org/openstreetmap/josm/io/MirroredInputStream.java
-@@ -76,13 +76,20 @@
+--- 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
}
} catch (java.net.MalformedURLException e) {
if (name.startsWith("resource://")) {
--
Editor for OpenStreetMap
More information about the Pkg-osm-commits
mailing list