[groovy] 01/02: New get-orig-source mechanism
Kai-Chung Yan
seamlik-guest at moszumanska.debian.org
Thu Oct 8 01:51:47 UTC 2015
This is an automated email from the git hooks/post-receive script.
seamlik-guest pushed a commit to branch master
in repository groovy.
commit f47f5f5589dd5349516503011c363b7314c8d1c3
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date: Sat Oct 3 11:24:09 2015 +0800
New get-orig-source mechanism
---
debian/changelog | 9 +++++++++
debian/control | 19 ++++++++++++-------
debian/copyright | 11 ++++++-----
debian/orig-tar.py | 21 +++++++++++++++++++++
debian/orig-tar.sh | 18 ------------------
debian/rules | 4 ++--
debian/watch | 4 +---
7 files changed, 51 insertions(+), 35 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f8fcc86..215f14d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+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
+
+ -- 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
diff --git a/debian/control b/debian/control
index bf59c97..7ebfc92 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,9 @@
-Source: groovy2
+Source: groovy
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Miguel Landaeta <nomadium at debian.org>
+Uploaders: Miguel Landaeta <nomadium at debian.org>,
+ Kai-Chung Yan <seamlikok at gmail.com>
Build-Depends: debhelper (>= 9)
Build-Depends-Indep: default-jdk, gradle (>= 1.4~), ant, ant-optional,
maven-repo-helper, libasm4-java, libbsf-java, libcommons-cli-java,
@@ -10,11 +11,11 @@ Build-Depends-Indep: default-jdk, gradle (>= 1.4~), ant, ant-optional,
libjline2-java, antlr, ivy, libqdox-java, libjansi-java, unzip,
libjarjar-java (>= 1.4+svn142-4~), libcobertura-java, locales-all
Standards-Version: 3.9.5
-Homepage: http://groovy.codehaus.org/
-Vcs-Git: git://anonscm.debian.org/pkg-java/groovy2.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/groovy2.git
+Homepage: http://www.groovy-lang.org
+Vcs-Git: https://anonscm.debian.org/git/pkg-java/groovy.git
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/groovy.git
-Package: groovy2
+Package: groovy
Architecture: all
Depends: ${misc:Depends}, antlr, libasm4-java, libbsf-java,
libcommons-cli-java, libcommons-logging-java, junit4, libservlet2.5-java,
@@ -23,6 +24,8 @@ Depends: ${misc:Depends}, antlr, libasm4-java, libbsf-java,
Recommends: libgpars-groovy-java (>= 1.0~), ant, ant-optional,
libjcommander-java, testng
Suggests: groovy-doc
+Breaks: groovy2
+Replaces: groovy2
Description: Agile dynamic language for the Java Virtual Machine
Groovy is an agile dynamic language for the JVM combining lots of great
features from languages like Python, Ruby and Smalltalk and making them
@@ -37,12 +40,14 @@ Description: Agile dynamic language for the Java Virtual Machine
dynamically as an alternative language such as for scripting Java objects,
templating or writing unit test cases.
-Package: groovy2-doc
+Package: groovy-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}
Recommends: default-jdk-doc
Suggests: groovy
+Breaks: groovy2-doc
+Replaces: groovy2-doc
Description: Agile dynamic language for the Java Virtual Machine (documentation)
Groovy is an agile dynamic language for the JVM combining lots of great
features from languages like Python, Ruby and Smalltalk and making them
diff --git a/debian/copyright b/debian/copyright
index 081e008..a26a4f9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+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://groovy.codehaus.org/
+Source: http://dl.bintray.com/groovy/maven
Files: *
Copyright: 2003-2013 the original author or authors
@@ -9,9 +9,10 @@ License: Apache-2.0
Files: debian/*
Copyright: 2009 Varun Hiremath <varun at debian.org>
- 2009 Torsten Werner <twerner at debian.org>
- 2009 Ludovic Claude <ludovic.claude at laposte.net>
- 2010-2014 Miguel Landaeta <nomadium at debian.org>
+ 2009 Torsten Werner <twerner at debian.org>
+ 2009 Ludovic Claude <ludovic.claude at laposte.net>
+ 2010-2014 Miguel Landaeta <nomadium at debian.org>
+ 2015 Kai-Chung Yan <seamlikok at gmail.com>
License: GPL-2
Files: debian/patches/*
diff --git a/debian/orig-tar.py b/debian/orig-tar.py
new file mode 100644
index 0000000..3b0d31a
--- /dev/null
+++ b/debian/orig-tar.py
@@ -0,0 +1,21 @@
+# 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/orig-tar.sh b/debian/orig-tar.sh
deleted file mode 100755
index 1a98814..0000000
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh -e
-
-# called by uscan with '--upstream-version' <version> <file>
-TAR=../groovy2_$2+dfsg.orig.tar.gz
-DIR=groovy-$2
-
-# clean up the upstream tarball
-unzip $3
-rm -rf $DIR/build
-GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.pdf' --exclude '*.class' $DIR --numeric-owner --owner 0 --group 0
-rm -rf $3 $DIR
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
- . .svn/deb-layout
- mv $TAR $origDir
- echo "moved $TAR to $origDir"
-fi
diff --git a/debian/rules b/debian/rules
index d4b2a6d..c65331d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,7 +72,7 @@ override_dh_link:
done
get-orig-source:
- -uscan --download-version $(UVERSION) --force-download --rename
+ uscan --report --dehs | python3 debian/orig-tar.py
get-orig-pom:
test '! -d maven' && mkdir -p maven
@@ -86,4 +86,4 @@ get-orig-pom:
for MOD in $(MODULES); do \
curl $(MAVEN_REPO_URL)/org/codehaus/groovy/groovy-$$MOD/$(UVERSION)/groovy-$$MOD-$(UVERSION).pom \
--output maven/groovy-$$MOD.pom; \
- done
+ done
\ No newline at end of file
diff --git a/debian/watch b/debian/watch
index 3bad70d..380303f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,2 @@
version=3
-opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/,dversionmangle=s/\+dfsg// \
-http://groovy.codehaus.org/Download .*/groovy-src-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)|zip) \
-debian debian/orig-tar.sh
+http://dl.bintray.com/groovy/maven :apache-groovy-src-(.+)-incubating\.zip
\ No newline at end of file
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/groovy.git
More information about the pkg-java-commits
mailing list