[josm] 06/07: Refresh patches.

2017-04-03 Thread Bas Couwenberg 
This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository josm.

commit 5ccfc016356ff6285ab3da20f6851dfc0dfdce16
Author: Bas Couwenberg 
Date:   Mon Apr 3 08:04:46 2017 +0200

Refresh patches.
---
 debian/changelog  |  1 +
 debian/patches/00-build.patch | 39 +++
 debian/patches/01-bts.patch   |  4 +--
 debian/patches/03-default_look_and_feel.patch |  2 +-
 debian/patches/04-use_system_jmapviewer.patch |  2 +-
 debian/patches/05-fix_version.patch   |  2 +-
 debian/patches/06-move_data_out_of_jar.patch  |  2 +-
 debian/patches/08-use_noto_font.patch | 11 
 8 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ea61d32..e477334 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ josm (0.0.svn11826+dfsg-1) UNRELEASED; urgency=medium
   * Add josm-plugins to Conflicts, as it Breaks newer josm revisions.
   * Add proj-data to dependencies for grid shift files.
   * Update copyright for japicc.
+  * Refresh patches.
 
  -- Bas Couwenberg   Mon, 03 Apr 2017 07:42:45 +0200
 
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index c52b3ab..5596f7f 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -16,7 +16,7 @@ Forwarded: not-needed
 -
 +
 +
- 
+ 
  
  
@@ -52,7 +52,7 @@ Forwarded: not-needed
  
  
  
-@@ -106,8 +119,10 @@
+@@ -111,8 +124,10 @@
  
  # automatically generated by JOSM build.xml - do not edit
  Revision: ${version.entry.commit.revision}
@@ -64,7 +64,7 @@ Forwarded: not-needed
  
  
  
@@ -73,7 +73,7 @@ Forwarded: not-needed
  
  
  
-@@ -137,6 +152,8 @@ Build-Date: ${build.tstamp}
+@@ -142,6 +157,8 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -82,19 +82,21 @@ Forwarded: not-needed
  
  
  
-@@ -207,10 +224,7 @@ Build-Date: ${build.tstamp}
+@@ -212,38 +229,21 @@ Build-Date: ${build.tstamp}
  
  
  
--
--
--
--
+-
+-
 +
  
  
  
-@@ -221,26 +235,10 @@ Build-Date: ${build.tstamp}
+ 
+ 
+ 
+-
++
  
  
  
@@ -122,7 +124,7 @@ Forwarded: not-needed
  
  
  
-@@ -261,19 +259,13 @@ Build-Date: ${build.tstamp}
+@@ -264,19 +264,13 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -145,7 +147,7 @@ Forwarded: not-needed
  
  
  
-@@ -287,16 +279,12 @@ Build-Date: ${build.tstamp}
+@@ -290,16 +284,12 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -163,16 +165,19 @@ Forwarded: not-needed
  
  
  
-@@ -310,8 +298,6 @@ Build-Date: ${build.tstamp}
+@@ -313,11 +303,6 @@ Build-Date: ${build.tstamp}
  
  
  
 -
 -
+-
+-
+-
  
  
  
-@@ -325,6 +311,7 @@ Build-Date: ${build.tstamp}
+@@ -331,6 +316,7 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -180,7 +185,7 @@ Forwarded: not-needed
  
  
  
  
  
@@ -188,7 +193,7 @@ Forwarded: not-needed
  
  
  
-@@ -784,6 +772,7 @@ Build-Date: ${build.tstamp}
+@@ -808,6 +795,7 @@ Build-Date: ${build.tstamp}
  
  
  
diff --git a/debian/patches/01-bts.patch b/debian/patches/01-bts.patch
index c27bb55..9d34e74 100644
--- a/debian/patches/01-bts.patch
+++ b/debian/patches/01-bts.patch
@@ -66,7 +66,7 @@ Forwarded: not-needed
   *
 --- a/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
 +++ b/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
-@@ -35,6 +35,7 @@ import org.openstreetmap.josm.gui.prefer
+@@ -36,6 +36,7 @@ import org.openstreetmap.josm.gui.prefer
  import org.openstreetmap.josm.gui.util.GuiHelper;
  import org.openstreetmap.josm.io.OsmApi;
  import org.openstreetmap.josm.plugins.PluginHandler;
@@ -74,7 +74,7 @@ Forwarded: not-needed
  import org.openstreetmap.josm.tools.PlatformHookUnixoid;
  import org.openstreetmap.josm.tools.Shortcut;
  import org.openstreetmap.josm.tools.Utils;
-@@ -297,7 +298,7 @@ public final class ShowStatusReportActio
+@@ -294,7 +295,7 @@ public final class ShowStatusReportActio
  
  switch (ed.showDialog().getValue()) {
  case 1: ta.copyToClipboard(); break;
diff --git a/debian/patches/03-default_look_and_feel.patch 
b/debian/patches/03-default_look_and_feel.patch
index

[josm] 06/07: Refresh patches.

2015-12-31 Thread Sebastiaan Couwenberg 
This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository josm.

commit c4390dd483ceb0518da3d31118978721ec1502ef
Author: Bas Couwenberg 
Date:   Thu Dec 31 15:18:01 2015 +0100

Refresh patches.
---
 debian/changelog  |  1 +
 debian/patches/00-build.patch | 26 +-
 debian/patches/04-use_system_jmapviewer.patch |  2 +-
 debian/patches/05-fix_version.patch   |  2 +-
 debian/patches/06-move_data_out_of_jar.patch  |  4 ++--
 debian/patches/08-use_noto_font.patch |  2 +-
 6 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6450f75..92a8bf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ josm (0.0.svn9224+dfsg-1) UNRELEASED; urgency=medium
 
   * New tested snapshot.
   * Bump minimum required jmapviewer version to 1.14.
+  * Refresh patches.
 
  -- Bas Couwenberg   Thu, 31 Dec 2015 14:14:17 +0100
 
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index 161576e..42626e3 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -9,17 +9,17 @@ Forwarded: not-needed
 
 --- a/build.xml
 +++ b/build.xml
-@@ -14,7 +14,8 @@
- 
+@@ -15,7 +15,8 @@
  
  
+ 
 -
 +
 +
  
-@@ -25,6 +26,19 @@
+@@ -26,6 +27,19 @@
  
  
  
@@ -39,7 +39,7 @@ Forwarded: not-needed
  
  
@@ -52,7 +52,7 @@ Forwarded: not-needed
  
  
  
-@@ -85,8 +98,10 @@
+@@ -86,8 +99,10 @@
  
  # automatically generated by JOSM build.xml - do not edit
  Revision: ${version.entry.commit.revision}
@@ -64,7 +64,7 @@ Forwarded: not-needed
  
  
  
@@ -74,7 +74,7 @@ Forwarded: not-needed
  
  
  
-@@ -116,6 +132,8 @@ Build-Date: ${build.tstamp}
+@@ -117,6 +133,8 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -83,7 +83,7 @@ Forwarded: not-needed
  
  
  
-@@ -186,10 +204,7 @@ Build-Date: ${build.tstamp}
+@@ -187,10 +205,7 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -95,7 +95,7 @@ Forwarded: not-needed
  
  
  
-@@ -200,31 +215,19 @@ Build-Date: ${build.tstamp}
+@@ -201,31 +216,19 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -131,7 +131,7 @@ Forwarded: not-needed
  destdir="build" target="1.7" source="1.7" debug="on" 
includeantruntime="false" createMissingPackageInfoClass="false" 
encoding="UTF-8">
  
  
-@@ -241,7 +244,7 @@ Build-Date: ${build.tstamp}
+@@ -242,7 +245,7 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -140,7 +140,7 @@ Forwarded: not-needed
  destdir="build" target="1.7" source="1.7" debug="on" 
includeantruntime="false" createMissingPackageInfoClass="false" 
encoding="UTF-8">
  
  
-@@ -268,6 +271,7 @@ Build-Date: ${build.tstamp}
+@@ -269,6 +272,7 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -148,10 +148,10 @@ Forwarded: not-needed
  
  
  
+@@ -293,6 +297,7 @@ Build-Date: ${build.tstamp}
  
  
+ 
 +
  
  
diff --git a/debian/patches/04-use_system_jmapviewer.patch 
b/debian/patches/04-use_system_jmapviewer.patch
index e74df7e..f511d9d 100644
--- a/debian/patches/04-use_system_jmapviewer.patch
+++ b/debian/patches/04-use_system_jmapviewer.patch
@@ -5,7 +5,7 @@ Forwarded: not-needed
 
 --- a/build.xml
 +++ b/build.xml
-@@ -138,7 +138,6 @@ Debian-Release: ${debian.version}
+@@ -139,7 +139,6 @@ Debian-Release: ${debian.version}
  
  
  
diff --git a/debian/patches/05-fix_version.patch 
b/debian/patches/05-fix_version.patch
index 5149fbd..802bff3 100644
--- a/debian/patches/05-fix_version.patch
+++ b/debian/patches/05-fix_version.patch
@@ -8,7 +8,7 @@ Forwarded: not-needed
 
 --- a/build.xml
 +++ b/build.xml
-@@ -127,7 +127,7 @@ Debian-Release: ${debian.version}
+@@ -128,7 +128,7 @@ Debian-Release: ${debian.version}
  
  
  
diff --git a/debian/patches/06-move_data_out_of_jar.patch 
b/debian/patches/06-move_data_out_of_jar.patch
index d7af6f4..5c47ce3 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -29,7 +29,7 @@ Forwarded: not-needed
  /**
 --- a/src/org/openstreetmap/josm/io/CachedFile.java
 +++ b/src/org/openstreetmap/josm/io/CachedFile.java
-@@ -188,11 +188,17 @@ public class CachedFile {
+@@ -187,11 +187,17 @@ public class CachedFile {
  File file = getFile();
  if (file == null) {
  if (name.startsWith("resource://")) {
@@ -54,7 +54,7 @@ Forwarded: not-needed
  }
 --- a/build.xml
 +++ b/build.xml
-@@ -135,9 +135,9 @@