[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3376-1-11-geb7fce8
David Paleino
dapal at debian.org
Tue Sep 7 09:40:20 UTC 2010
The following commit has been merged in the master branch:
commit d223d87a0effc27421bf7bad9cbcd75781f83079
Author: David Paleino <dapal at debian.org>
Date: Tue Sep 7 09:40:48 2010 +0200
debian/patches/* refreshed to cleanly apply to the new code
diff --git a/debian/changelog b/debian/changelog
index 2757f41..bdaa357 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
josm (0.0.svn3514-1) UNRELEASED; urgency=low
* New upstream snapshot
+ * debian/patches/* refreshed to cleanly apply to the new code
- -- David Paleino <dapal at debian.org> Tue, 07 Sep 2010 09:25:48 +0200
+ -- David Paleino <dapal at debian.org> Tue, 07 Sep 2010 09:40:14 +0200
josm (0.0.svn3376-1) unstable; urgency=low
diff --git a/debian/patches/10-build.patch b/debian/patches/10-build.patch
index 04b90d6..9ce2716 100644
--- a/debian/patches/10-build.patch
+++ b/debian/patches/10-build.patch
@@ -4,9 +4,9 @@ Subject: adjustments to the ant build file, mainly to not include
Forwarded: no
---
- build.xml | 36 +++++++++++++-----------------------
+ build.xml | 38 ++++++++++++++------------------------
i18n/build.xml | 26 +++++++++++++++++++++-----
- 2 files changed, 34 insertions(+), 28 deletions(-)
+ 2 files changed, 35 insertions(+), 29 deletions(-)
--- josm.orig/build.xml
+++ josm/build.xml
@@ -87,11 +87,19 @@ Forwarded: no
-
- <!-- All jar files necessary to run only JOSM (no tests) -->
- <zipfileset src="lib/metadata-extractor-2.3.1-nosun.jar" />
-- <zipfileset src="lib/signpost-core-1.1.jar" />
+- <zipfileset src="lib/signpost-core-1.2.1.1.jar" />
</jar>
</target>
-@@ -123,6 +111,7 @@ Build-Date: ${build.tstamp}
+@@ -116,13 +104,14 @@ Build-Date: ${build.tstamp}
+ <zipfileset dir="macosx" includes="JOSM.app/Contents/MacOS/JOSM" filemode="755"/>
+ </zip>
+ </target>
+-
++
+ <target name="compile" depends="init">
+ <javac srcdir="src" classpathref="classpath" destdir="build"
+ target="1.5" source="1.5" debug="on" encoding="UTF-8">
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:unchecked"/>
</javac>
diff --git a/debian/patches/20-bts.patch b/debian/patches/20-bts.patch
index 9fb1a55..bb7c782 100644
--- a/debian/patches/20-bts.patch
+++ b/debian/patches/20-bts.patch
@@ -6,8 +6,8 @@ Forwarded: no
---
src/org/openstreetmap/josm/actions/AboutAction.java | 7 +++
src/org/openstreetmap/josm/data/Version.java | 7 +++
- src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java | 20 +++-------
- 3 files changed, 19 insertions(+), 15 deletions(-)
+ src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java | 19 +++-------
+ 3 files changed, 19 insertions(+), 14 deletions(-)
--- josm.orig/src/org/openstreetmap/josm/actions/AboutAction.java
+++ josm/src/org/openstreetmap/josm/actions/AboutAction.java
@@ -71,40 +71,40 @@ Forwarded: no
*
--- josm.orig/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
+++ josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
-@@ -68,8 +68,8 @@ public final class BugReportExceptionHan
- Main.parent,
- "<html>"
- + tr("An unexpected exception occurred.<br>" +
-- "This is always a coding error. If you are running the latest<br>" +
-- "version of JOSM, please consider being kind and file a bug report."
-+ "Please consider being kind and file a bug report.\n" +
-+ "See http://bugs.debian.org for a guide how to do this."
- )
- + "</html>",
- tr("Unexpected Exception"),
-@@ -120,21 +120,13 @@ public final class BugReportExceptionHan
+@@ -74,8 +74,8 @@ public final class BugReportExceptionHan
+ Main.parent,
+ "<html>"
+ + tr("An unexpected exception occurred.<br>" +
+- "This is always a coding error. If you are running the latest<br>" +
+- "version of JOSM, please consider being kind and file a bug report."
++ "Please consider being kind and file a bug report.\n" +
++ "See http://bugs.debian.org for a guide how to do this."
+ )
+ + "</html>",
+ tr("Unexpected Exception"),
+@@ -126,21 +126,14 @@ 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/#Download"), 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 " +
-- "file a bug report in our bugtracker using this link:")), GBC.eol());
-- p.add(new UrlLabel(url.toString(), "http://josm.openstreetmap.de/josmticket?..."), GBC.eop().insets(8,0,0,0));
-+ tr("Include your steps to get to the error (as detailed as possible)!")), GBC.eol());
- p.add(new JMultilineLabel(
-- tr("There the error information provided below should already be " +
-- "filled in for you. Please include information on how to reproduce " +
-- "the error and try to supply as much detail as possible.")), GBC.eop());
-+ tr("Try updating to the newest version of JOSM and all plugins before reporting a bug.")), GBC.eol());
- 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"), GBC.eop().insets(8,0,0,0));
-+ tr("Be sure to include the following information:")), GBC.eop());
- try {
- Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(text), new ClipboardOwner(){
- public void lostOwnership(Clipboard clipboard, Transferable contents) {}
+ 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/#Download"), 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 " +
+- "file a bug report in our bugtracker using this link:")), GBC.eol());
++ tr("Include your steps to get to the error (as detailed as possible)!")), GBC.eol());
+ p.add(new UrlLabel(url.toString(), "http://josm.openstreetmap.de/josmticket?..."), GBC.eop().insets(8,0,0,0));
+ p.add(new JMultilineLabel(
+- tr("There the error information provided below should already be " +
+- "filled in for you. Please include information on how to reproduce " +
+- "the error and try to supply as much detail as possible.")), GBC.eop());
++ tr("Try updating to the newest version of JOSM and all plugins before reporting a bug.")), GBC.eol());
+ 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"), GBC.eop().insets(8,0,0,0));
++ tr("Be sure to include the following information:")), GBC.eop());
+ try {
+ Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(text), new ClipboardOwner(){
+ public void lostOwnership(Clipboard clipboard, Transferable contents) {}
diff --git a/debian/patches/50-preferences_world_readable.patch b/debian/patches/50-preferences_world_readable.patch
index fa740d2..4226162 100644
--- a/debian/patches/50-preferences_world_readable.patch
+++ b/debian/patches/50-preferences_world_readable.patch
@@ -8,7 +8,7 @@ Forwarded: https://josm.openstreetmap.de/ticket/4667
--- josm.orig/src/org/openstreetmap/josm/data/Preferences.java
+++ josm/src/org/openstreetmap/josm/data/Preferences.java
-@@ -393,6 +393,14 @@ public class Preferences {
+@@ -404,6 +404,14 @@ public class Preferences {
File tmpFile = new File(prefFile + "_tmp");
copyFile(tmpFile, prefFile);
tmpFile.delete();
@@ -23,7 +23,7 @@ Forwarded: https://josm.openstreetmap.de/ticket/4667
}
/**
-@@ -509,6 +517,13 @@ public class Preferences {
+@@ -524,6 +532,13 @@ public class Preferences {
System.err.println(tr("Warning: Failed to initialize preferences.Failed to reset preference file to default: {0}", getPreferenceFile()));
}
}
diff --git a/debian/patches/80-fix_images.patch b/debian/patches/80-fix_images.patch
index 414db48..58da3da 100644
--- a/debian/patches/80-fix_images.patch
+++ b/debian/patches/80-fix_images.patch
@@ -9,7 +9,7 @@ Forwarded: no
--- josm.orig/data/defaultpresets.xml
+++ josm/data/defaultpresets.xml
-@@ -2274,7 +2274,7 @@ are supplied, then "values" will be trea
+@@ -2581,7 +2581,7 @@ are supplied, then "values" will be trea
<key key="amenity" value="cinema" />
<text key="name" text="Name" default="" delete_if_empty="true" />
</item>
@@ -18,7 +18,7 @@ Forwarded: no
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
<label text="Edit Library" />
-@@ -2831,7 +2831,7 @@ are supplied, then "values" will be trea
+@@ -3119,7 +3119,7 @@ are supplied, then "values" will be trea
<label text="(Use international code, like +12-345-67890)" />
<space />
</item>
--
Java OpenStreetMap editor
More information about the Pkg-grass-devel
mailing list