[readosm] 05/13: Use Files-Excluded in copyright file to repack the upstream tarball.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository readosm.

commit 9747364438f75d5be348e2a565ec23a5385a9d11
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Dec 14 20:28:35 2014 +0100

    Use Files-Excluded in copyright file to repack the upstream tarball.
---
 debian/changelog |  1 +
 debian/copyright |  4 ++++
 debian/rules     | 18 ++----------------
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 966e7e7..a44e73e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ readosm (1.0.0b+dfsg1-4) UNRELEASED; urgency=low
   * Add upstream metadata.
   * Add gbp.conf to use pristine-tar by default.
   * Refresh patches.
+  * Use Files-Excluded in copyright file to repack the upstream tarball.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sat, 29 Nov 2014 00:13:59 +0100
 
diff --git a/debian/copyright b/debian/copyright
index e6cdb92..42f0aae 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,6 +3,10 @@ Upstream-Name: ReadOSM
 Upstream-Contact: Alessandro Furieri <a.furieri at lqt.it>
 Source: https://www.gaia-gis.it/fossil/readosm/
 License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+
+Comment: The tests are removed because they contain OSM data which is licensed
+ under the Creative Commons Attribution Share-Alike license 2.0,
+ which isn't considered suitable for Debian main.
+Files-Excluded: tests/*
 
 Files: *
 Copyright: © 2012, Alessandro Furieri <a.furieri at lqt.it>
diff --git a/debian/rules b/debian/rules
index 4bb75cd..83cd6f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,11 +4,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-ifndef UPVER
-UPVER := $(shell dpkg-parsechangelog | grep ^Version | cut -d\  -f2 | cut -d- -f1 | cut -d+ -f1)
-endif
-CURVER := ${UPVER}+dfsg1
-
 %:
 	dh $@ \
 		--with autoreconf
@@ -25,14 +20,5 @@ override_dh_clean:
 	rm -rf html/ latex/
 
 get-orig-source:
-	uscan \
-		--verbose \
-		--force-download \
-		--download-version ${UPVER} \
-		--rename \
-		--destdir .
-	tar xvf readosm_${UPVER}.orig.tar.gz
-	rm -rf readosm-*/tests/
-	tar cf readosm_${CURVER}.orig.tar readosm-*/
-	bzip2 readosm_${CURVER}.orig.tar
-	rm -rf readosm_${UPVER}.orig.tar.gz readosm-*/
+	uscan --verbose --force-download --rename --repack --compression xz
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/readosm.git