[clojure] 04/09: Build the upstream tarball from the Git repository

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository clojure.

commit eebc9b53b411a0dcced3b1cbd220d34e38d6e687
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Dec 22 13:05:48 2016 +0100

    Build the upstream tarball from the Git repository
---
 debian/changelog |  1 +
 debian/copyright |  3 ++-
 debian/rules     | 17 +----------------
 debian/watch     |  5 +++--
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 75a6968..8b309a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 clojure1.6 (1.6.0+dfsg-3) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build the upstream tarball from the Git repository
   * Switch to debhelper level 10
   * Use secure Vcs-* URLs
 
diff --git a/debian/copyright b/debian/copyright
index 37cb697..11d891e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Clojure
-Source: http://clojure.org/downloads
+Source: https://github.com/clojure/clojure
+Files-Excluded: .idea
 
 Files: *
 Copyright: Copyright (c) Rich Hickey. All rights reserved.
diff --git a/debian/rules b/debian/rules
index 8a1b336..5fb3511 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,11 +3,6 @@
 SOURCE = $(shell dpkg-parsechangelog | grep ^Source | sed "s/Source: //")
 VER = $(shell echo $(SOURCE) | sed s/^clojure//)
 
-VERSION = $(shell dpkg-parsechangelog | grep ^Version | sed "s/Version: //")
-ORIG_VERSION = $(shell echo $(VERSION) | sed s/-.*//)
-PRISTINE_VERSION = $(shell echo $(ORIG_VERSION) | sed s/\+dfsg//)
-UPSTREAM_VERSION = $(shell echo $(PRISTINE_VERSION) | sed s/^0\.0\.//)
-SRCDIR_NAME = $(SOURCE)-$(ORIG_VERSION).orig
 MDWN_DOCS = $(patsubst %.md,%.html,$(wildcard *.md))
 
 include /usr/share/javahelper/java-vars.mk
@@ -45,14 +40,4 @@ clean::
 	-mh_clean
 
 get-orig-source:
-	-uscan --verbose --force-download --no-symlink --upstream-version $(PRISTINE_VERSION)
-	mkdir debian/$(SRCDIR_NAME)
-	unzip -d debian/$(SRCDIR_NAME) ../clojure?$(UPSTREAM_VERSION).zip
-	if test "`ls debian/$(SRCDIR_NAME) | wc -l`" -eq "1" ; then \
-		subdir=`echo debian/$(SRCDIR_NAME)/*` && \
-		mv $$subdir/* debian/$(SRCDIR_NAME) && \
-		rmdir $$subdir ; \
-	fi
-	rm debian/$(SRCDIR_NAME)/clojure*.jar
-	tar czf ../$(SOURCE)_$(ORIG_VERSION).orig.tar.gz -C debian $(SRCDIR_NAME)
-	rm -rf debian/$(SRCDIR_NAME)
+	uscan --download-current-version --force-download --repack --rename --compression xz
diff --git a/debian/watch b/debian/watch
index 4eab44b..6778872 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
-version=3
-opts="dversionmangle=s/\+dfsg//,uversionmangle=s/^(\d{8})$/0.0.$1/" http://clojure.org/downloads .*clojure[_-]([\d.]*)\.zip
+version=4
+opts="mode=git, pgpmode=none, dversionmangle=s/\+dfsg//" \
+https://github.com/clojure/clojure refs/tags/clojure-([\d\.]+)

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