The following commit has been merged in the master branch:
commit d442614c6249c450bdc533979c2e381c6670dc43
Author: David Paleino <da...@debian.org>
Date:   Mon Mar 7 21:19:45 2011 +0100

    Patches refreshed

diff --git a/debian/changelog b/debian/changelog
index 61976c4..a176063 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ josm (0.0.svn3961-1) UNRELEASED; urgency=low
 
   [ David Paleino ]
   * New upstream snapshot
+  * Patches refreshed
 
- -- David Paleino <da...@debian.org>  Mon, 07 Mar 2011 21:08:47 +0100
+ -- David Paleino <da...@debian.org>  Mon, 07 Mar 2011 21:19:36 +0100
 
 josm (0.0.svn3751-4) unstable; urgency=low
 
diff --git a/debian/patches/10-build.patch b/debian/patches/10-build.patch
index 1b62ffa..4dcb912 100644
--- a/debian/patches/10-build.patch
+++ b/debian/patches/10-build.patch
@@ -4,9 +4,9 @@ Subject: adjustments to the ant build file, mainly to not 
include
 Forwarded: no
 
 ---
- build.xml      |   36 +++++++++++++-----------------------
+ build.xml      |   34 +++++++++++-----------------------
  i18n/build.xml |   26 +++++++++++++++++++++-----
- 2 files changed, 34 insertions(+), 28 deletions(-)
+ 2 files changed, 32 insertions(+), 28 deletions(-)
 
 --- josm.orig/build.xml
 +++ josm/build.xml
@@ -22,7 +22,7 @@ Forwarded: no
                </fileset>
        </path>
  
-@@ -42,14 +43,7 @@
+@@ -41,14 +42,7 @@
          -->
        <target name="create-revision">
                <property name="revision.dir" value="${build.dir}"/>
@@ -38,7 +38,7 @@ Forwarded: no
                <tstamp>
                        <format property="build.tstamp" pattern="yyyy-MM-dd 
HH:mm:ss"/>
                </tstamp>
-@@ -61,20 +55,13 @@
+@@ -60,20 +54,13 @@
  Revision: ${version.entry.commit.revision}
  Is-Local-Build: true
  Build-Date: ${build.tstamp}
@@ -60,17 +60,12 @@ Forwarded: no
                <property name="version.entry.commit.revision" value="UNKNOWN"/>
                <property name="version.entry.commit.date" value="UNKNOWN"/>
                <echo>Revision ${version.entry.commit.revision}</echo>
-@@ -82,25 +69,26 @@ Build-Date: ${build.tstamp}
+@@ -81,23 +68,22 @@ Build-Date: ${build.tstamp}
                <copy file="README" todir="build"/>
                <copy file="LICENSE" todir="build"/>
  
 +              <ant target="dist" dir="i18n"/>
 +
-               <!-- styles -->
-               <copy file="styles/standard/elemstyles.xml" todir="build/data"/>
- 
-+              <property environment="env"/>
-+
                <!-- create josm-custom.jar -->
 -              <delete file="dist/josm-custom.jar"/>
                <jar destfile="dist/josm-custom.jar" basedir="build" 
level="${clevel}">
@@ -84,6 +79,7 @@ Forwarded: no
                        </manifest>
                        <zipfileset dir="images" prefix="images" />
                        <zipfileset dir="data" prefix="data" />
+                       <zipfileset dir="styles" prefix="styles" />
                        <zipfileset 
dir="src/org/openstreetmap/gui/jmapviewer/images" 
prefix="org/openstreetmap/gui/jmapviewer/images" />
 -
 -                      <!-- All jar files necessary to run only JOSM (no 
tests) -->
@@ -92,7 +88,7 @@ Forwarded: no
                </jar>
        </target>
  
-@@ -124,6 +112,7 @@ Build-Date: ${build.tstamp}
+@@ -121,6 +107,7 @@ Build-Date: ${build.tstamp}
                        <compilerarg value="-Xlint:deprecation"/>
                        <compilerarg value="-Xlint:unchecked"/>
                </javac>
@@ -100,14 +96,14 @@ Forwarded: no
        </target>
  
        <target name="init">
-@@ -134,6 +123,7 @@ Build-Date: ${build.tstamp}
+@@ -131,6 +118,7 @@ Build-Date: ${build.tstamp}
        <target name="clean">
                <delete dir="build" />
                <delete dir="dist" />
 +              <ant target="clean" dir="i18n"/>
        </target>
  
