[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5576+dfsg1-1-8-gc026171

2012-12-19 Thread David Paleino 
The following commit has been merged in the master branch:
commit 3a4e655eeed36a58c98b89de913ba79a3502428c
Merge: 452029b970ac581564d69371c507194bcbe8465d 
6dbe40bcfe7d968cf1d2077701ffefeb28d233ea
Author: David Paleino da...@debian.org
Date:   Wed Dec 19 22:24:10 2012 +0100

Merge tag 'upstream/0.0.svn5608+dfsg1'

Upstream version 0.0.svn5608+dfsg1

# gpg: Signature made mer 19 dic 2012 22:24:01 CET using DSA key ID 1392B174
# gpg: Good signature from David Paleino d.pale...@gmail.com
# gpg: aka [jpeg image of size 6708]
# gpg: aka Hanska aks...@gmail.com
# gpg: aka David Paleino david.pale...@poste.it
# gpg: aka David Paleino da...@debian.org


-- 
Editor for OpenStreetMap

___
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits

[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5576+dfsg1-1-8-gc026171

2012-12-19 Thread David Paleino 
The following commit has been merged in the master branch:
commit 863686e1a7cbcd2fb7091343ac417b92212f350b
Author: David Paleino da...@debian.org
Date:   Wed Dec 19 22:28:39 2012 +0100

New tested snapshot.

diff --git a/debian/changelog b/debian/changelog
index 6be16c3..681b777 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+josm (0.0.svn5608+dfsg1-1) UNRELEASED; urgency=low
+
+  * New tested snapshot.
+
+ -- David Paleino da...@debian.org  Wed, 19 Dec 2012 22:28:24 +0100
+
 josm (0.0.svn5576+dfsg1-1) unstable; urgency=low
 
   * New tested snapshot.

-- 
Editor for OpenStreetMap

___
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits

[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5576+dfsg1-1-8-gc026171

2012-12-19 Thread David Paleino 
The following commit has been merged in the master branch:
commit 608374a298c98ad3278c7da757e9b546b26b1d82
Author: David Paleino da...@debian.org
Date:   Wed Dec 19 22:34:34 2012 +0100

Added bug number

diff --git a/debian/changelog b/debian/changelog
index 9802594..ff81b6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 josm (0.0.svn5608+dfsg1-1) UNRELEASED; urgency=low
 
-  * New tested snapshot.
+  * New tested snapshot (Closes: #695197).
   * Update josm.desktop to make it work also in Unity
 (Closes: #690585)
 

-- 
Editor for OpenStreetMap

___
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits

[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5576+dfsg1-1-8-gc026171

2012-12-19 Thread David Paleino 
The following commit has been merged in the master branch:
commit 7e9f07cb3b6df884ab7ec55909265ed11bfe9dd4
Author: David Paleino da...@debian.org
Date:   Wed Dec 19 22:30:02 2012 +0100

Patches refreshed

diff --git a/debian/patches/02-elemstyles.patch 
b/debian/patches/02-elemstyles.patch
index a94eb72..8005110 100644
--- a/debian/patches/02-elemstyles.patch
+++ b/debian/patches/02-elemstyles.patch
@@ -47,9 +47,9 @@ applications. This patch points josm to the shared 
directories.
  import org.openstreetmap.josm.gui.preferences.SourceEntry;
  import 
org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference.PresetPrefHelper;
  import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
-@@ -1273,7 +1274,20 @@ public class TaggingPreset extends Abstr
+@@ -1289,7 +1290,20 @@ public class TaggingPreset extends Abstr
  if (maxSize != null) {
- imgProv.setMaxSize(24);
+ imgProv.setMaxSize(maxSize);
  }
 -return imgProv.get();
 +ImageIcon icon = imgProv.get();
diff --git a/debian/patches/04-fix_images.patch 
b/debian/patches/04-fix_images.patch
index 1bdb5bf..b111d83 100644
--- a/debian/patches/04-fix_images.patch
+++ b/debian/patches/04-fix_images.patch
@@ -9,7 +9,7 @@ Forwarded: not-needed
 
 --- josm.orig/data/defaultpresets.xml
 +++ josm/data/defaultpresets.xml
-@@ -3109,7 +3109,7 @@ Note that for a match, at least one posi
+@@ -3243,7 +3243,7 @@ Note that for a match, at least one posi
  key key=amenity value=theatre /
  text key=name text=Name /
  /item
@@ -18,7 +18,7 @@ Forwarded: not-needed
  link 
href=http://wiki.openstreetmap.org/wiki/Tag:amenity=library;

de.href=http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=library;

fi.href=http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library;
-@@ -3428,7 +3428,7 @@ Note that for a match, at least one posi
+@@ -3562,7 +3562,7 @@ Note that for a match, at least one posi
  space /
  /item
  separator/

-- 
Editor for OpenStreetMap

___
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits