The following commit has been merged in the master branch:
commit a45341c88a02e082bc17b9cd618dc0144b296db9
Author: David Paleino <da...@debian.org>
Date:   Sun Oct 10 12:17:59 2010 +0200

    debian/patches/: 10-build.patch, 50-preferences_world_readable.patch, 
80-fix_images.patch refreshed to cleanly apply

diff --git a/debian/changelog b/debian/changelog
index abbd675..7c057b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 josm (0.0.svn3592-1) UNRELEASED; urgency=low
 
   * New upstream snapshot
+  * debian/patches/:
+    - 10-build.patch, 50-preferences_world_readable.patch,
+      80-fix_images.patch refreshed to cleanly apply
 
- -- David Paleino <da...@debian.org>  Sun, 10 Oct 2010 09:43:58 +0200
+ -- David Paleino <da...@debian.org>  Sun, 10 Oct 2010 12:17:25 +0200
 
 josm (0.0.svn3514-2) unstable; urgency=low
 
diff --git a/debian/patches/10-build.patch b/debian/patches/10-build.patch
index 9ce2716..a0e250d 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      |   38 ++++++++++++++------------------------
+ build.xml      |   36 +++++++++++++-----------------------
  i18n/build.xml |   26 +++++++++++++++++++++-----
- 2 files changed, 35 insertions(+), 29 deletions(-)
+ 2 files changed, 34 insertions(+), 28 deletions(-)
 
 --- josm.orig/build.xml
 +++ josm/build.xml
@@ -91,15 +91,7 @@ Forwarded: no
                </jar>
        </target>
  
-@@ -116,13 +104,14 @@ Build-Date: ${build.tstamp}
-                       <zipfileset dir="macosx" 
includes="JOSM.app/Contents/MacOS/JOSM" filemode="755"/>
-               </zip>
-       </target>
--
-+
-       <target name="compile" depends="init">
-               <javac srcdir="src" classpathref="classpath" destdir="build"
-                               target="1.5" source="1.5" debug="on" 
encoding="UTF-8">
+@@ -123,6 +111,7 @@ Build-Date: ${build.tstamp}
                        <compilerarg value="-Xlint:deprecation"/>
                        <compilerarg value="-Xlint:unchecked"/>
                </javac>
diff --git a/debian/patches/50-preferences_world_readable.patch 
b/debian/patches/50-preferences_world_readable.patch
index 4226162..3e9d1ad 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
-@@ -404,6 +404,14 @@ public class Preferences {
+@@ -337,6 +337,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
      }
  
      /**
-@@ -524,6 +532,13 @@ public class Preferences {
+@@ -457,6 +465,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 58da3da..3e1d475 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
-@@ -2581,7 +2581,7 @@ are supplied, then "values" will be trea
+@@ -2623,7 +2623,7 @@ are supplied, then "values" will be trea
              <key key="amenity" value="cinema" />
              <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" />
-@@ -3119,7 +3119,7 @@ are supplied, then "values" will be trea
+@@ -3184,7 +3184,7 @@ are supplied, then "values" will be trea
              <label text="(Use international code, like +12-345-67890)" />
              <space />
          </item>

-- 
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