[josm] 04/05: Refresh patches.

2018-03-04 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 fd04442f5772ffa3763c28c789554914b4af0daf
Author: Bas Couwenberg 
Date:   Sun Mar 4 19:02:34 2018 +0100

Refresh patches.
---
 debian/changelog  |  1 +
 debian/patches/00-build.patch | 28 +--
 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 +-
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8bf891c..48edbd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 josm (0.0.svn13500+dfsg-1) UNRELEASED; urgency=medium
 
   * New hotfix tested snapshot.
+  * Refresh patches.
 
  -- Bas Couwenberg   Sun, 04 Mar 2018 19:00:38 +0100
 
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index 2aec9e8..da04514 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -19,9 +19,9 @@ Forwarded: not-needed
  
  
  
-@@ -48,6 +49,19 @@
- 
- 
+@@ -55,6 +56,19 @@
+ 
+ 
  
 +
 +
@@ -39,7 +39,7 @@ Forwarded: not-needed
  
  
  
-@@ -110,10 +124,9 @@
+@@ -117,10 +131,9 @@
  
@@ -52,7 +52,7 @@ Forwarded: not-needed
  
  
  
-@@ -124,8 +137,10 @@
+@@ -131,8 +144,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
  
  
  
-@@ -155,6 +170,8 @@ Build-Date: ${build.tstamp}
+@@ -162,6 +177,8 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -82,7 +82,7 @@ Forwarded: not-needed
  
  
  
-@@ -229,43 +246,21 @@ Build-Date: ${build.tstamp}
+@@ -236,43 +253,21 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -129,7 +129,7 @@ Forwarded: not-needed
  
  
  
-@@ -286,21 +281,15 @@ Build-Date: ${build.tstamp}
+@@ -293,21 +288,15 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -154,7 +154,7 @@ Forwarded: not-needed
  
  
  
-@@ -314,19 +303,14 @@ Build-Date: ${build.tstamp}
+@@ -321,19 +310,14 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -175,7 +175,7 @@ Forwarded: not-needed
  
  
  
-@@ -340,13 +324,6 @@ Build-Date: ${build.tstamp}
+@@ -347,13 +331,6 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -189,7 +189,7 @@ Forwarded: not-needed
  
  
  
-@@ -361,6 +338,7 @@ Build-Date: ${build.tstamp}
+@@ -368,6 +345,7 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -197,7 +197,7 @@ Forwarded: not-needed
  
  
  
  
  
@@ -205,7 +205,7 @@ Forwarded: not-needed
  
  
  
-@@ -905,6 +884,7 @@ Build-Date: ${build.tstamp}
+@@ -913,6 +892,7 @@ Build-Date: ${build.tstamp}
  
  
  
diff --git a/debian/patches/04-use_system_jmapviewer.patch 
b/debian/patches/04-use_system_jmapviewer.patch
index d6bfafe..570cac1 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
-@@ -180,7 +180,6 @@ Debian-Release: ${debian.version}
+@@ -187,7 +187,6 @@ Debian-Release: ${debian.version}
  
  
  
diff --git a/debian/patches/05-fix_version.patch 
b/debian/patches/05-fix_version.patch
index 09f3cdf..4522a0d 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
-@@ -165,7 +165,7 @@ Debian-Release: ${debian.version}
+@@ -172,7 +172,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 3bc27f0..febd4e0 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -6,7 +6,7 @@ Forwarded: not-needed
 
 --- a/build.xml
 +++ b/build.xml
-@@ -177,9 +177,6 @@ Debian-Release: ${debian.version}
+@@ -184,9 +184,6 @@ Debian-Release: ${debian.version}
  
  
  

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/josm.git

___
Pkg-grass-devel

[josm] 04/05: Refresh patches.

2017-07-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 b79d938c9ba333ece49d4b398be37ef2e99a6b25
Author: Bas Couwenberg 
Date:   Mon Jul 3 07:46:42 2017 +0200

