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

2012-12-20 Thread David Paleino 
The following commit has been merged in the master branch:
commit 2995c3a3676b189873cf114ee90602c7fd98a7f3
Author: David Paleino 
Date:   Thu Dec 20 22:54:35 2012 +0100

Split translations to josm-l10n package (Closes: #647744).

diff --git a/debian/changelog b/debian/changelog
index f11b5dd..c2ca224 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ josm (0.0.svn5608+dfsg1-1) UNRELEASED; urgency=low
   * Fixed patch to load images from the openstreetmap-map-icons
 package (Closes: #693486).
   * Move useful shareable data out of the jar.
+  * Split translations to josm-l10n package (Closes: #647744).
 
- -- David Paleino   Thu, 20 Dec 2012 22:44:42 +0100
+ -- David Paleino   Thu, 20 Dec 2012 22:54:05 +0100
 
 josm (0.0.svn5576+dfsg1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 1bf389b..f92cba6 100644
--- a/debian/control
+++ b/debian/control
@@ -37,6 +37,7 @@ Depends:
  , ant
  , ${misc:Depends}
 Recommends: josm-plugins
+ , josm-l10n
  , webkit-image-gtk | webkit-image-qt
 Description: Editor for OpenStreetMap
  JOSM is an editor for OpenStreetMap (OSM) written in Java.
@@ -49,3 +50,21 @@ Description: Editor for OpenStreetMap
  The project was started because most maps you think of as free actually
  have legal or technical restrictions on their use, holding back people
  from using them in creative, productive or unexpected ways.
+
+Package: josm-l10n
+Architecture: all
+Depends:
+ ${misc:Depends}
+Description: Editor for OpenStreetMap - translation files
+ JOSM is an editor for OpenStreetMap (OSM) written in Java.
+ The current version supports stand alone GPX tracks, GPX track data
+ from OSM database and existing nodes, line segments and metadata tags
+ from the OSM database.
+ .
+ OpenStreetMap is a project aimed squarely at creating and providing
+ free geographic data such as street maps to anyone who wants them. 
+ The project was started because most maps you think of as free actually
+ have legal or technical restrictions on their use, holding back people
+ from using them in creative, productive or unexpected ways.
+ .
+ This package contains the translation files for JOSM.
diff --git a/debian/josm-l10n.install b/debian/josm-l10n.install
new file mode 100644
index 000..7661663
--- /dev/null
+++ b/debian/josm-l10n.install
@@ -0,0 +1 @@
+data/*.lang/usr/share/josm/data/
diff --git a/debian/install b/debian/josm.install
similarity index 100%
rename from debian/install
rename to debian/josm.install
diff --git a/debian/manpages b/debian/josm.manpages
similarity index 100%
rename from debian/manpages
rename to debian/josm.manpages
diff --git a/debian/patches/06-move_data_out_of_jar.patch 
b/debian/patches/06-move_data_out_of_jar.patch
index fb4a758..7489cf7 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -13,7 +13,8 @@ Forwarded: not-needed
  src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java
 |4 ++--
  src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java   
 |2 +-
  src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java 
 |2 +-
- 9 files changed, 15 insertions(+), 15 deletions(-)
+ src/org/openstreetmap/josm/tools/I18n.java
 |7 ++-
+ 10 files changed, 21 insertions(+), 16 deletions(-)
 
 --- josm.orig/build.xml
 +++ josm/build.xml
@@ -130,3 +131,26 @@ Forwarded: not-needed
  } else {
  parser.start(in);
  }
+--- josm.orig/src/org/openstreetmap/josm/tools/I18n.java
 josm/src/org/openstreetmap/josm/tools/I18n.java
+@@ -7,6 +7,7 @@ import java.io.FileInputStream;
+ import java.io.InputStream;
+ import java.io.IOException;
+ import java.net.URL;
++import java.net.MalformedURLException;
+ import java.text.MessageFormat;
+ import java.util.ArrayList;
+ import java.util.Arrays;
+@@ -308,7 +309,11 @@ public class I18n {
+ }
+ 
+ private static URL getTranslationFile(String lang) {
+-return Main.class.getResource("/data/"+lang+".lang");
++try {
++return new URL("file:///usr/share/josm/data/"+lang+".lang");
++} catch (MalformedURLException ex) {
++return null;
++}
+ }
+ 
+ /**
diff --git a/debian/rules b/debian/rules
index 8666768..beee4cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,10 @@ override_dh_auto_install:
install -m 644 $(CURDIR)/images/logo.png 
$(CURDIR)/debian/josm/usr/share/pixmaps/josm.png
install -m 644 $(CURDIR)/debian/josm.desktop 
$(CURDIR)/debian/josm/usr/share/applications/josm.desktop
 
+override_dh_install:
+   dh_install
+   # remove *.lang files, since we ship them in josm-l10n
+   rm -rf $(CURDIR)/debian/josm/usr/share/josm/data/*.lang
 
 get-orig-source:
dh_testdir

-- 
Editor for OpenStreetMap

___
Pkg-osm-commits mailing list
Pkg-

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

2012-12-20 Thread David Paleino 
The following commit has been merged in the master branch:
commit 6ff60364cdb78c93e4aabbe0497dd5cc23e91141
Author: David Paleino 
Date:   Fri Dec 21 00:00:36 2012 +0100

Releasing to sid

diff --git a/debian/changelog b/debian/changelog
index 8c944b6..974ed7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-josm (0.0.svn5608+dfsg1-1) UNRELEASED; urgency=low
+josm (0.0.svn5608+dfsg1-1) unstable; urgency=low
 
   * New tested snapshot (Closes: #695197).
   * Update josm.desktop to make it work also in Unity
@@ -9,7 +9,7 @@ josm (0.0.svn5608+dfsg1-1) UNRELEASED; urgency=low
   * Split translations to josm-l10n package (Closes: #647744).
   * Fix Vcs-* fields.
 
- -- David Paleino   Thu, 20 Dec 2012 23:57:45 +0100
+ -- David Paleino   Fri, 21 Dec 2012 00:00:28 +0100
 
 josm (0.0.svn5576+dfsg1-1) unstable; urgency=low
 

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

2012-12-20 Thread David Paleino 
The following commit has been merged in the master branch:
commit 37365ccefb6452c8e168276061ee430cf60ffb08
Author: David Paleino 
Date:   Thu Dec 20 23:57:51 2012 +0100

Fix Vcs-* fields.

diff --git a/debian/changelog b/debian/changelog
index c2ca224..8c944b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ josm (0.0.svn5608+dfsg1-1) UNRELEASED; urgency=low
 package (Closes: #693486).
   * Move useful shareable data out of the jar.
   * Split translations to josm-l10n package (Closes: #647744).
+  * Fix Vcs-* fields.
 
- -- David Paleino   Thu, 20 Dec 2012 22:54:05 +0100
+ -- David Paleino   Thu, 20 Dec 2012 23:57:45 +0100
 
 josm (0.0.svn5576+dfsg1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index f92cba6..434c2a5 100644
--- a/debian/control
+++ b/debian/control
@@ -21,8 +21,8 @@ Build-Depends:
  , libterm-readkey-perl
 Standards-Version: 3.9.4
 Homepage: http://josm.openstreetmap.de
-Vcs-Git: git://git.debian.org/pkg-osm/josm.git
-Vcs-Browser: http://git.debian.org/?p=pkg-osm/josm.git
+Vcs-Git: git://anonscm.debian.org/pkg-osm/josm.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-osm/josm.git
 
 Package: josm
 Architecture: all

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

2012-12-20 Thread David Paleino 
The following commit has been merged in the master branch:
commit d5c1c58a809badf732ba00f9010eb5715e6325e2
Author: David Paleino 
Date:   Fri Dec 21 00:00:24 2012 +0100

Remove x bit

diff --git a/debian/rules b/debian/rules
index beee4cc..a0ffb48 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,6 +42,8 @@ override_dh_install:
dh_install
# remove *.lang files, since we ship them in josm-l10n
rm -rf $(CURDIR)/debian/josm/usr/share/josm/data/*.lang
+   # remove executable bit
+   chmod a-x $(CURDIR)/debian/josm/usr/share/josm/data/defaultpresets.xml
 
 get-orig-source:
dh_testdir

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

2012-12-20 Thread David Paleino 
The following commit has been merged in the master branch:
commit 2a1def7a69795a9d8670dfb387da49acf33fbe5c
Author: David Paleino 
Date:   Thu Dec 20 22:45:21 2012 +0100

Move useful shareable data out of the jar.

diff --git a/debian/changelog b/debian/changelog
index 6112851..f11b5dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ josm (0.0.svn5608+dfsg1-1) UNRELEASED; urgency=low
 (Closes: #690585)
   * Fixed patch to load images from the openstreetmap-map-icons
 package (Closes: #693486).
+  * Move useful shareable data out of the jar.
 
- -- David Paleino   Thu, 20 Dec 2012 19:39:56 +0100
+ -- David Paleino   Thu, 20 Dec 2012 22:44:42 +0100
 
 josm (0.0.svn5576+dfsg1-1) unstable; urgency=low
 
diff --git a/debian/install b/debian/install
new file mode 100644
index 000..a0eeae2
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,3 @@
+images//usr/share/josm/
+styles//usr/share/josm/
+data/  /usr/share/josm/
diff --git a/debian/patches/06-move_data_out_of_jar.patch 
b/debian/patches/06-move_data_out_of_jar.patch
new file mode 100644
index 000..fb4a758
--- /dev/null
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -0,0 +1,132 @@
+From: David Paleino 
+Subject: move sharable data out of josm.jar
+Origin: vendor
+Forwarded: not-needed
+
+---
+ build.xml 
 |6 +++---
+ src/org/openstreetmap/josm/data/Preferences.java  
 |2 +-
+ src/org/openstreetmap/josm/data/projection/Projections.java   
 |2 +-
+ 
src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java 
|4 ++--
+ src/org/openstreetmap/josm/data/validation/tests/TagChecker.java  
 |6 +++---
+ src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java   
 |2 +-
+ src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java
 |4 ++--
+ src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java   
 |2 +-
+ src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java 
 |2 +-
+ 9 files changed, 15 insertions(+), 15 deletions(-)
+
+--- josm.orig/build.xml
 josm/build.xml
+@@ -84,9 +84,9 @@ Debian-Release: ${debian.version}
+   
+   
+ 
+-
+-
+-
++
++
++
+ 
+ 
+ 
+--- josm.orig/src/org/openstreetmap/josm/data/Preferences.java
 josm/src/org/openstreetmap/josm/data/Preferences.java
+@@ -1511,7 +1511,7 @@ public class Preferences {
+ 
+ public void validateXML(Reader in) throws Exception {
+ SchemaFactory factory =  
SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+-Schema schema = factory.newSchema(new StreamSource(new 
MirroredInputStream("resource://data/preferences.xsd")));
++Schema schema = factory.newSchema(new StreamSource(new 
MirroredInputStream("/usr/share/josm/data/preferences.xsd")));
+ Validator validator = schema.newValidator();
+ validator.validate(new StreamSource(in));
+ }
+--- josm.orig/src/org/openstreetmap/josm/data/projection/Projections.java
 josm/src/org/openstreetmap/josm/data/projection/Projections.java
+@@ -121,7 +121,7 @@ public class Projections {
+ private static void loadInits() {
+ Pattern epsgPattern = Pattern.compile("<(\\d+)>(.*)<>");
+ try {
+-InputStream in = new MirroredInputStream("resource://data/epsg");
++InputStream in = new 
MirroredInputStream("/usr/share/josm/data/epsg");
+ BufferedReader r = new BufferedReader(new InputStreamReader(in));
+ String line, lastline = "";
+ while ((line = r.readLine()) != null) {
+--- 
josm.orig/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java
 
josm/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java
+@@ -317,7 +317,7 @@ public class TaggingPresetPreference imp
+ 
+ @Override
+ public Collection getDefault() {
+-ExtendedSourceEntry i = new 
ExtendedSourceEntry("defaultpresets.xml", "resource://data/defaultpresets.xml");
++ExtendedSourceEntry i = new 
ExtendedSourceEntry("defaultpresets.xml", 
"/usr/share/josm/data/defaultpresets.xml");
+ i.title = tr("Internal Preset");
+ i.description = tr("The default preset for JOSM");
+ return Collections.singletonList(i);
+--- josm.orig/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
 josm/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
+@@ -68,9 +68,9 @@ import org.openstreetmap.josm.tools.Mult
+ public class TagChecker extends Test
+ {
+ /** The default data files */
+-public static final String DATA_FILE = "resource://data/tagchecker.cfg";
+-public stati

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

2012-12-20 Thread David Paleino 
The following commit has been merged in the master branch:
commit ee2394354f4f8ec0d1b704e8ac4b781b350b4ac0
Author: David Paleino 
Date:   Thu Dec 20 19:40:20 2012 +0100

Fixed patch to load images from the openstreetmap-map-icons package 
(Closes: #693486).

diff --git a/debian/changelog b/debian/changelog
index ff81b6d..6112851 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ josm (0.0.svn5608+dfsg1-1) UNRELEASED; urgency=low
   * New tested snapshot (Closes: #695197).
   * Update josm.desktop to make it work also in Unity
 (Closes: #690585)
+  * Fixed patch to load images from the openstreetmap-map-icons
+package (Closes: #693486).
 
- -- David Paleino   Wed, 19 Dec 2012 22:31:27 +0100
+ -- David Paleino   Thu, 20 Dec 2012 19:39:56 +0100
 
 josm (0.0.svn5576+dfsg1-1) unstable; urgency=low
 
diff --git a/debian/patches/02-elemstyles.patch 
b/debian/patches/02-elemstyles.patch
index fbea55d..d55d772 100644
--- a/debian/patches/02-elemstyles.patch
+++ b/debian/patches/02-elemstyles.patch
@@ -8,10 +8,9 @@ the openstreetmap-map-icons-* packages, so they can be used 
also by other
 applications. This patch points josm to the shared directories.
 
 ---
- src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java |   11 ++--
- src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java   |   16 
+++-
- src/org/openstreetmap/josm/tools/ImageProvider.java |4 +--
- 3 files changed, 25 insertions(+), 6 deletions(-)
+ src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java |   11 +++-
+ src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java   |   30 
+---
+ 2 files changed, 32 insertions(+), 9 deletions(-)
 
 --- josm.orig/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
 +++ josm/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
@@ -28,7 +27,7 @@ applications. This patch points josm to the shared 
directories.
  return dirs;
  }
  
-+public static void addDebianDirs(List f) {
++public static void addDebianDirs(Collection f) {
 +f.add("/usr/share/icons/openstreetmap/classic.small");
 +f.add("/usr/share/icons/openstreetmap/square.small");
 +f.add("/usr/share/icons/openstreetmap/classic.big");
@@ -48,45 +47,56 @@ 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;
-@@ -1289,7 +1290,20 @@ public class TaggingPreset extends Abstr
+@@ -1284,12 +1285,22 @@ public class TaggingPreset extends Abstr
+ }
+ 
+ protected static ImageIcon loadImageIcon(String iconName, File zipIcons, 
Integer maxSize) {
+-final Collection s = 
Main.pref.getCollection("taggingpreset.icon.sources", null);
+-ImageProvider imgProv = new 
ImageProvider(iconName).setDirs(s).setId("presets").setArchive(zipIcons).setOptional(true);
++LinkedList s = new LinkedList();
++MapPaintStyles.addDebianDirs(s);
++String realIconName = iconName;
++if (iconName.startsWith("styles/standard/")) {
++realIconName = iconName.replace("styles/standard/", "");
++}
++ImageProvider imgProv = new 
ImageProvider(realIconName).setDirs(s).setId("presets").setArchive(zipIcons).setOptional(true);
  if (maxSize != null) {
  imgProv.setMaxSize(maxSize);
  }
 -return imgProv.get();
 +ImageIcon icon = imgProv.get();
 +if (icon == null) {
-+if (iconName.startsWith("styles/standard/")) {
-+String realIconName = iconName.replaceAll("styles/standard/", 
"");
-+LinkedList dirs = new LinkedList();
-+MapPaintStyles.addDebianDirs(dirs);
-+icon = new 
ImageProvider(realIconName).setDirs(dirs).setId("presets").setArchive(zipIcons).setOptional(true).get();
-+}
-+if (icon == null) {
-+System.out.println("Could not get presets icon " + iconName);
-+icon = new ImageIcon(iconName);
-+}
++System.out.println("Could not get presets icon " + realIconName);
++icon = new ImageIcon(realIconName);
 +}
 +return icon;
  }
  
  /*
 josm.orig/src/org/openstreetmap/josm/tools/ImageProvider.java
-+++ josm/src/org/openstreetmap/josm/tools/ImageProvider.java
-@@ -424,7 +424,7 @@ public class ImageProvider {
- String full_name = subdir + name + ext;
- String cache_name = full_name;
- /* cache separately */
--if (dirs != null && dirs.size() > 0) {
-+if (this.dirs != null && this.dirs.size() > 0) {
- cache_name = "id:" + id + ":" + full_name;
- if(archive != null) {
-