The following commit has been merged in the master branch:
commit 189c506d7625de930df29ea6acce0adfacf3117f
Author: Mònica Ramírez Arceda <mon...@debian.org>
Date:   Sun Sep 1 11:36:09 2013 +0200

    Patches refresehd and adapted to the new upstream source code

diff --git a/debian/patches/01-bts.patch b/debian/patches/01-bts.patch
index b394609..d047e7d 100644
--- a/debian/patches/01-bts.patch
+++ b/debian/patches/01-bts.patch
@@ -12,9 +12,9 @@ bug triaging.
  src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java |   20 
+++-------
  3 files changed, 19 insertions(+), 15 deletions(-)
 
---- josm.orig/src/org/openstreetmap/josm/actions/AboutAction.java
-+++ josm/src/org/openstreetmap/josm/actions/AboutAction.java
-@@ -9,6 +9,9 @@ import java.awt.GridBagLayout;
+--- a/src/org/openstreetmap/josm/actions/AboutAction.java
++++ b/src/org/openstreetmap/josm/actions/AboutAction.java
+@@ -8,6 +8,9 @@
  import java.awt.event.ActionEvent;
  import java.awt.event.KeyEvent;
  
@@ -24,7 +24,7 @@ bug triaging.
  import javax.swing.BorderFactory;
  import javax.swing.JLabel;
  import javax.swing.JOptionPane;