Refresh patches.
---
 debian/changelog  | 1 +
 debian/patches/00-build.patch | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 327120d..9a1691c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 josm (0.0.svn12450+dfsg-1) UNRELEASED; urgency=medium
 
   * New hotfix tested snapshot.
+  * Refresh patches.
 
  -- Bas Couwenberg   Mon, 03 Jul 2017 07:43:26 +0200
 
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index 387e3f3..3dfb061 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -13,7 +13,7 @@ Forwarded: not-needed
  
  
  
--
+-
 +
 +
  

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/josm.git

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

[josm] 04/05: Refresh patches.

2016-11-06 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 74572524dc3f3f805b9b4c34cc4f120d0b1c8d94
Author: Bas Couwenberg 
Date:   Mon Nov 7 07:56:27 2016 +0100

Refresh patches.
---
 debian/changelog  |  1 +
 debian/patches/00-build.patch |  4 +--
 debian/patches/01-bts.patch   | 12 -
 debian/patches/02-elemstyles.patch|  2 +-
 debian/patches/03-default_look_and_feel.patch |  4 +--
 debian/patches/06-move_data_out_of_jar.patch  | 36 ---
 debian/patches/08-use_noto_font.patch |  2 +-
 7 files changed, 13 insertions(+), 48 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 73abab0..960a3ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ josm (0.0.svn11223+dfsg-1) UNRELEASED; urgency=medium
 
   * New tested snapshot.
   * Use the Debian BTS instead of JOSM Trac in BugReportSender class.
+  * Refresh patches.
 
  -- Bas Couwenberg   Mon, 07 Nov 2016 07:47:22 +0100
 
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index ec615c1..1790eee 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -16,7 +16,7 @@ Forwarded: not-needed
 -
 +
 +
- 
+

[josm] 04/05: Refresh patches.

2016-05-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 398bae2e9ca7e8ed9f8057656a8526fc23f902ee
Author: Bas Couwenberg 
Date:   Tue May 31 00:00:32 2016 +0200

Refresh patches.
---
 debian/changelog  |  1 +
 debian/patches/00-build.patch |  2 +-
 debian/patches/01-bts.patch   | 14 +++---
 debian/patches/03-default_look_and_feel.patch |  2 +-
 debian/patches/06-move_data_out_of_jar.patch  |  2 +-
 debian/patches/08-use_noto_font.patch |  4 ++--
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d2a6534..0d79b3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 josm (0.0.svn10301+dfsg-1) UNRELEASED; urgency=medium
 
   * New tested snapshot.
+  * Refresh patches.
 
  -- Bas Couwenberg   Mon, 30 May 2016 23:34:39 +0200
 
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index a20ee43..9a0c6c6 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -155,7 +155,7 @@ Forwarded: not-needed
  
  
  
-@@ -711,6 +715,7 @@ Build-Date: ${build.tstamp}
+@@ -715,6 +719,7 @@ Build-Date: ${build.tstamp}
  
  
  
diff --git a/debian/patches/01-bts.patch b/debian/patches/01-bts.patch
index 90242d9..0c5bc2e 100644
--- a/debian/patches/01-bts.patch
+++ b/debian/patches/01-bts.patch
@@ -17,7 +17,7 @@ Forwarded: not-needed
  import javax.swing.BorderFactory;
  import javax.swing.ImageIcon;
  import javax.swing.JLabel;
-@@ -84,6 +87,8 @@ public class AboutAction extends JosmAct
+@@ -84,6 +87,8 @@ public final class AboutAction extends J
  "" +
  "" + tr("Version {0}", version.getVersionString()) + 
"" +
  "" +
@@ -26,7 +26,7 @@ Forwarded: not-needed
  "" + tr("Last change at {0}", version.getTime()) + "" +
  "" +
  "" + tr("Java Version {0}", 
System.getProperty("java.version")) + "" +
-@@ -93,6 +98,7 @@ public class AboutAction extends JosmAct
+@@ -93,6 +98,7 @@ public final class AboutAction extends J
  info.add(new JLabel(tr("Homepage")), GBC.std().insets(10, 0, 10, 0));
  info.add(new UrlLabel(Main.getJOSMWebsite(), 2), 
GBC.eol().fill(GBC.HORIZONTAL));
  info.add(GBC.glue(0, 5), GBC.eol());
