[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3701-1-6-g0a02825

[David Paleino]

The following commit has been merged in the master branch:
commit d7cb3539fd1070349db6b17937b587db12a40e54
Author: David Paleino <dapal at debian.org>
Date:   Sat Jan 1 18:45:37 2011 +0100

    Patches refreshed.

diff --git a/debian/changelog b/debian/changelog
index 23f5533..cffb2b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ josm (0.0.svn3751-1) UNRELEASED; urgency=low
   * New upstream snapshot
   * Plugins integrated in josm-core: slippymap, wmsplugin,
     remotecontrol, imagery.
+  * Patches refreshed.
 
- -- David Paleino <dapal at debian.org>  Sat, 01 Jan 2011 11:41:42 +0100
+ -- David Paleino <dapal at debian.org>  Sat, 01 Jan 2011 18:45:28 +0100
 
 josm (0.0.svn3701-1) unstable; urgency=low
 
diff --git a/debian/patches/10-build.patch b/debian/patches/10-build.patch
index a0e250d..1b62ffa 100644
--- a/debian/patches/10-build.patch
+++ b/debian/patches/10-build.patch
@@ -60,7 +60,7 @@ 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,24 +69,25 @@ Build-Date: ${build.tstamp}
+@@ -82,25 +69,26 @@ Build-Date: ${build.tstamp}
  		<copy file="README" todir="build"/>
  		<copy file="LICENSE" todir="build"/>
  
@@ -84,6 +84,7 @@ Forwarded: no
  			</manifest>
  			<zipfileset dir="images" prefix="images" />
  			<zipfileset dir="data" prefix="data" />
+ 			<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" />
@@ -91,7 +92,7 @@ Forwarded: no
  		</jar>
  	</target>
  
-@@ -123,6 +111,7 @@ Build-Date: ${build.tstamp}
+@@ -124,6 +112,7 @@ Build-Date: ${build.tstamp}
  			<compilerarg value="-Xlint:deprecation"/>
  			<compilerarg value="-Xlint:unchecked"/>
  		</javac>
@@ -99,7 +100,7 @@ Forwarded: no
  	</target>
  
  	<target name="init">
-@@ -133,6 +122,7 @@ Build-Date: ${build.tstamp}
+@@ -134,6 +123,7 @@ Build-Date: ${build.tstamp}
  	<target name="clean">
  		<delete dir="build" />
  		<delete dir="dist" />
diff --git a/debian/patches/40-elemstyles.patch b/debian/patches/40-elemstyles.patch
index f3a508f..09c9524 100644
--- a/debian/patches/40-elemstyles.patch
+++ b/debian/patches/40-elemstyles.patch
@@ -10,7 +10,7 @@ Forwarded: not-needed
 
 --- josm.orig/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
 +++ josm/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
-@@ -64,8 +64,10 @@ public class MapPaintStyles {
+@@ -65,8 +65,10 @@ public class MapPaintStyles {
          {
              LinkedList<String> f = new LinkedList<String>(iconDirs);
              /* don't prefix icon path, as it should be generic */
diff --git a/debian/patches/50-preferences_world_readable.patch b/debian/patches/50-preferences_world_readable.patch
index 3e9d1ad..4e3c987 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
-@@ -337,6 +337,14 @@ public class Preferences {
+@@ -376,6 +376,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
      }
  
      /**
-@@ -457,6 +465,13 @@ public class Preferences {
+@@ -500,6 +508,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 718958d..8d95d83 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
-@@ -2208,7 +2208,7 @@ are supplied, then "values" will be trea
+@@ -2222,7 +2222,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" />
-@@ -2407,7 +2407,7 @@ are supplied, then "values" will be trea
+@@ -2421,7 +2421,7 @@ are supplied, then "values" will be trea
              <label text="(Use international code, like +12-345-67890)" />
              <space />
          </item>

-- 
Java OpenStreetMap editor