The following commit has been merged in the master branch:
commit 615b2351e3fdd52e13ca76fe4e412347c26a2505
Author: David Paleino
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 Fri, 20 Dec 2013 22:58:34 +0100
+ -- David Paleino 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 @@
@@ -21,7 +21,7 @@ JARs and not depend on Internet connection.
-@@ -23,10 +24,16 @@
+@@ -22,10 +23,16 @@
@@ -39,9 +39,9 @@ JARs and not depend on Internet connection.
+
+ ** Used by Eclipse ant builder for updating
+@@ -40,14 +47,7 @@
+ -->
-
@@ -56,14 +56,18 @@ JARs and not depend on Internet connection.
-@@ -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}
-
+
+@@ -70,14 +71,7 @@ Build-Date: ${build.tstamp}
+
+
+
-
-
-
@@ -75,10 +79,9 @@ JARs and not depend on Internet connection.
Revision ${version.entry.commit.revision}
-
+@@ -85,7 +79,8 @@ Build-Date: ${build.tstamp}
-+
-
+
-
-
-
-+
-+
+@@ -95,6 +90,8 @@ Build-Date: ${build.tstamp}
+
+
+
++
++
-@@ -110,21 +108,18 @@ Build-Date: ${build.tstamp}
+@@ -168,10 +165,7 @@ Build-Date: ${build.tstamp}
@@ -103,15 +107,16 @@ JARs and not depend on Internet connection.
-
-
+
-
-
+
+
+
+@@ -180,11 +174,11 @@ Build-Date: ${build.tstamp}
-
-
-
-+
++
@@ -119,7 +124,7 @@ JARs and not depend on Internet connection.
-@@ -132,6 +127,7 @@ Build-Date: ${build.tstamp}
+@@ -192,6 +186,7 @@ Build-Date: ${build.tstamp}
@@ -127,7 +132,7 @@ JARs and not depend on Internet connection.
@@ -177,9 +182,9 @@ JARs and not depend on Internet connection.
-
+
-
-
-@@ -98,15 +98,14 @@
+
+
+@@ -103,15 +103,14 @@
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
