The following commit has been merged in the master branch:
commit 95721e8907537ec38ce4ff03eec1d5b9703a002b
Author: David Paleino <da...@debian.org>
Date: Mon Dec 6 09:49:27 2010 +0100
debian/patches/* refreshed
diff --git a/debian/changelog b/debian/changelog
index 2fd5cd8..e482534 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ josm (0.0.svn3695-1) UNRELEASED; urgency=low
* debian/josm.desktop: move from Geoscience to Geography
(LP: #643205)
* debian/compat bumped to 8
+ * debian/patches/* refreshed
[ Giovanni Mascellani ]
* josm.sh:
@@ -16,7 +17,7 @@ josm (0.0.svn3695-1) UNRELEASED; urgency=low
- don't try to use OpenJDK 6 virtual machine if it's only headless
(closes: #603932).
- -- David Paleino <da...@debian.org> Mon, 06 Dec 2010 09:42:58 +0100
+ -- David Paleino <da...@debian.org> Mon, 06 Dec 2010 09:49:18 +0100
josm (0.0.svn3592-1) unstable; urgency=low
diff --git a/debian/patches/80-fix_images.patch
b/debian/patches/80-fix_images.patch
index 3e1d475..718958d 100644
--- a/debian/patches/80-fix_images.patch
+++ b/debian/patches/80-fix_images.patch
@@ -9,8 +9,8 @@ Forwarded: no
--- josm.orig/data/defaultpresets.xml
+++ josm/data/defaultpresets.xml
-@@ -2623,7 +2623,7 @@ are supplied, then "values" will be trea
- <key key="amenity" value="cinema" />
+@@ -2208,7 +2208,7 @@ are supplied, then "values" will be trea
+ <key key="amenity" value="theatre" />
<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">
@@ -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" />
-@@ -3184,7 +3184,7 @@ are supplied, then "values" will be trea
+@@ -2407,7 +2407,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
