[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 382a15a8fe9c180eca47e7d80d769241fe5c2433
Author: David Paleino <dapal at debian.org>
Date:   Wed Mar 5 23:56:43 2014 +0100

    New DFSG tarball: removed embedded code copy of JSON-java under "good-not-evil" non-free license (Closes: #740890)

diff --git a/debian/changelog b/debian/changelog
index df63be7..c063240 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
-josm (0.0.svn6502+dfsg2-1) unstable; urgency=medium
+josm (0.0.svn6502+dfsg3-1) UNRELEASED; urgency=medium
 
   * New DFSG tarball
     - removed embedded code copy of jmapviewer (Closes: #731029)
+    - removed embedded code copy of JSON-java under "good-not-evil"
+      non-free license (Closes: #740890)
   * Added 04-use_system_jmapviewer.patch to avoid embedding parts of
     jmapviewer in the final JOSM JAR
   * Removed references to embedded jmapviewer in debian/copyright
@@ -10,7 +12,7 @@ josm (0.0.svn6502+dfsg2-1) unstable; urgency=medium
   * 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 21:05:06 +0100
+ -- David Paleino <dapal at debian.org>  Wed, 05 Mar 2014 23:55:21 +0100
 
 josm (0.0.svn6502+dfsg1-1) unstable; urgency=medium
 

-- 
Editor for OpenStreetMap