-@@ -74,6 +77,8 @@ public class AboutAction extends JosmAct
+@@ -79,6 +82,8 @@
          info.add(GBC.glue(0,10), GBC.eol());
          info.add(new JLabel(tr("Version {0}", version.getVersionString())), 
GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
          info.add(GBC.glue(0,5), GBC.eol());
@@ -33,18 +33,18 @@ bug triaging.
          info.add(new JLabel(tr("Last change at {0}",version.getTime())), 
GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
          info.add(GBC.glue(0,5), GBC.eol());
          info.add(new JLabel(tr("Java Version 
{0}",System.getProperty("java.version"))), 
GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
-@@ -82,7 +87,7 @@ public class AboutAction extends JosmAct
+@@ -87,7 +92,7 @@
          info.add(new UrlLabel("http://josm.openstreetmap.de",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(new UrlLabel("http://josm.openstreetmap.de/newticket",2), 
GBC.eol().fill(GBC.HORIZONTAL));
+-        
info.add(BugReportExceptionHandler.getBugReportUrlLabel(Utils.strip(ShowStatusReportAction.getReportHeader())),
 GBC.eol().fill(GBC.HORIZONTAL));
 +        info.add(new UrlLabel("http://bugs.debian.org";, 2), 
GBC.eol().fill(GBC.HORIZONTAL));
  
          about.addTab(tr("Info"), info);
          about.addTab(tr("Readme"), createScrollPane(readme));
---- josm.orig/src/org/openstreetmap/josm/data/Version.java
-+++ josm/src/org/openstreetmap/josm/data/Version.java
-@@ -66,6 +66,7 @@ public class Version {
+--- a/src/org/openstreetmap/josm/data/Version.java
++++ b/src/org/openstreetmap/josm/data/Version.java
+@@ -69,6 +69,7 @@
  
      private int version;
      private String releaseDescription;
@@ -52,7 +52,7 @@ bug triaging.
      private String time;
      private String buildName;
      private boolean isLocalBuild;
-@@ -116,6 +117,8 @@ public class Version {
+@@ -119,6 +120,8 @@
              version = JOSM_UNKNOWN_VERSION;
          }
  
@@ -61,7 +61,7 @@ bug triaging.
          // the last changed data
          //
          time = properties.get("Last Changed Date");
-@@ -169,6 +172,10 @@ public class Version {
+@@ -175,6 +178,10 @@
          return  version == 0 ? tr("UNKNOWN") : Integer.toString(version);
      }
  
@@ -72,9 +72,9 @@ bug triaging.
      /**
       * Replies a text with the release attributes
       *
---- josm.orig/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
-+++ josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
-@@ -83,8 +83,8 @@ public final class BugReportExceptionHan
+--- a/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
++++ b/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
+@@ -95,8 +95,8 @@
                          pnl.add(new JLabel(
                                  "<html>"
                                          + tr("An unexpected exception 
occurred.<br>" +
@@ -85,18 +85,18 @@ bug triaging.
                                                  )
                                                  + "</html>"), GBC.eol());
                          JCheckBox cbSuppress = null;
-@@ -123,21 +123,13 @@ public final class BugReportExceptionHan
+@@ -132,21 +132,13 @@
  
                              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());
--                            p.add(new 
UrlLabel("http://josm.openstreetmap.de/#Download",2), 
GBC.eop().insets(8,0,0,0));
+-                            p.add(new 
UrlLabel("http://josm.openstreetmap.de",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());
--                            p.add(new UrlLabel(url.toString(), 
"http://josm.openstreetmap.de/josmticket?...",2), GBC.eop().insets(8,0,0,0));
+-                            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 " +
diff --git a/debian/patches/02-elemstyles.patch 
b/debian/patches/02-elemstyles.patch
index 01f98a1..90d7902 100644
--- a/debian/patches/02-elemstyles.patch
+++ b/debian/patches/02-elemstyles.patch
@@ -12,9 +12,9 @@ applications. This patch points josm to the shared 
directories.
  src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java   |   30 
+++++++++---
  2 files changed, 32 insertions(+), 9 deletions(-)
 
---- josm.orig/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
-+++ josm/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
-@@ -176,14 +176,19 @@ public class MapPaintStyles {
+--- a/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
++++ b/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
+@@ -175,14 +175,19 @@
          }
  
          if (Main.pref.getBoolean("mappaint.icon.enable-defaults", true)) {
@@ -37,43 +37,17 @@ applications. This patch points josm to the shared 
directories.
      public static void readFromPreferences() {
          styles.clear();
  
---- josm.orig/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
-+++ josm/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
-@@ -72,6 +72,7 @@ import org.openstreetmap.josm.gui.QuadSt
+--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
++++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
+@@ -41,6 +41,7 @@
+ import org.openstreetmap.josm.gui.MapView;
  import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
  import org.openstreetmap.josm.gui.layer.Layer;
- import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 +import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
- import org.openstreetmap.josm.gui.preferences.SourceEntry;
  import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
- import 
org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference.PresetPrefHelper;
-@@ -1378,12 +1379,22 @@ public class TaggingPreset extends Abstr
-     }
- 
-     protected static ImageIcon loadImageIcon(String iconName, File zipIcons, 
Integer maxSize) {
--        final Collection<String> s = 
Main.pref.getCollection("taggingpreset.icon.sources", null);
--        ImageProvider imgProv = new 
ImageProvider(iconName).setDirs(s).setId("presets").setArchive(zipIcons).setOptional(true);
-+        LinkedList<String> s = new LinkedList<String>();
-+        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;
-     }
- 
-     /*
-@@ -1394,8 +1405,15 @@ public class TaggingPreset extends Abstr
+ import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Link;
+ import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Role;
+@@ -131,8 +132,15 @@
       * and the 16x16 icons for SMALL_ICON.
       */
      public void setIcon(final String iconName) {
@@ -90,8 +64,8 @@ applications. This patch points josm to the shared 
directories.
 +        ImageProvider imgProv = new ImageProvider(realIconName);
          imgProv.setDirs(s);
          imgProv.setId("presets");
-         imgProv.setArchive(TaggingPreset.zipIcons);
-@@ -1412,7 +1430,7 @@ public class TaggingPreset extends Abstr
+         imgProv.setArchive(TaggingPresetReader.getZipIcons());
+@@ -149,7 +157,7 @@
                          }
                      });
                  } else {
@@ -100,3 +74,38 @@ 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
+@@ -45,6 +45,7 @@
+ import org.openstreetmap.josm.data.osm.Tag;
+ import org.openstreetmap.josm.data.preferences.BooleanProperty;
+ import org.openstreetmap.josm.gui.QuadStateCheckBox;
++import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
+ import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
+ import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPritority;
+ import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
+@@ -1356,11 +1357,21 @@
+         return returnValue;
+     }
+     protected static ImageIcon loadImageIcon(String iconName, File zipIcons, 
Integer maxSize) {
+-        final Collection<String> s = 
Main.pref.getCollection("taggingpreset.icon.sources", null);
+-        ImageProvider imgProv = new 
ImageProvider(iconName).setDirs(s).setId("presets").setArchive(zipIcons).setOptional(true);
++        LinkedList<String> s = new LinkedList<String>();
++        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;
+     }
+ }
diff --git a/debian/patches/03-default_look_and_feel.patch 
b/debian/patches/03-default_look_and_feel.patch
index eb4f8b1..6be38fa 100644
--- a/debian/patches/03-default_look_and_feel.patch
+++ b/debian/patches/03-default_look_and_feel.patch
@@ -9,9 +9,9 @@ Patch rewritten for new code, original patch was from Ubuntu's
  src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- josm.orig/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
-+++ josm/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
-@@ -70,7 +70,7 @@ public class PlatformHookUnixoid impleme
+--- a/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
++++ b/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
+@@ -75,7 +75,7 @@
  
      @Override
      public String getDefaultStyle() {
diff --git a/debian/patches/05-fix_version.patch 
b/debian/patches/05-fix_version.patch
index 2e2d88d..13151c2 100644
--- a/debian/patches/05-fix_version.patch
+++ b/debian/patches/05-fix_version.patch
@@ -8,9 +8,9 @@ Forwarded: not-needed
  src/org/openstreetmap/josm/data/Version.java |    3 ---
  2 files changed, 1 insertion(+), 4 deletions(-)
 
---- josm.orig/build.xml
-+++ josm/build.xml
-@@ -79,7 +79,7 @@ Debian-Release: ${debian.version}
+--- a/build.xml
++++ b/build.xml
+@@ -79,7 +79,7 @@
              <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a 
non-bzip2 supporting jar -->
              <manifest>
                  <attribute name="Main-class" value="JOSM"/>
@@ -19,15 +19,15 @@ Forwarded: not-needed
                  <attribute name="Main-Date" 
value="${version.entry.commit.date}"/>
                                <attribute name="Debian-Release" 
value="${debian.version}"/>
                                <attribute name="Class-Path" 
value="${classpathprop}"/>
---- josm.orig/src/org/openstreetmap/josm/data/Version.java
-+++ josm/src/org/openstreetmap/josm/data/Version.java
-@@ -217,9 +217,6 @@ public class Version {
+--- a/src/org/openstreetmap/josm/data/Version.java
++++ b/src/org/openstreetmap/josm/data/Version.java
+@@ -237,9 +237,6 @@
          if (buildName != null) {
              s += " " + buildName;
          }
 -        if (isLocalBuild() && v != JOSM_UNKNOWN_VERSION) {
 -            s += " SVN";
 -        }
-         return "JOSM/1.5 ("+ s+" "+LanguageInfo.getJOSMLocaleCode()+")";
-     }
- }
+         String result = "JOSM/1.5 ("+ s+" 
"+LanguageInfo.getJOSMLocaleCode()+")";
+         if (includeOsDetails) {
+             result += " " + Main.platform.getOSDescription();
diff --git a/debian/patches/06-move_data_out_of_jar.patch 
b/debian/patches/06-move_data_out_of_jar.patch
index 899277e..e480427 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -11,9 +11,9 @@ Bug-Debian: 
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698608
  src/org/openstreetmap/josm/tools/I18n.java             |    7 +++++-
  3 files changed, 22 insertions(+), 10 deletions(-)
 
---- josm.orig/build.xml
-+++ josm/build.xml
-@@ -84,9 +84,9 @@ Debian-Release: ${debian.version}
+--- a/build.xml
++++ b/build.xml
+@@ -84,9 +84,9 @@
                                <attribute name="Debian-Release" 
value="${debian.version}"/>
                                <attribute name="Class-Path" 
value="${classpathprop}"/>
              </manifest>
@@ -26,9 +26,9 @@ Bug-Debian: 
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698608
              <zipfileset dir="src/org/openstreetmap/gui/jmapviewer/images" 
prefix="org/openstreetmap/gui/jmapviewer/images"/>
              <!-- All jar files necessary to run only JOSM (no tests) -->
              <!-- <zipfileset src="lib/metadata-extractor-2.3.1-nosun.jar"/>  
-->
---- josm.orig/src/org/openstreetmap/josm/tools/I18n.java
-+++ josm/src/org/openstreetmap/josm/tools/I18n.java
-@@ -7,6 +7,7 @@ import java.io.FileInputStream;
+--- a/src/org/openstreetmap/josm/tools/I18n.java
++++ b/src/org/openstreetmap/josm/tools/I18n.java
+@@ -7,6 +7,7 @@
  import java.io.InputStream;
  import java.io.IOException;
  import java.net.URL;
@@ -36,7 +36,7 @@ Bug-Debian: 
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698608
  import java.text.MessageFormat;
  import java.util.ArrayList;
  import java.util.Arrays;
-@@ -308,7 +309,11 @@ public class I18n {
+@@ -308,7 +309,11 @@
      }
  
      private static URL getTranslationFile(String lang) {
@@ -49,9 +49,9 @@ Bug-Debian: 
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698608
      }
  
      /**
---- josm.orig/src/org/openstreetmap/josm/io/MirroredInputStream.java
-+++ josm/src/org/openstreetmap/josm/io/MirroredInputStream.java
-@@ -81,13 +81,20 @@ public class MirroredInputStream extends
+--- a/src/org/openstreetmap/josm/io/MirroredInputStream.java
++++ b/src/org/openstreetmap/josm/io/MirroredInputStream.java
+@@ -76,13 +76,20 @@
              }
          } catch (java.net.MalformedURLException e) {
              if (name.startsWith("resource://")) {

-- 
Editor for OpenStreetMap

_______________________________________________
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits

Reply via email to