This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository gradle.
commit 699ae09eb9e62ca19bb9a83ae1cb4c7b22e94733 Author: Kai-Chung Yan <[email protected]> Date: Wed Jul 1 18:49:27 2015 +0800 Simplify uscan usage --- debian/changelog | 6 ++++-- debian/copyright | 9 +++++---- debian/orig-tar.excludes | 7 ------- debian/orig-tar.sh | 19 ------------------- debian/rules | 8 +------- debian/watch | 3 +-- 6 files changed, 11 insertions(+), 41 deletions(-) diff --git a/debian/changelog b/debian/changelog index 07c3f31..69c59b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,9 @@ gradle (1.12-2) UNRELEASED; urgency=low -* d/control: Maven is not needed at runtime - + * d/control: Maven is not needed at runtime + * d/watch: Watch services.gradle.org + * d/copyright: Add Files-Excluded for uscan + * d/rules: Simplify get-orig-source target -- Kai-Chung Yan <[email protected]> Sun, 28 Jun 2015 19:28:30 +0800 gradle (1.12-1) experimental; urgency=medium diff --git a/debian/copyright b/debian/copyright index 5ddb302..50b99cf 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,8 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Gradle Upstream-Contact: Hans Dockter <[email protected]> -Source: http://gradle.org/downloads.html +Source: http://services.gradle.org/distributions +Files-Excluded: *.zip *.war *.jar *.tar */jquery-1.10.1.min.js */libcunit.a *.lib Comment: The authors of Gradle are: - Hans Dockter (Founder and Project Lead) - Steve Appling @@ -17,12 +18,12 @@ Comment: The authors of Gradle are: - Guillaume Laforge Files: * -Copyright: © 2007-2011, The original author or authors. +Copyright: 2007-2011, The original author or authors. License: Apache-2.0 Files: debian/* -Copyright: © 2010-2011, Miguel Landaeta <[email protected]> - © 2015, Kai-Chung Yan <[email protected]> +Copyright: 2010-2011, Miguel Landaeta <[email protected]> + 2015, Kai-Chung Yan <[email protected]> License: Apache-2.0 Files: subprojects/cpp/src/integTest/resources/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest/shared/libs/cunit/2.1-2/include/* diff --git a/debian/orig-tar.excludes b/debian/orig-tar.excludes deleted file mode 100644 index 58960b7..0000000 --- a/debian/orig-tar.excludes +++ /dev/null @@ -1,7 +0,0 @@ -*.zip -*.war -*.jar -*.tar -jquery-1.10.1.min.js -libcunit.a -*.lib \ No newline at end of file diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh deleted file mode 100755 index 453f2d4..0000000 --- a/debian/orig-tar.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -set -e - -# called by uscan with '--upstream-version' <version> <file> -echo "version $2" -package=`dpkg-parsechangelog | sed -n 's/^Source: //p'` -version=$2 -upstream_version="$(echo $version | sed 's/~m/-milestone-/')" -tarball=$3 -TAR=${package}_${version}.orig.tar.xz -DIR=${package}-${upstream_version} - -unzip $tarball - -XZ_OPT=--best tar --numeric --group 0 --owner 0 -c -v -J -f $TAR \ - --anchored -X debian/orig-tar.excludes $DIR - -rm -rf $tarball $DIR diff --git a/debian/rules b/debian/rules index 886e345..4ffbf76 100755 --- a/debian/rules +++ b/debian/rules @@ -48,13 +48,7 @@ override_dh_install: rm -f debian/gradle-doc/usr/share/doc/gradle/dsl/sidebar.js get-orig-source: - cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \ - uscan \ - --verbose \ - --no-symlink \ - --destdir $(CURDIR) \ - --watchfile debian/watch \ - --force-download + uscan --download-current-version --force-download --repack --compression xz # since gradle build-depends on itself, a way to generate a deb from upstream # binary distribution is provided with this target. With the resulting .deb, diff --git a/debian/watch b/debian/watch index fa7adaf..e132e50 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,2 @@ version=3 -http://www.gradle.org/downloads .*/gradle-(\d.*)-src\.(?:tgz|tar\.(?:gz|bz2|xz)|zip) \ - debian debian/orig-tar.sh +http://services.gradle.org/distributions /distributions/gradle-(\d.*)-src\.zip \ No newline at end of file -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
