[josm] 01/01: Use the Debian BTS instead of JOSM Trac in BugReportSender class.

[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 0ee5e83efd604362ebc623c70dcb04c35fc41236
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Oct 3 15:42:01 2016 +0200

    Use the Debian BTS instead of JOSM Trac in BugReportSender class.
---
 debian/changelog            |  6 ++++++
 debian/patches/01-bts.patch | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 60a9c00..b2c927e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+josm (0.0.svn10966+dfsg-3) UNRELEASED; urgency=medium
+
+  * Use the Debian BTS instead of JOSM Trac in BugReportSender class.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 03 Oct 2016 15:41:50 +0200
+
 josm (0.0.svn10966+dfsg-2) unstable; urgency=medium
 
   * Fix 'Contributors' typo in copyright file.
diff --git a/debian/patches/01-bts.patch b/debian/patches/01-bts.patch
index 93b4508..7a1d6df 100644
--- a/debian/patches/01-bts.patch
+++ b/debian/patches/01-bts.patch
@@ -124,3 +124,43 @@ Forwarded: not-needed
          content.add(panel, GBC.eop().fill(GBC.HORIZONTAL));
      }
  
+--- a/src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java
++++ b/src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java
+@@ -57,16 +57,13 @@ public class BugReportSender extends Thr
+     @Override
+     public void run() {
+         try {
+-            // first, send the debug text using post.
+-            String debugTextPasteId = pasteDebugText();
+-
+-            // then open a browser to display the pasted text.
+-            String openBrowserError = OpenBrowser.displayUrl(getJOSMTicketURL() + "?pdata_stored=" + debugTextPasteId);
++            // open a browser to https://bugs.debian.org/
++            String openBrowserError = OpenBrowser.displayUrl(getJOSMTicketURL());
+             if (openBrowserError != null) {
+                 Main.warn(openBrowserError);
+                 failed(openBrowserError);
+             }
+-        } catch (BugReportSenderException e) {
++        } catch (Exception e) {
+             Main.warn(e);
+             failed(e.getMessage());
+         }
+@@ -101,7 +98,7 @@ public class BugReportSender extends Thr
+     }
+ 
+     private static String getJOSMTicketURL() {
+-        return Main.getJOSMWebsite() + "/josmticket";
++        return "https://bugs.debian.org/";
+     }
+ 
+     private static String retrieveDebugToken(Document document) throws XPathExpressionException, BugReportSenderException {
+@@ -132,7 +129,7 @@ public class BugReportSender extends Thr
+             errorPanel.add(new JMultilineLabel(
+                     tr("Opening the bug report failed. Please report manually using this website:")),
+                     GBC.eol().fill(GridBagConstraints.HORIZONTAL));
+-            errorPanel.add(new UrlLabel(Main.getJOSMWebsite() + "/newticket", 2), GBC.eop().insets(8, 0, 0, 0));
++            errorPanel.add(new UrlLabel("https://bugs.debian.org/", 2), GBC.eop().insets(8, 0, 0, 0));
+             errorPanel.add(new DebugTextDisplay(statusText));
+ 
+             JOptionPane.showMessageDialog(Main.parent, errorPanel, tr("You have encountered a bug in JOSM"),

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