[josm] 05/07: Refresh patches.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Fri Apr 29 20:43:24 UTC 2016


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository josm.

commit 0c7cd06b22902f6da9c9a5f0f0dc41ba42ab2227
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Apr 29 22:14:48 2016 +0200

    Refresh patches.
---
 debian/changelog                              |   1 +
 debian/patches/00-build.patch                 |   2 +-
 debian/patches/01-bts.patch                   | 102 +++++++++++++-------------
 debian/patches/03-default_look_and_feel.patch |   2 +-
 debian/patches/06-move_data_out_of_jar.patch  |   4 +-
 5 files changed, 55 insertions(+), 56 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aa532d2..3b631ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ josm (0.0.svn10161+dfsg-1) UNRELEASED; urgency=medium
   * Bump Standards-Version to 3.9.8, changes:
     additional icon sizes in hicolor theme.
   * Update copyright years for translations.
+  * Refresh patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 29 Apr 2016 21:32:19 +0200
 
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index 6cc6211..5cf6ad9 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -155,7 +155,7 @@ Forwarded: not-needed
      </target>
      <macrodef name="init-test-preferences">
          <attribute name="testfamily"/>
-@@ -710,6 +714,7 @@ Build-Date: ${build.tstamp}
+@@ -711,6 +715,7 @@ Build-Date: ${build.tstamp}
                  <pathelement path="${base.dir}"/>
                  <pathelement path="${proj-classpath}"/>
                  <pathelement path="${proj-build.dir}"/>
diff --git a/debian/patches/01-bts.patch b/debian/patches/01-bts.patch
index 76ca1d7..280d6f5 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;
-@@ -86,6 +89,8 @@ public class AboutAction extends JosmAct
+@@ -84,6 +87,8 @@ public class AboutAction extends JosmAct
                  "<p style='font-size:75%'></p>" +
                  "<p>" + tr("Version {0}", version.getVersionString()) + "</p>" +
                  "<p style='font-size:50%'></p>" +
@@ -26,12 +26,10 @@ Forwarded: not-needed
                  "<p>" + tr("Last change at {0}", version.getTime()) + "</p>" +
                  "<p style='font-size:50%'></p>" +
                  "<p>" + tr("Java Version {0}", System.getProperty("java.version")) + "</p>" +
-@@ -96,8 +101,7 @@ public class AboutAction extends JosmAct
+@@ -93,6 +98,7 @@ public class AboutAction extends JosmAct
+         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());
-         info.add(new JLabel(tr("Bug Reports")), GBC.std().insets(10, 0, 10, 0));
--        info.add(BugReportExceptionHandler.getBugReportUrlLabel(Utils.strip(ShowStatusReportAction.getReportHeader())),
--                GBC.eol().fill(GBC.HORIZONTAL));
 +        info.add(new UrlLabel("https://bugs.debian.org/", 2), GBC.eol().fill(GBC.HORIZONTAL));
  
          about.addTab(tr("Info"), info);
