The following commit has been merged in the master branch:
commit 2995c3a3676b189873cf114ee90602c7fd98a7f3
Author: David Paleino <da...@debian.org>
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 <da...@debian.org> Thu, 20 Dec 2012 22:44:42 +0100
+ -- David Paleino <da...@debian.org> 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 0000000..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-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