@@ -77,7 +77,7 @@ Forwarded: not-needed
  );
  // Check user is running current tested version, the error may 
already be fixed
  int josmVersion = Version.getInstance().getVersion();
-@@ -204,24 +204,14 @@ public final class BugReportExceptionHan
+@@ -211,24 +211,14 @@ public final class BugReportExceptionHan
  
  JPanel p = new JPanel(new GridBagLayout());
  p.add(new JMultilineLabel(
@@ -108,20 +108,20 @@ Forwarded: not-needed
  DebugTextDisplay textarea = new DebugTextDisplay(text);
 --- a/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
 +++ b/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
-@@ -33,6 +33,7 @@ import org.openstreetmap.josm.gui.prefer
- import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
+@@ -34,6 +34,7 @@ import org.openstreetmap.josm.gui.prefer
  import 
org.openstreetmap.josm.gui.preferences.validator.ValidatorTagCheckerRulesPreference;
+ import org.openstreetmap.josm.io.OsmApi;
  import org.openstreetmap.josm.plugins.PluginHandler;
 +import org.openstreetmap.josm.tools.OpenBrowser;
  import org.openstreetmap.josm.tools.PlatformHookUnixoid;
  import org.openstreetmap.josm.tools.Shortcut;
  import org.openstreetmap.josm.tools.bugreport.BugReportSender;
-@@ -265,7 +266,7 @@ public final class ShowStatusReportActio
+@@ -270,7 +271,7 @@ public final class ShowStatusReportActio
  
  switch (ed.showDialog().getValue()) {
  case 1: ta.copyToClippboard(); break;
 -case 2: BugReportSender.reportBug(reportHeader); break;
 +case 2: OpenBrowser.displayUrl("https://bugs.debian.org/;); break;
+ default: // Do nothing
  }
  }
- }
diff --git a/debian/patches/03-default_look_and_feel.patch 
b/debian/patches/03-default_look_and_feel.patch
index 70ec96d..44d0e5c 100644
--- a/debian/patches/03-default_look_and_feel.patch
+++ b/debian/patches/03-default_look_and_feel.patch
@@ -6,7 +6,7 @@ Forwarded: not-needed
 
 --- a/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
 +++ b/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
-@@ -184,7 +184,7 @@ public class PlatformHookUnixoid impleme
+@@ -185,7 +185,7 @@ public class PlatformHookUnixoid impleme
  
  @Override
  public String getDefaultStyle() {
diff --git a/debian/patches/06-move_data_out_of_jar.patch 
b/debian/patches/06-move_data_out_of_jar.patch
index

[josm] 04/05: Refresh patches.

2016-05-04 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 04197d1456eed1fed86210d64a062a70f35206cd
Author: Bas Couwenberg 
Date:   Wed May 4 07:39:06 2016 +0200

Refresh patches.
---
 debian/changelog  | 1 +
 debian/patches/01-bts.patch   | 2 +-
 debian/patches/03-default_look_and_feel.patch | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 03ecc24..e387188 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 josm (0.0.svn10168+dfsg-1) UNRELEASED; urgency=medium
 
   * New hotfix tested snapshot.
+  * Refresh patches.
 
  -- Bas Couwenberg   Wed, 04 May 2016 07:36:00 +0200
 
diff --git a/debian/patches/01-bts.patch b/debian/patches/01-bts.patch
index 280d6f5..90242d9 100644
--- a/debian/patches/01-bts.patch
+++ b/debian/patches/01-bts.patch
@@ -116,7 +116,7 @@ Forwarded: not-needed
  import org.openstreetmap.josm.tools.PlatformHookUnixoid;
  import org.openstreetmap.josm.tools.Shortcut;
  import org.openstreetmap.josm.tools.bugreport.BugReportSender;
-@@ -262,7 +263,7 @@ public final class ShowStatusReportActio
+@@ -265,7 +266,7 @@ public final class ShowStatusReportActio
  
  switch (ed.showDialog().getValue()) {
  case 1: ta.copyToClippboard(); break;
diff --git a/debian/patches/03-default_look_and_feel.patch 
b/debian/patches/03-default_look_and_feel.patch
index 99ea9de..70ec96d 100644
--- a/debian/patches/03-default_look_and_feel.patch
+++ b/debian/patches/03-default_look_and_feel.patch
@@ -6,7 +6,7 @@ Forwarded: not-needed
 
 --- a/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
 +++ b/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
-@@ -166,7 +166,7 @@ public class PlatformHookUnixoid impleme
+@@ -184,7 +184,7 @@ public class PlatformHookUnixoid impleme
  
  @Override
  public String getDefaultStyle() {

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/josm.git

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

[josm] 04/05: Refresh patches.

2016-03-13 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 b668f4c2a64c8a7cf46c39d6514a759de6f26bfe
Author: Bas Couwenberg 
Date:   Sun Mar 13 18:59:37 2016 +0100

Refresh patches.
---
 debian/changelog   | 1 +
 debian/patches/02-elemstyles.patch | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e211433..d5eff5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 josm (0.0.svn9979+dfsg-1) UNRELEASED; urgency=medium
 
   * New tested snapshot.
+  * Refresh patches.
 
  -- Bas Couwenberg   Sun, 13 Mar 2016 18:57:04 +0100
 
diff --git a/debian/patches/02-elemstyles.patch 
b/debian/patches/02-elemstyles.patch
index 11251ac..c6845fc 100644
--- a/debian/patches/02-elemstyles.patch
+++ b/debian/patches/02-elemstyles.patch
@@ -7,7 +7,7 @@ Forwarded: not-needed
 
 --- a/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
 +++ b/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
-@@ -232,14 +232,19 @@ public final class MapPaintStyles {
+@@ -239,14 +239,19 @@ public final class MapPaintStyles {
  }
  
  if (Main.pref.getBoolean("mappaint.icon.enable-defaults", true)) {

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/josm.git

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

[josm] 04/05: Refresh patches.

2016-03-12 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 c5cee57982aff75b95ac9831aa73135d7c4f181f
Author: Bas Couwenberg 
Date:   Sat Mar 12 15:02:50 2016 +0100

Refresh patches.
---
 debian/changelog   | 1 +
 debian/patches/02-elemstyles.patch | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d00a1bb..3fd5d14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 josm (0.0.svn9963+dfsg-1) UNRELEASED; urgency=medium
 
   * New tested snapshot.
+  * Refresh patches.
 
  -- Bas Couwenberg   Sat, 12 Mar 2016 14:57:09 +0100
 
diff --git a/debian/patches/02-elemstyles.patch 
b/debian/patches/02-elemstyles.patch
index 1da0bf9..11251ac 100644
--- a/debian/patches/02-elemstyles.patch
+++ b/debian/patches/02-elemstyles.patch
@@ -85,7 +85,7 @@ Forwarded: not-needed
  import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
  import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
  import org.openstreetmap.josm.tools.ImageProvider;
-@@ -126,11 +128,21 @@ public abstract class TaggingPresetItem
+@@ -126,12 +128,22 @@ public abstract class TaggingPresetItem
  }
  
  protected static ImageIcon loadImageIcon(String iconName, File zipIcons, 
Integer maxSize) {
@@ -109,4 +109,5 @@ Forwarded: not-needed
 +}
 +return icon;
  }
- }
+ 
+ /**

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/josm.git

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

[josm] 04/05: Refresh patches.

2016-01-07 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 7dc8a2911cf92478be614697f481b08ac3684bdf
Author: Bas Couwenberg 
Date:   Thu Jan 7 21:25:31 2016 +0100

Refresh patches.
---
 debian/changelog |  1 +
 debian/patches/00-build.patch| 28 
 debian/patches/02-elemstyles.patch   |  2 +-
 debian/patches/06-move_data_out_of_jar.patch |  2 +-
 debian/patches/08-use_noto_font.patch|  8 
 5 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3a82f2b..b21ec6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 josm (0.0.svn9329+dfsg-1) UNRELEASED; urgency=medium
 
   * New tested snapshot.
+  * Refresh patches.
 
  -- Bas Couwenberg   Thu, 07 Jan 2016 00:24:05 +0100
 
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index ff881b3..f95e786 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -148,7 +148,7 @@ Forwarded: not-needed
  
  
  
  
  
@@ -156,7 +156,7 @@ Forwarded: not-needed
  
  
  
-@@ -658,6 +663,7 @@ Build-Date: ${build.tstamp}
+@@ -659,6 +664,7 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -186,38 +186,34 @@ Forwarded: not-needed
  
  
  
-@@ -51,7 +51,7 @@
- 
- 
+@@ -55,7 +55,7 @@
+ 
+ 
  
 -
 +
  
  
  
-@@ -92,14 +92,14 @@
+@@ -96,9 +96,14 @@
  
  
  
 -
+-
+-
 +
 +
 +
 +
 +
 +
- 
--
--
--
--
--
--
++
 +
  
- 
- 
-@@ -141,15 +141,14 @@
+ 
+ 
+@@ -147,15 +152,14 @@
  
  
  
diff --git a/debian/patches/02-elemstyles.patch 
b/debian/patches/02-elemstyles.patch
index a392e71..b60585d 100644
--- a/debian/patches/02-elemstyles.patch
+++ b/debian/patches/02-elemstyles.patch
@@ -7,7 +7,7 @@ Forwarded: not-needed
 
 --- a/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
 +++ b/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
-@@ -231,14 +231,19 @@ public final class MapPaintStyles {
+@@ -234,14 +234,19 @@ public final class MapPaintStyles {
  }
  
  if (Main.pref.getBoolean("mappaint.icon.enable-defaults", true)) {
diff --git a/debian/patches/06-move_data_out_of_jar.patch 
b/debian/patches/06-move_data_out_of_jar.patch
index 5c47ce3..ee89b2f 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
-@@ -187,11 +187,17 @@ public class CachedFile {
+@@ -186,11 +186,17 @@ public class CachedFile {
  File file = getFile();
  if (file == null) {
  if (name.startsWith("resource://")) {
diff --git a/debian/patches/08-use_noto_font.patch 
b/debian/patches/08-use_noto_font.patch
index c69d358..4d810f1 100644
--- a/debian/patches/08-use_noto_font.patch
+++ b/debian/patches/08-use_noto_font.patch
@@ -5,7 +5,7 @@ Forwarded: https://josm.openstreetmap.de/ticket/12085
 
 --- a/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
 +++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
-@@ -1530,7 +1530,7 @@ public class StyledMapRenderer extends A
+@@ -1532,7 +1532,7 @@ public class StyledMapRenderer extends A
  showNames = paintSettings.getShowNamesDistance() > circum;
  showIcons = paintSettings.getShowIconsDistance() > circum;
  isOutlineOnly = paintSettings.isOutlineOnly();
@@ -14,9 +14,9 @@ Forwarded: https://josm.openstreetmap.de/ticket/12085
  
  antialiasing = Main.pref.getBoolean("mappaint.use-antialiasing", 
true) ?
  RenderingHints.VALUE_ANTIALIAS_ON : 
RenderingHints.VALUE_ANTIALIAS_OFF;
 a/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java
-+++ b/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java
-@@ -120,7 +120,7 @@ public abstract class ElemStyle implemen
+--- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java
 b/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java
+@@ -123,7 +123,7 @@ public abstract class StyleElement imple
  synchronized (lock) {
  n = DEFAULT_FONT_NAME;
  if (n == null) {

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/josm.git

___
Pkg-grass-devel mailing list

[josm] 04/05: Refresh patches.

2015-02-01 Thread Bas Couwenberg 
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository josm.

commit fcc1a02908387b1c4c026a30afbc6aaa1f07c16d
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sun Feb 1 19:29:29 2015 +0100

Refresh patches.
---
 debian/changelog   |  1 +
 debian/patches/02-elemstyles.patch | 66 +++---
 2 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cb55c41..e752246 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ josm (0.0.svn7995+dfsg1-1) UNRELEASED; urgency=medium
 
   * New tested snapshot.
   * Drop runtime dependency on ant, its bzip2 support is no longer used.
+  * Refresh patches.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Sun, 01 Feb 2015 18:40:25 +0100
 
diff --git a/debian/patches/02-elemstyles.patch 
b/debian/patches/02-elemstyles.patch
index 80c41bf..306955b 100644
--- a/debian/patches/02-elemstyles.patch
+++ b/debian/patches/02-elemstyles.patch
@@ -78,36 +78,36 @@ applications. This patch points josm to the shared 
directories.
 --- a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
 +++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
 @@ -50,6 +50,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.mappaint.MapPaintStyles;
- import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
- import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPriority;
- import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
-@@ -1518,12 +1519,22 @@ public final class TaggingPresetItems {
- }
- 
- protected static ImageIcon loadImageIcon(String iconName, File zipIcons, 
Integer maxSize) {
--final CollectionString s = 
Main.pref.getCollection(taggingpreset.icon.sources, null);
--ImageProvider imgProv = new 
ImageProvider(iconName).setDirs(s).setId(presets).setArchive(zipIcons).setOptional(true);
-+LinkedListString s = new LinkedListString();
-+MapPaintStyles.addDebianDirs(s);
-+String realIconName = iconName;
-+if (iconName.startsWith(styles/standard/)) {
-+realIconName = iconName.replace(styles/standard/, );
-+}
-+ImageProvider imgProv = new 
ImageProvider(realIconName).setDirs(s).setId(presets).setArchive(zipIcons).setOptional(true);
- if (maxSize != null) {
- imgProv.setMaxSize(maxSize);
- }
--return imgProv.get();
-+ImageIcon icon = imgProv.get();
-+if (icon == null) {
-+System.out.println(Could not get presets icon  + realIconName);
-+icon = new ImageIcon(realIconName);
-+}
-+return icon;
- }
- 
- protected static Integer parseInteger(String str) {
+ 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.tagging.ac.AutoCompletingTextField;
+ import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPriority;
+ import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
+@@ -1521,12 +1522,22 @@ public final class TaggingPresetItems {
+ }
+ 
+ protected static ImageIcon loadImageIcon(String iconName, File zipIcons, 
Integer maxSize) {
+-final CollectionString s = 
Main.pref.getCollection(taggingpreset.icon.sources, null);
+-ImageProvider imgProv = new 
ImageProvider(iconName).setDirs(s).setId(presets).setArchive(zipIcons).setOptional(true);
++LinkedListString s = new LinkedListString();
++MapPaintStyles.addDebianDirs(s);
++String realIconName = iconName;
++if (iconName.startsWith(styles/standard/)) {
++realIconName = iconName.replace(styles/standard/, );
++}
++ImageProvider imgProv = new 
ImageProvider(realIconName).setDirs(s).setId(presets).setArchive(zipIcons).setOptional(true);
+ if (maxSize != null) {
+ imgProv.setMaxSize(maxSize);
+ }
+-return imgProv.get();
++ImageIcon icon = imgProv.get();
++if (icon == null) {
++System.out.println(Could not get presets icon  + realIconName);
++icon = new ImageIcon(realIconName);
++}
++return icon;
+ }
+ 
+ protected static Integer parseInteger(String str) {

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/josm.git

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel