[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn6502+dfsg1-1-21-g413ac40

[David Paleino]

The following commit has been merged in the master branch:
commit 34d4acd770e158f58dbff34d92f56ed58e0e1540
Author: David Paleino <dapal at debian.org>
Date:   Thu Mar 6 00:20:15 2014 +0100

    Added 08-use_external_json_library.patch to build against the system-wide free version of the JSON library

diff --git a/debian/changelog b/debian/changelog
index c063240..295e323 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,13 +6,15 @@ josm (0.0.svn6502+dfsg3-1) UNRELEASED; urgency=medium
       non-free license (Closes: #740890)
   * Added 04-use_system_jmapviewer.patch to avoid embedding parts of
     jmapviewer in the final JOSM JAR
+  * Added 08-use_external_json_library.patch to build against the
+    system-wide free version of the JSON library
   * Removed references to embedded jmapviewer in debian/copyright
   * De-fuzzed 00-build.patch, 05-fix_version.patch and
     06-move_data_out_of_jar.patch
   * Bumped debhelper compatibility to 9
   * Bumped Standards-Version to 3.9.5, no changes needed
 
- -- David Paleino <dapal at debian.org>  Wed, 05 Mar 2014 23:55:21 +0100
+ -- David Paleino <dapal at debian.org>  Thu, 06 Mar 2014 00:19:35 +0100
 
 josm (0.0.svn6502+dfsg1-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 1944d75..9473c74 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,7 @@ Build-Depends:
  , liboauth-signpost-java (>= 1.2)
  , libsvgsalamander-java
  , libterm-readkey-perl
+ , libandroid-json-org-java
  , jmapviewer
 Standards-Version: 3.9.5
 Homepage: http://josm.openstreetmap.de
@@ -38,6 +39,7 @@ Depends:
  , openstreetmap-map-icons-classic
  , ant
  , jmapviewer
+ , libandroid-json-org-java
  , ${misc:Depends}
 Recommends: josm-plugins
  , josm-l10n
diff --git a/debian/patches/08-use_external_json_library.patch b/debian/patches/08-use_external_json_library.patch
new file mode 100644
index 0000000..863bb32
--- /dev/null
+++ b/debian/patches/08-use_external_json_library.patch
@@ -0,0 +1,36 @@
+From: David Paleino <dapal at debian.org>
+Subject: depend on external free version of the JSON library
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=740890
+Origin: vendor
+Forwarded: no
+
+---
+ CONTRIBUTION |    6 +-----
+ build.xml    |    1 +
+ 2 files changed, 2 insertions(+), 5 deletions(-)
+
+--- josm.orig/build.xml
++++ josm/build.xml
+@@ -31,6 +31,7 @@
+ 			<include name="ant.jar"/>
+ 			<include name="commons-codec.jar"/>
+ 			<include name="jmapviewer.jar"/>
++			<include name="json.jar"/>
+         </fileset>
+     </path>
+     <property name="classpathprop-colon" refid="classpath"/>
+--- josm.orig/CONTRIBUTION
++++ josm/CONTRIBUTION
+@@ -55,10 +55,6 @@ is from Stuart D. Gathman and licensed w
+ The Ellipsoid code (http://www.i3s.unice.fr/~johan/gps/)
+ is from Johan Montagnat and licensed with GPL.
+ 
+-The JSON code (https://github.com/douglascrockford/JSON-java)
+-is from Douglas Crockford and licensed as follows:
+-"The Software shall be used for Good, not Evil."
+-
+ The opening hour validation uses code from opening_hour.js
+ (https://github.com/ypid/opening_hours.js) which is licensed
+-with the New (2-clause) BSD license.
+\ No newline at end of file
++with the New (2-clause) BSD license.
diff --git a/debian/patches/series b/debian/patches/series
index 59364ac..bf431ca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 #100-fix_SlippyMapBBoxChooser.patch
 06-move_data_out_of_jar.patch
 07-downgrade-metadata-extractor.patch
+08-use_external_json_library.patch
diff --git a/debian/rules b/debian/rules
index 01a7e04..1b6e057 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 export JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=/usr/share/java/gettext-commons.jar:/usr/share/java/metadata-extractor.jar:/usr/share/java/signpost-core.jar:/usr/share/java/jmapviewer.jar
+export CLASSPATH=/usr/share/java/gettext-commons.jar:/usr/share/java/metadata-extractor.jar:/usr/share/java/signpost-core.jar:/usr/share/java/jmapviewer.jar:/usr/share/java/json.jar
 
 SVNREPO := http://josm.openstreetmap.de/svn/trunk
 SVNI18NREPO := http://svn.openstreetmap.org/applications/editors/josm/i18n/

-- 
Editor for OpenStreetMap