This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository atinject-jsr330.
commit 3819551ce99901f2cd01a8b071ff77ae8e1379eb Author: Emmanuel Bourg <[email protected]> Date: Thu Oct 17 14:41:29 2013 +0200 Build the upstream tarball from the upstream SVN repository --- debian/changelog | 3 ++- debian/orig-tar.sh | 38 ++++++++++++++++++++++++-------------- debian/rules | 2 +- debian/watch | 2 +- 4 files changed, 28 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index 58964af..97881f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ -atinject-jsr330 (1.0-4) UNRELEASED; urgency=low +atinject-jsr330 (1.0+ds1-1) UNRELEASED; urgency=low * Team upload. + * Build the upstream tarball from the upstream SVN repository * Use canonical URLs for the Vcs-* fields * debian/copyright: Updated the Format URI diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index 321807b..6958853 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -1,19 +1,29 @@ -#!/bin/sh +#!/bin/sh set -e -url="http://atinject.googlecode.com/files/javax.inject.zip"; -package=`dpkg-parsechangelog | sed -n 's/^Source: //p'` -version=`dpkg-parsechangelog | sed -n 's/^Version: \(.*\)-.*/\1/p'` -tarball="javax.inject.zip" -TAR=${package}_${version}.orig.tar.gz -DIR=${package}-${version}.orig +UPSTREAM_VERSION=`echo $2 | sed -n 's/^\([0-9]\)\.0/\1/p'` +DEBIAN_VERSION=`dpkg-parsechangelog | sed -n 's/^Version: \(.*\)-.*/\1/p'` +TAG=javax.inject-tck-$UPSTREAM_VERSION +DIR=atinject-jsr330 +TAR=../atinject-jsr330_$DEBIAN_VERSION.orig.tar.xz -wget $url -unzip $tarball -d $DIR -unzip $DIR/javax.inject-src.zip -d $DIR +svn export http://atinject.googlecode.com/svn/tags/$TAG $DIR +tar -c -J -f $TAR --exclude '*.jar' --exclude '*.iml' --exclude '*.ipr' --exclude 'javadoc/*' $DIR +rm -Rf $3 $DIR -GZIP=--best tar --numeric --group 0 --owner 0 -c -v -z -f $TAR \ - --exclude '*.zip' --exclude '*.jar' $DIR - -rm -rf $tarball $DIR +#url="http://atinject.googlecode.com/files/javax.inject.zip"; +#package=`dpkg-parsechangelog | sed -n 's/^Source: //p'` +#version=`dpkg-parsechangelog | sed -n 's/^Version: \(.*\)-.*/\1/p'` +#tarball="javax.inject.zip" +#TAR=${package}_${version}.orig.tar.gz +#DIR=${package}-${version}.orig +# +#wget $url +#unzip $tarball -d $DIR +#unzip $DIR/javax.inject-src.zip -d $DIR +# +#GZIP=--best tar --numeric --group 0 --owner 0 -c -v -z -f $TAR \ +# --exclude '*.zip' --exclude '*.jar' $DIR +# +#rm -rf $tarball $DIR diff --git a/debian/rules b/debian/rules index 1509f72..f1158e0 100755 --- a/debian/rules +++ b/debian/rules @@ -21,4 +21,4 @@ override_dh_clean: get-orig-source: cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \ - ./debian/orig-tar.sh + uscan --rename --force-download diff --git a/debian/watch b/debian/watch index 80dbbaa..f0ef86e 100644 --- a/debian/watch +++ b/debian/watch @@ -1,5 +1,5 @@ version=3 -opts=uversionmangle=s/^(.*)$/$1.0/ \ +opts=uversionmangle=s/^(.*)$/$1.0/,dversionmangle=s/(.*)\+ds\d/$1/ \ http://code.google.com/p/atinject/downloads/list \ //atinject.googlecode.com/files/javax.inject-([0-9\.]+)-bundle.jar \ debian debian/orig-tar.sh -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/atinject-jsr330.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
