The following commit has been merged in the master branch:
commit 2335d2559fc07c5e01b33b3e22b3f54ae2b04676
Author: David Paleino <da...@debian.org>
Date:   Fri Apr 15 09:45:37 2011 +0200

    Patches refreshed

diff --git a/debian/changelog b/debian/changelog
index 8b3cef4..caef699 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ josm (0.0.svn4021-1) UNRELEASED; urgency=low
 
   * New upstream snapshot
   * Standards-Version bump to 3.9.2, no changes needed
+  * Patches refreshed
 
- -- David Paleino <da...@debian.org>  Fri, 15 Apr 2011 09:42:56 +0200
+ -- David Paleino <da...@debian.org>  Fri, 15 Apr 2011 09:45:30 +0200
 
 josm (0.0.svn3966-1) unstable; urgency=low
 
diff --git a/debian/patches/40-elemstyles.patch 
b/debian/patches/40-elemstyles.patch
index 5c7b209..48b7a67 100644
--- a/debian/patches/40-elemstyles.patch
+++ b/debian/patches/40-elemstyles.patch
@@ -3,13 +3,13 @@ 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.
 
 ---
- src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java |   13 
++++++++----
+ src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java |   11 +++++++---
  src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java   |   13 
++++++++++--
- 2 files changed, 20 insertions(+), 6 deletions(-)
+ 2 files changed, 19 insertions(+), 5 deletions(-)
 
 --- 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 {
+@@ -126,14 +126,19 @@ public class MapPaintStyles {
          }
  
          if (Main.pref.getBoolean("mappaint.icon.enable-defaults", true)) {
@@ -18,8 +18,7 @@ Subject: the icons have been removed from the JAR file 
because they are already
 -            dirs.add("resource://images/styles/");
 +            addDebianDirs(dirs);
          }
--        
-+
+ 
          return dirs;
      }
  

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