[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 62d4877c0af0f273dc84bbad79cb5f3fb8a71da3
Author: David Paleino <dapal at debian.org>
Date:   Thu Mar 6 00:40:38 2014 +0100

    Fix debian/rules

diff --git a/debian/rules b/debian/rules
index 1b6e057..20dfdfd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ else
 VERSION := 0.0.0.${DATE}
 endif
 DESTDIR := ../tarballs/josm-${VERSION}
-DESTTGZ := ../tarballs/josm_${VERSION}+dfsg2.orig.tar.gz
+DESTTGZ := ../tarballs/josm_${VERSION}+dfsg3.orig.tar.gz
 
 DEB_VERSION := $(shell dpkg-parsechangelog | grep ^Version | cut -d\  -f2)
 DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | cut -d- -f1)
@@ -81,6 +81,8 @@ get-orig-source:
 	rm -fr ${DESTDIR}/src/org/openstreetmap/josm/data/imagery/types/*
 	@echo Removing embedded code copy of jmapviewer
 	rm -fr ${DESTDIR}/src/org/openstreetmap/gui/jmapviewer/
+	@echo Removing non-free JSON code
+	rm -fr ${DESTDIR}/src/org/json/
 	@echo Building snapshot tarball
 	tar czf ${DESTTGZ} -C `dirname ${DESTDIR}` `basename ${DESTDIR}`
 	@echo Cleaning up

-- 
Editor for OpenStreetMap