@@ -66,63 +64,63 @@ Forwarded: not-needed
      /**
       * Replies a text with the release attributes
       *
---- a/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
-+++ b/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
-@@ -62,8 +62,8 @@ public final class BugReportExceptionHan
-                     String[] buttonIcons = new String[] {"cancel", "bug"};
-                     int defaultButtonIdx = 1;
-                     String message = 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.<br>" +
-+                            "See https://bugs.debian.org/ for a guide how to do this."
-                             );
-                     // Check user is running current tested version, the error may already be fixed
-                     int josmVersion = Version.getInstance().getVersion();
-@@ -211,24 +211,13 @@ public final class BugReportExceptionHan
+--- a/src/org/openstreetmap/josm/tools/bugreport/BugReportExceptionHandler.java
++++ b/src/org/openstreetmap/josm/tools/bugreport/BugReportExceptionHandler.java
+@@ -82,8 +82,8 @@ public final class BugReportExceptionHan
+             String[] buttonIcons = new String[] {"cancel", "bug"};
+             int defaultButtonIdx = 1;
+             String message = 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.<br>" +
++                    "See https://bugs.debian.org/ for a guide how to do this."
+                     );
+             // 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
  
-             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().fill(GridBagConstraints.HORIZONTAL));
--            p.add(new UrlLabel(Main.getJOSMWebsite(), 2), 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().fill(GridBagConstraints.HORIZONTAL));
--            p.add(getBugReportUrlLabel(urltext), 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().fill(GridBagConstraints.HORIZONTAL));
-+                    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().fill(GridBagConstraints.HORIZONTAL));
--            p.add(new UrlLabel(Main.getJOSMWebsite()+"/newticket", 2), GBC.eop().insets(8, 0, 0, 0));
-+                    tr("Be sure to include the following information:")), GBC.eop());
+         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().fill(GridBagConstraints.HORIZONTAL));
+-        p.add(new UrlLabel(Main.getJOSMWebsite(), 2), 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().fill(GridBagConstraints.HORIZONTAL));
++                tr("Include your steps to get to the error (as detailed as possible)!")), GBC.eol());
+         p.add(new JButton(new ReportBugAction(text)), 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().fill(GridBagConstraints.HORIZONTAL));
++                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().fill(GridBagConstraints.HORIZONTAL));
+-        p.add(new UrlLabel(Main.getJOSMWebsite()+"/newticket", 2), GBC.eop().insets(8, 0, 0, 0));
++                tr("Be sure to include the following information:")), GBC.eop());
  
-             // Wiki formatting for manual copy-paste
-             text = "{{{\n"+text+"}}}";
+         // Wiki formatting for manual copy-paste
+         DebugTextDisplay textarea = new DebugTextDisplay(text);
 --- a/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
 +++ b/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
-@@ -29,6 +29,7 @@ import org.openstreetmap.josm.data.prefe
- import org.openstreetmap.josm.gui.ExtendedDialog;
- import org.openstreetmap.josm.gui.widgets.JosmTextArea;
+@@ -33,6 +33,7 @@ import org.openstreetmap.josm.gui.prefer
+ import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
+ import org.openstreetmap.josm.gui.preferences.validator.ValidatorTagCheckerRulesPreference;
  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
+ import org.openstreetmap.josm.tools.bugreport.BugReportSender;
+@@ -262,7 +263,7 @@ public final class ShowStatusReportActio
  
          switch (ed.showDialog().getValue()) {
-             case 1: Utils.copyToClipboard(text.toString()); break;
--            case 2: ReportBugAction.reportBug(reportHeader); break;
+             case 1: ta.copyToClippboard(); break;
+-            case 2: BugReportSender.reportBug(reportHeader); break;
 +            case 2: OpenBrowser.displayUrl("https://bugs.debian.org/"); break;
          }
      }
diff --git a/debian/patches/03-default_look_and_feel.patch b/debian/patches/03-default_look_and_feel.patch
index 23d15a5..99ea9de 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
-@@ -165,7 +165,7 @@ public class PlatformHookUnixoid impleme
+@@ -166,7 +166,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 1fbda08..4d6bd26 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -14,7 +14,7 @@ Forwarded: not-needed
  import java.nio.charset.StandardCharsets;
  import java.text.MessageFormat;
  import java.util.ArrayList;
-@@ -364,7 +365,11 @@ public final class I18n {
+@@ -362,7 +363,11 @@ public final class I18n {
      }
  
      private static URL getTranslationFile(String lang) {
@@ -29,7 +29,7 @@ Forwarded: not-needed
      /**
 --- a/src/org/openstreetmap/josm/io/CachedFile.java
 +++ b/src/org/openstreetmap/josm/io/CachedFile.java
-@@ -199,11 +199,17 @@ public class CachedFile implements Close
+@@ -200,11 +200,17 @@ public class CachedFile implements Close
          File file = getFile();
          if (file == null) {
              if (name.startsWith("resource://")) {

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



More information about the Pkg-grass-devel mailing list