This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository derby.
commit d2de39f327178f85e5a3d0b2a0595edc672fa991 Author: Emmanuel Bourg <[email protected]> Date: Thu Jun 6 23:47:18 2013 +0000 Replaced debian/get-orig-source with debian/orig-tar.sh --- debian/changelog | 1 + debian/get-orig-source | 60 -------------------------------------------------- debian/orig-tar.sh | 21 ++++++++++++++++++ debian/rules | 2 +- debian/watch | 2 +- 5 files changed, 24 insertions(+), 62 deletions(-) diff --git a/debian/changelog b/debian/changelog index c0dffb1..34a0ee0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ derby (10.10.1.1-1) UNRELEASED; urgency=low * Renamed the package to 'derby' * Transfered the maintenance to the Java Team * debian/watch: Updated to point to the official Apache archive + * Replaced debian/get-orig-source with debian/orig-tar.sh -- Emmanuel Bourg <[email protected]> Fri, 07 Jun 2013 00:51:41 +0200 diff --git a/debian/get-orig-source b/debian/get-orig-source deleted file mode 100755 index 3fe0532..0000000 --- a/debian/get-orig-source +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -# if you need to repack for whatever reason you can -# use this script via uscan or directly -# -# FIXME: currently the code is not conform to Debian Policy -# http://www.debian.org/doc/debian-policy/ch-source.html -# "get-orig-source (optional)" -# This target may be invoked in any directory, ... -# --> currently it is assumed the script is called in the -# source directory featuring the debian/ dir - -COMPRESS=bz2 - -set -e -test -e debian/control -NAME=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'` - -SVN=http://svn.apache.org/repos/asf/db/derby/code/tags - -if ! echo $@ | grep -q upstream-version ; then - VERSION=`dpkg-parsechangelog | awk '/^Version:/ { print $2 }' | sed 's/\([0-9\.]\+\)-[0-9]\+$/\1/'` - - VERSION=`svn ls $SVN | tail -n1 | sed 's/\/$//'` -else - VERSION=`echo $@ | sed "s?^.*--upstream-version \([0-9.]\+\) .*${NAME}.*?\1?"` - if echo "$VERSION" | grep -q "upstream-version" ; then - echo "Unable to parse version number" - exit - fi -fi - -if [ -e ../${NAME}-${VERSION}.orig.tar.$COMPRESS ] ; then - echo "The tarball already exists." - false -fi - -TARDIR=${NAME}-${VERSION} -mkdir -p ../tarballs -cd ../tarballs -# need to clean up the tarballs dir first because upstream tarball might -# contain a directory with unpredictable name -# rm -rf * - -# Get from svn -svn co "$SVN"/"$VERSION" - -UPSTREAMTARDIR=`find . -mindepth 1 -maxdepth 1 -type d` -if [ "${UPSTREAMTARDIR}" != "./${TARDIR}" ] ; then - echo mv "${UPSTREAMTARDIR}" "${TARDIR}" - mv "${UPSTREAMTARDIR}" "${TARDIR}" -fi - -# Remove useless binaries and .svn -#find "${TARDIR}" -name '.*' -exec rm -rf '{}' ';' -prune -#find "${TARDIR}" -name '*.jar' -exec rm '{}' ';' - -GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX -caf "$NAME"_"$VERSION".orig.tar.${COMPRESS} "${TARDIR}" -#rm -rf ${TARDIR} - -ln -s tarballs/"$NAME"_"$VERSION".orig.tar.${COMPRESS} .. diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh new file mode 100755 index 0000000..3d05514 --- /dev/null +++ b/debian/orig-tar.sh @@ -0,0 +1,21 @@ +#!/bin/sh -e + +# called by uscan with '--upstream-version' <version> <file> +VERSION=$2 +TAR=../derby_$VERSION.orig.tar.gz +DIR=db-derby-$VERSION-src + +tar -zxf $3 +rm $3 +GZIP=--best tar -c -z -f $TAR \ + --exclude '*.bat' \ + --exclude 'tools/java/*' \ + $DIR +rm -rf $DIR +rm -rf db-derby-$VERSION-doc-src + +# 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 9c6ce76..e52eacb 100755 --- a/debian/rules +++ b/debian/rules @@ -63,4 +63,4 @@ override_dh_link: dh_link --verbose get-orig-source: - . debian/get-orig-source + uscan --force-download --download-version $(version) diff --git a/debian/watch b/debian/watch index ea37b98..f6f16d4 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -http://archive.apache.org/dist/db/derby/db-derby-([\d\.]+)/db-derby-([\d\.]+)-src.tar.gz +http://archive.apache.org/dist/db/derby/db-derby-([\d\.]+)/db-derby-([\d\.]+)-src.tar.gz debian debian/orig-tar.sh -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/derby.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
