[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn4399+dfsg1-1-4-gb5af8f8

[David Paleino]

The following commit has been merged in the master branch:
commit 21618fcabb56d3fc1db461056f4c069f83f756e7
Author: David Paleino <dapal at debian.org>
Date:   Mon Sep 26 17:36:34 2011 +0200

    Reintroduce ntf_r93_b.gsb in the package: its removal should be better handled (Closes: #642976)

diff --git a/debian/README.source b/debian/README.source
index 8ea9834..fc9aaa5 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -37,14 +37,6 @@ Particularly, these files and directory were removed:
  * The i18n files contained in data/, since they're anyway
    rebuilt from to original *.po files.
 
- * The files data/ntf_r93_b.gsb, which is unfortunately
-   non-free (see http://lambert93.ign.fr/index.php?id=30).
-   This is the only removal that actually causes loss of
-   functionality. But there's nothing to do, until the
-   French National Geography Institute release these data
-   with a free license. Luckily, these data are needed
-   just for minor alignment corrections.
-
  * The files src/org/openstreetmap/josm/data/imagery/types/*,
    which are autogenerated.
 
diff --git a/debian/changelog b/debian/changelog
index 8cbbd43..5cb4639 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+josm (0.0.svn4399+dfsg2-1) UNRELEASED; urgency=low
+
+  * Reintroduce ntf_r93_b.gsb in the package: its removal should be
+    better handled (Closes: #642976)
+
+ -- David Paleino <dapal at debian.org>  Mon, 26 Sep 2011 17:36:06 +0200
+
 josm (0.0.svn4399+dfsg1-1) unstable; urgency=low
 
   [ Giovanni Mascellani ]
diff --git a/debian/rules b/debian/rules
index bfb2f02..7f63c42 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}+dfsg1.orig.tar.gz
+DESTTGZ := ../tarballs/josm_${VERSION}+dfsg2.orig.tar.gz
 
 DEB_VERSION := $(shell dpkg-parsechangelog | grep ^Version | cut -d\  -f2)
 DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | cut -d- -f1)
@@ -59,7 +59,7 @@ get-orig-source:
 	@echo Removing other useless data
 	rm -fr ${DESTDIR}/data_nodist/*.osm ${DESTDIR}/data_nodist/*.gpx ${DESTDIR}/data_nodist/*.jpg
 	@echo Removing non-free or autogenerated data
-	rm -fr ${DESTDIR}/data/*.lang ${DESTDIR}/data/ntf_r93_b.gsb
+	rm -fr ${DESTDIR}/data/*.lang
 	rm -fr ${DESTDIR}/src/org/openstreetmap/josm/data/imagery/types/*
 	@echo Building snapshot tarball
 	tar czf ${DESTTGZ} -C `dirname ${DESTDIR}` `basename ${DESTDIR}`

-- 
Editor for OpenStreetMap