[groovy] 02/02: Simplify get-orig-source

[Kai-Chung Yan]

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

seamlik-guest pushed a commit to branch master
in repository groovy.

commit 2f4e5485565f398984a5e128ce5644b423c20d23
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Thu Oct 8 09:51:15 2015 +0800

    Simplify get-orig-source
---
 debian/changelog   | 10 +++++-----
 debian/copyright   |  1 +
 debian/orig-tar.py | 21 ---------------------
 debian/rules       |  8 ++++++--
 4 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 215f14d..103a561 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,14 +3,14 @@ groovy (2.4.5-1) UNRELEASED; urgency=medium
   * New upstream release
   * Rename the package back to groovy
   * Add myself to Uploaders
-  * Update get-orig-source mechanism
+  * Simplify get-orig-source mechanism
 
  -- Kai-Chung Yan <seamlikok at gmail.com>  Sat, 03 Oct 2015 10:57:26 +0800
 
 groovy2 (2.2.2+dfsg-3) unstable; urgency=medium
 
   * Relicense patches under Apache-2.0 license to make them compatible
-    with upstream and to address FTPmasters concerns. 
+    with upstream and to address FTPmasters concerns.
 
  -- Miguel Landaeta <nomadium at debian.org>  Thu, 28 Aug 2014 21:18:18 -0700
 
@@ -110,7 +110,7 @@ groovy (1.8.2-1) unstable; urgency=low
 groovy (1.8.1-2) unstable; urgency=low
 
   * Team upload.
-  
+
   [Miguel Landaeta]
   * Upload to unstable.
 
@@ -160,7 +160,7 @@ groovy (1.7.8-1) unstable; urgency=low
 
 groovy (1.7.7-1) unstable; urgency=low
 
-  * New upstream release. 
+  * New upstream release.
   * Update dates in debian/copyright file.
   * Add call to mh_clean in clean target.
 
@@ -363,7 +363,7 @@ groovy (1.5.4-1) unstable; urgency=low
  -- Varun Hiremath <varun at debian.org>  Sun, 10 Feb 2008 17:29:48 +0530
 
 groovy (1.5.2-1) unstable; urgency=low
-  
+
   * New upstream release
   * Add antlr to Build-Depends-Indep and groovy Depends (Closes: #463147)
   * Bump debhelper compat to 6
diff --git a/debian/copyright b/debian/copyright
index a26a4f9..c4b479e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
 Upstream-Name: Groovy
 Upstream-Contact: Groovy Development Team <dev at groovy.codehaus.org>
 Source: http://dl.bintray.com/groovy/maven
+Files-Excluded: *.jar
 
 Files: *
 Copyright: 2003-2013 the original author or authors
diff --git a/debian/orig-tar.py b/debian/orig-tar.py
deleted file mode 100644
index 3b0d31a..0000000
--- a/debian/orig-tar.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# This script downloads the latest upstream tarball rather than the current
-# version in debian/copyright
-
-import xml.etree.ElementTree as ET
-import sys
-import os
-
-raw_data = ""
-for line in sys.stdin:
-    raw_data += line
-xml_data = ET.fromstring(raw_data)
-version = xml_data.findall("./upstream-version")[0].text
-# The upstream tarball name pattern may change, who knows what they are doing?
-upstream_tarball_filename = "apache-groovy-src-" + version + "-incubating.zip"
-repacked_tarball_filename = "groovy_" + version + ".orig.tar.xz"
-os.system("wget http://dl.bintray.com/groovy/maven/" + upstream_tarball_filename)
-os.system("mk-origtargz --version " +
-          version +
-          " --repack --compression xz " +
-          upstream_tarball_filename)
-os.system("mv " + upstream_tarball_filename + " ..")
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index c65331d..3831a1c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,8 +71,12 @@ override_dh_link:
 			usr/share/groovy2/lib/groovy-$$MOD.jar; \
 	done
 
-get-orig-source:
-	uscan --report --dehs | python3 debian/orig-tar.py
+get-orig-source: groovy-orig.zip
+	mk-origtargz --repack --compression xz $<
+	mv $< ..
+
+groovy-orig.zip:
+	wget http://dl.bintray.com/groovy/maven/apache-groovy-src-$(DEB_VERSION_UPSTREAM)-incubating.zip -O $@
 
 get-orig-pom:
 	test '! -d maven' && mkdir -p maven

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