-       <path id="test.classpath">
+       <target name="javacc">
 --- josm.orig/i18n/build.xml
 +++ josm/i18n/build.xml
 @@ -1,7 +1,7 @@
diff --git a/debian/patches/20-bts.patch b/debian/patches/20-bts.patch
index 12bc0a9..da58c45 100644
--- a/debian/patches/20-bts.patch
+++ b/debian/patches/20-bts.patch
@@ -71,7 +71,7 @@ Forwarded: no
       *
 --- josm.orig/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
 +++ josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
-@@ -74,8 +74,8 @@ public final class BugReportExceptionHan
+@@ -75,8 +75,8 @@ public final class BugReportExceptionHan
                          Main.parent,
                          "<html>"
                          + tr("An unexpected exception occurred.<br>" +
@@ -82,7 +82,7 @@ Forwarded: no
                          )
                          + "</html>",
                          tr("Unexpected Exception"),
-@@ -126,21 +126,14 @@ public final class BugReportExceptionHan
+@@ -111,21 +111,14 @@ public final class BugReportExceptionHan
  
                      JPanel p = new JPanel(new GridBagLayout());
                      p.add(new JMultilineLabel(
diff --git a/debian/patches/40-elemstyles.patch 
b/debian/patches/40-elemstyles.patch
index bf7d774..5c7b209 100644
--- a/debian/patches/40-elemstyles.patch
+++ b/debian/patches/40-elemstyles.patch
@@ -3,62 +3,47 @@ Date: Sun, 20 Feb 2011 10:15:10 +0100
 Subject: the icons have been removed from the JAR file because they are 
already provided by the openstreetmap-map-icons-* packages. Point josm to the 
correct directory so that the icons are found.
 
 ---
- .../josm/gui/mappaint/MapPaintStyles.java          |   10 ++++++++--
- .../josm/gui/tagging/TaggingPreset.java            |   17 +++++++++++++----
- 2 files changed, 21 insertions(+), 6 deletions(-)
+ src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java |   13 
++++++++----
+ src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java   |   13 
++++++++++--
+ 2 files changed, 20 insertions(+), 6 deletions(-)
 
-diff --git a/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java 
b/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
-index 8c27b85..a6ae8ec 100644
---- a/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
-+++ b/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
-@@ -58,6 +58,13 @@ public class MapPaintStyles {
-         return i;
+--- josm.orig/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
++++ josm/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
+@@ -107,14 +107,19 @@ public class MapPaintStyles {
+         }
+ 
+         if (Main.pref.getBoolean("mappaint.icon.enable-defaults", true)) {
+-            /* don't prefix icon path, as it should be generic */
+-            dirs.add("resource://images/styles/standard/");
+-            dirs.add("resource://images/styles/");
++            addDebianDirs(dirs);
+         }
+-        
++
+         return dirs;
      }
  
-+    public static void addDebianDirs(Collection<String> f) {
++    public static void addDebianDirs(List<String> f) {
 +        f.add("/usr/share/icons/openstreetmap/classic.small");
 +        f.add("/usr/share/icons/openstreetmap/square.small");
 +        f.add("/usr/share/icons/openstreetmap/classic.big");
 +        f.add("/usr/share/icons/openstreetmap/square.big");
 +    }
 +
-     @SuppressWarnings("null")
      public static void readFromPreferences() {
-         iconDirs = Main.pref.getCollection("mappaint.icon.sources", 
Collections.<String>emptySet());
-@@ -65,8 +72,7 @@ public class MapPaintStyles {
-         {
-             LinkedList<String> f = new LinkedList<String>(iconDirs);
-             /* don't prefix icon path, as it should be generic */
--            f.add("resource://images/styles/standard/");
--            f.add("resource://images/styles/");
-+            addDebianDirs(f);
-             iconDirs = f;
-         }
+         styles.clear();
  
-diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java 
b/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
-index e373f78..12fb479 100644
---- a/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
-+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
-@@ -60,6 +60,7 @@ import org.openstreetmap.josm.gui.QuadStateCheckBox;
+--- josm.orig/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
++++ josm/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
+@@ -62,6 +62,7 @@ import org.openstreetmap.josm.gui.QuadSt
  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.TaggingPresetPreference.PresetPrefMigration;
  import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
- import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPritority;
- import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
-@@ -409,8 +410,8 @@ public class TaggingPreset extends AbstractAction 
implements MapView.LayerChange
-             for (int i=0; i<value_array.length; i++) {
-                 PresetListEnty e = new PresetListEnty(value_array[i]);
-                 e.display_value = (locale_display_values == null)
--                        ? (values_context == null ? tr(display_array[i])
--                                : trc(values_context, display_array[i])) : 
display_array[i];
-+                ? (values_context == null ? tr(display_array[i])
-+                        : trc(values_context, display_array[i])) : 
display_array[i];
-                 if (short_descriptions_array != null) {
-                     e.short_description = locale_short_descriptions == null ? 
tr(short_descriptions_array[i])
-                             : short_descriptions_array[i];
-@@ -826,8 +827,16 @@ public class TaggingPreset extends AbstractAction 
implements MapView.LayerChange
+@@ -1097,8 +1098,16 @@ public class TaggingPreset extends Abstr
          ImageIcon icon = ImageProvider.getIfAvailable(s, "presets", null, 
iconName, zipIcons);
          if (icon == null)
          {
@@ -77,4 +62,3 @@ index e373f78..12fb479 100644
          }
          if (Math.max(icon.getIconHeight(), icon.getIconWidth()) != 16) {
              icon = new ImageIcon(icon.getImage().getScaledInstance(16, 16, 
Image.SCALE_SMOOTH));
--- 
diff --git a/debian/patches/50-preferences_world_readable.patch 
b/debian/patches/50-preferences_world_readable.patch
index 4e3c987..9b50bb3 100644
--- a/debian/patches/50-preferences_world_readable.patch
+++ b/debian/patches/50-preferences_world_readable.patch
@@ -8,7 +8,7 @@ Forwarded: https://josm.openstreetmap.de/ticket/4667
 
 --- josm.orig/src/org/openstreetmap/josm/data/Preferences.java
 +++ josm/src/org/openstreetmap/josm/data/Preferences.java
-@@ -376,6 +376,14 @@ public class Preferences {
+@@ -384,6 +384,14 @@ public class Preferences {
          File tmpFile = new File(prefFile + "_tmp");
          copyFile(tmpFile, prefFile);
          tmpFile.delete();
@@ -23,7 +23,7 @@ Forwarded: https://josm.openstreetmap.de/ticket/4667
      }
  
      /**
-@@ -500,6 +508,13 @@ public class Preferences {
+@@ -508,6 +516,13 @@ public class Preferences {
                  System.err.println(tr("Warning: Failed to initialize 
preferences.Failed to reset preference file to default: {0}", 
getPreferenceFile()));
              }
          }
diff --git a/debian/patches/80-fix_images.patch 
b/debian/patches/80-fix_images.patch
index 8d95d83..a2d2f9a 100644
--- a/debian/patches/80-fix_images.patch
+++ b/debian/patches/80-fix_images.patch
@@ -9,7 +9,7 @@ Forwarded: no
 
 --- josm.orig/data/defaultpresets.xml
 +++ josm/data/defaultpresets.xml
-@@ -2222,7 +2222,7 @@ are supplied, then "values" will be trea
+@@ -2252,7 +2252,7 @@ are supplied, then "values" will be trea
              <key key="amenity" value="theatre" />
              <text key="name" text="Name" default="" delete_if_empty="true" />
          </item>
@@ -18,7 +18,7 @@ Forwarded: no
              <link 
href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library";
                    
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library"; />
              <label text="Edit Library" />
-@@ -2421,7 +2421,7 @@ are supplied, then "values" will be trea
+@@ -2451,7 +2451,7 @@ are supplied, then "values" will be trea
              <label text="(Use international code, like +12-345-67890)" />
              <space />
          </item>
diff --git a/debian/patches/90-fix_version.patch 
b/debian/patches/90-fix_version.patch
index ddf55a8..b94a014 100644
--- a/debian/patches/90-fix_version.patch
+++ b/debian/patches/90-fix_version.patch
@@ -10,7 +10,7 @@ Forwarded: no
 
 --- josm.orig/build.xml
 +++ josm/build.xml
-@@ -81,7 +81,7 @@ Debian-Release: ${debian.version}
+@@ -75,7 +75,7 @@ Debian-Release: ${debian.version}
                        <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to 
create a non-bzip2 supporting jar -->
                        <manifest>
                                <attribute name="Main-class" value="JOSM" />

-- 
Java OpenStreetMap editor

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

Reply via email to