[josm] 04/06: Refresh patches.

[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 18305157679e52b6d87361d24fd170faf8449cd1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Oct 22 20:39:16 2014 +0200

    Refresh patches.
---
 debian/patches/00-build.patch      | 14 +++++++-------
 debian/patches/01-bts.patch        | 15 +++++++++++----
 debian/patches/02-elemstyles.patch |  2 +-
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index 7c654c8..6012beb 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -155,19 +155,19 @@ JARs and not depend on Internet connection.
      </target>
 -    <target name="build" depends="po/josm.pot,init">
 -        <gettext-merge keysFile="josm.pot" poDirectory="po"/>
-+  <target name="build.check">
-+    <condition property="build.run">
-+      <not><available file="build-timestamp"/></not>
-+    </condition>
-+  </target>
++    <target name="build.check">
++        <condition property="build.run">
++            <not><available file="build-timestamp"/></not>
++        </condition>
++    </target>
 +    <target name="build" depends="build.check,init" if="build.run">
          <antcall target="coretrans"/>
 -        <foreach param="path" target="plugintrans">
 -            <path>
--                <dirset dir="${plugin.dir}" includes="*"/>
+-                <dirset dir="${plugin.dir}" includes="*" excludes="00_*" />
 -            </path>
 -        </foreach>
-+     <touch file="build-timestamp"/>
++        <touch file="build-timestamp"/>
      </target>
      <target name="singleplugintrans" depends="po/josm.pot,init">
          <antcall target="plugintrans">
diff --git a/debian/patches/01-bts.patch b/debian/patches/01-bts.patch
index 4d35fbf..c655637 100644
--- a/debian/patches/01-bts.patch
+++ b/debian/patches/01-bts.patch
@@ -117,13 +117,20 @@ bug triaging.
              text = "{{{\n"+text+"}}}";
 --- a/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
 +++ b/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
-@@ -201,8 +201,7 @@ public final class ShowStatusReportActio
+@@ -28,6 +28,7 @@ import org.openstreetmap.josm.data.osm.D
+ import org.openstreetmap.josm.gui.ExtendedDialog;
+ import org.openstreetmap.josm.gui.widgets.JosmTextArea;
+ 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.Utils;
+@@ -199,7 +200,7 @@ public final class ShowStatusReportActio
  
          switch (ed.showDialog().getValue()) {
              case 1: Utils.copyToClipboard(text.toString()); break;
--            case 2: OpenBrowser.displayUrl(BugReportExceptionHandler.getBugReportUrl(
--                        Utils.strip(reportHeader)).toExternalForm()) ; break;
-+            case 2: OpenBrowser.displayUrl("http://bugs.debian.org") ; break;
+-            case 2: ReportBugAction.reportBug(reportHeader) ; break;
++            case 2: OpenBrowser.displayUrl("http://bugs.debian.org"); break;
          }
      }
  }
diff --git a/debian/patches/02-elemstyles.patch b/debian/patches/02-elemstyles.patch
index ef0891f..0208931 100644
--- a/debian/patches/02-elemstyles.patch
+++ b/debian/patches/02-elemstyles.patch
@@ -85,7 +85,7 @@ applications. This patch points josm to the shared directories.
  import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
  import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPriority;
  import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
-@@ -1506,12 +1507,22 @@ public final class TaggingPresetItems {
+@@ -1514,12 +1515,22 @@ public final class TaggingPresetItems {
      }
  
      protected static ImageIcon loadImageIcon(String iconName, File zipIcons, Integer maxSize) {

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