[Pkg-javascript-commits] [modestmaps-js] 12/17: Use uscan & Files-Excluded to repack the upstream tarball.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository modestmaps-js.

commit 3ddbefe6367bdf28ceac18ca76e77d12960ac20a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri May 6 20:23:44 2016 +0200

    Use uscan & Files-Excluded to repack the upstream tarball.
---
 debian/changelog |  1 +
 debian/copyright |  5 +++++
 debian/rules     | 13 ++-----------
 debian/watch     |  8 ++++++--
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f2c3a13..8d2960e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ modestmaps-js (3.3.6+ds1-2) UNRELEASED; urgency=medium
     - Add Upstream-Name field
     - Rename BSD-3 license shortname to BSD-3-Clause
     - Use standalone license paragraphs
+  * Use uscan & Files-Excluded to repack the upstream tarball.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 06 May 2016 19:12:58 +0200
 
diff --git a/debian/copyright b/debian/copyright
index fcf5538..d3f3fb1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,11 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Modest Maps JS
 Source: https://github.com/modestmaps/modestmaps-js
+ Problematic examples and pre-built javascript objects are excluded
+ from the repacked upstream tarball.
+Files-Excluded: examples/hurricanes/*
+ examples/zoompan/zoompan.pdf
+ modestmaps.min.js
 
 Files: *
 Copyright: © 2011, Stamen Design
diff --git a/debian/rules b/debian/rules
index 0dfe102..ed717d5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,14 +26,5 @@ override_dh_installexamples:
 	$(RM) debian/modestmaps-js-doc/usr/share/doc/modestmaps-js-doc/examples/bubble/excanvas.js
 
 get-orig-source:
-	uscan \
-		--verbose \
-		--force-download \
-		--download-version $(UPVER) \
-		--destdir .
-	tar xvf v$(UPVER).tar.gz
-	@echo Removing problematic examples
-	@rm -vr modestmaps-js-*/examples/hurricanes modestmaps-js-*/examples/zoompan/zoompan.pdf
-	tar cf modestmaps-js_$(UPVER)+ds1.orig.tar modestmaps-js-*/
-	gzip -9 modestmaps-js_$(UPVER)+ds1.orig.tar
-	rm -rf modestmaps-js-*/ v$(UPVER).tar.gz
+	uscan --verbose --force-download --download-version $(UPVER)
+
diff --git a/debian/watch b/debian/watch
index b775a9d..8eba77f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,8 @@
 version=3
-opts=dversionmangle=s/\+ds\d// \
+opts=\
+dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/,\
+filenamemangle=s/(?:.*?\/)?(?:rel|v|modestmaps-js)?[\-\_]?(\d\S+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/modestmaps-js-$1.$2/,\
+repacksuffix=+ds \
 https://github.com/modestmaps/modestmaps-js/tags \
-	.*/v?(\d\S*)\.tar\.gz
+(?:.*?/)?(?:rel|v|modestmaps-js)?[\-\_]?(\d\S+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/modestmaps-js.git