The following commit has been merged in the master branch: commit 7ea5e0c1e476ab7ea9bddcaf2be03f37b338406f Author: David Paleino <da...@debian.org> Date: Sun Apr 25 19:34:40 2010 +0200
debian/patches/80-fix_images.patch added, use images from openstreetmap-map-icons-* packages (Closes: #579124) diff --git a/debian/changelog b/debian/changelog index 8334fe1..b516101 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ josm (0.0.svn3201-1) UNRELEASED; urgency=low * New upstream release + * debian/patches/80-fix_images.patch added, use images from + openstreetmap-map-icons-* packages (Closes: #579124) - -- David Paleino <da...@debian.org> Sun, 25 Apr 2010 19:30:00 +0200 + -- David Paleino <da...@debian.org> Sun, 25 Apr 2010 19:34:05 +0200 josm (0.0.svn3196-1) unstable; urgency=low diff --git a/debian/patches/80-fix_images.patch b/debian/patches/80-fix_images.patch new file mode 100644 index 0000000..ec4390e --- /dev/null +++ b/debian/patches/80-fix_images.patch @@ -0,0 +1,29 @@ +From: David Paleino <da...@debian.org> +Subject: use empty icons, instead of giving errors + It should really use icons from openstreetmap-map-icons-* packages +Forwarded: no + +--- + data/defaultpresets.xml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- josm.orig/data/defaultpresets.xml ++++ josm/data/defaultpresets.xml +@@ -2246,7 +2246,7 @@ are supplied, then "values" will be trea + <key key="amenity" value="cinema" /> + <text key="name" text="Name" default="" delete_if_empty="true" /> + </item> +- <item name="Library" icon="styles/standard/shop/rental/library.png" type="node,closedway,relation"> ++ <item name="Library" icon="presets/empty.png" type="node,closedway,relation"> + <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" /> +@@ -2803,7 +2803,7 @@ are supplied, then "values" will be trea + <label text="(Use international code, like +12-345-67890)" /> + <space /> + </item> +- <item name="Veterinary" icon="styles/standard/health/veterinary.png" type="node,closedway"> ++ <item name="Veterinary" icon="presets/empty.png" type="node,closedway"> + <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary" + fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" /> + <label text="Edit Veterinary" /> diff --git a/debian/patches/series b/debian/patches/series index 0baaad1..0d72e85 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ 50-preferences_world_readable.patch 60-disable_oauth.patch 70-default_look_and_feel.patch +80-fix_images.patch -- 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