[DebianGIS-dev] r2541 - in packages/josm/trunk/debian: . patches

[gmascellani-guest at alioth.debian.org]

Author: gmascellani-guest
Date: 2009-10-11 16:19:39 +0000 (Sun, 11 Oct 2009)
New Revision: 2541

Modified:
   packages/josm/trunk/debian/changelog
   packages/josm/trunk/debian/copyright
   packages/josm/trunk/debian/patches/20_bts.dpatch
Log:
Packaging new release


Modified: packages/josm/trunk/debian/changelog
===================================================================
--- packages/josm/trunk/debian/changelog	2009-10-09 09:54:53 UTC (rev 2540)
+++ packages/josm/trunk/debian/changelog	2009-10-11 16:19:39 UTC (rev 2541)
@@ -1,9 +1,6 @@
-josm (0.0.svn1981-1) UNRELEASED; urgency=low
+josm (0.0.svn2255-1) UNRELEASED; urgency=low
 
-  [ David Paleino ]
   * New upstream release (closes: #542653, #541326)
-  
-  [ Giovanni Mascellani ]
   * debian/josm.sh: wrong java executable path for java 1.5.0 (closes: #525020).
     Thanks to Ross Burton for the report.
   * debian/josm.sh: use java alternative if known to work (closes: #521125).

Modified: packages/josm/trunk/debian/copyright
===================================================================
--- packages/josm/trunk/debian/copyright	2009-10-09 09:54:53 UTC (rev 2540)
+++ packages/josm/trunk/debian/copyright	2009-10-11 16:19:39 UTC (rev 2541)
@@ -159,6 +159,17 @@
 Copyright: Copyright (c) 2007 Tim Haussmann
 License: GPL-3+
 
+Files: src/org/openstreetmap/josm/gui/MultiSplitLayout.java,
+ src/org/openstreetmap/josm/gui/MultiSplitPane.java
+Copyright: Copyright 2004 Sun Microsystems, Inc., 4150 Network Circle,
+ Santa Clara, California 95054, U.S.A.
+License: LGPL-2.1+
+
+Files: src/org/openstreetmap/josm/gui/widgets/HistoryChangedListener.java,
+ src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java
+Copyright: Copyright (c) 2008, Henrik Niehaus
+License: BSD
+
 Files: src/org/openstreetmap/josm/tools/CopyList.java
 Copyright: Copyright (c) 2008 Petr Nejedly <P.Nejedly at sh.cvut.cz>
 License: GPL-2+

Modified: packages/josm/trunk/debian/patches/20_bts.dpatch
===================================================================
--- packages/josm/trunk/debian/patches/20_bts.dpatch	2009-10-09 09:54:53 UTC (rev 2540)
+++ packages/josm/trunk/debian/patches/20_bts.dpatch	2009-10-11 16:19:39 UTC (rev 2541)
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad trunk~/src/org/openstreetmap/josm/actions/AboutAction.java trunk/src/org/openstreetmap/josm/actions/AboutAction.java
---- trunk~/src/org/openstreetmap/josm/actions/AboutAction.java	2009-08-02 14:36:40.000000000 +0200
-+++ trunk/src/org/openstreetmap/josm/actions/AboutAction.java	2009-09-14 15:42:51.000000000 +0200
+--- trunk~/src/org/openstreetmap/josm/actions/AboutAction.java	2009-09-08 22:56:02.000000000 +0200
++++ trunk/src/org/openstreetmap/josm/actions/AboutAction.java	2009-10-11 18:05:24.000000000 +0200
 @@ -49,6 +49,7 @@
  public class AboutAction extends JosmAction {
  
@@ -46,20 +46,20 @@
          about.addTab(tr("Info"), info);
          about.addTab(tr("Readme"), createScrollPane(readme));
 diff -urNad trunk~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
---- trunk~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java	2009-08-02 18:54:11.000000000 +0200
-+++ trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java	2009-09-14 15:49:59.000000000 +0200
-@@ -53,8 +53,8 @@
+--- trunk~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java	2009-08-30 19:07:24.000000000 +0200
++++ trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java	2009-10-11 18:06:37.000000000 +0200
+@@ -52,8 +52,8 @@
  
              Object[] options = new String[]{tr("Do nothing"), tr("Report Bug")};
-             int answer = OptionPaneUtil.showOptionDialog(Main.parent, tr("An unexpected exception occurred.\n\n" +
+             int answer = JOptionPane.showOptionDialog(Main.parent, tr("An unexpected exception occurred.\n\n" +
 -                    "This is always a coding error. If you are running the latest\n" +
 -            "version of JOSM, please consider being kind and file a bug report."),
 +                    "Please consider being kind and file a bug report.\n" +
 +                    "See http://bugs.debian.org for a guide how to do this."),
-             tr("Unexpected Exception"), JOptionPane.YES_NO_OPTION, JOptionPane.ERROR_MESSAGE,
+             tr("Unexpected Exception"), JOptionPane.YES_NO_OPTION, JOptionPane.ERROR_MESSAGE,null,
              options, options[0]);
              if (answer == 1) {
-@@ -66,10 +66,10 @@
+@@ -65,10 +65,10 @@
                      + stack.getBuffer().toString();
  
                      JPanel p = new JPanel(new GridBagLayout());