[openlayers] 04/07: Use uscan instead custom script in get-orig-source target.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository openlayers.

commit b61be4fc4cb96217ae2b49e33f49307277517f03
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Dec 22 16:23:48 2015 +0100

    Use uscan instead custom script in get-orig-source target.
---
 debian/changelog       |  1 +
 debian/get-orig-source | 74 --------------------------------------------------
 debian/rules           |  2 +-
 debian/watch           |  5 +++-
 4 files changed, 6 insertions(+), 76 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d0dc1f2..6be2ce1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ openlayers (2.13.1+ds2-2) UNRELEASED; urgency=medium
 
   * Update GitHub URL for OpenLayers 2.x.
   * Update Vcs-Browser URL to use HTTPS.
+  * Use uscan instead custom script in get-orig-source target.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 22 Dec 2015 16:16:26 +0100
 
diff --git a/debian/get-orig-source b/debian/get-orig-source
deleted file mode 100755
index d01005f..0000000
--- a/debian/get-orig-source
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-
-set -e
-
-COMPRESS=xz
-
-NAME=OpenLayers
-PACKAGE=openlayers
-
-DEBIANDIR=$(readlink -f $(dirname $0))
-PACKAGEDIR=$(readlink -f $(dirname ${DEBIANDIR}))
-PARENTDIR=$(readlink -f $(dirname ${PACKAGEDIR}))
-
-WATCHFILE=${DEBIANDIR}/watch
-
-if [ -z $VERSION ]; then
-	VERSION=$(uscan --watchfile ${WATCHFILE} --report | grep "Newest version on remote site is" | awk -F, '{print $1}' | awk '{print $7}')
-	if [ -z $VERSION ]; then
-	    echo "Error: No upstream version"
-	    exit 1
-	fi
-fi
-
-TMPDIR=$(mktemp -d)
-
-TARDIR=${PACKAGE}-${VERSION}
-TARFILE=${NAME}-${VERSION}.tar.gz
-
-# Download latest upstream tarball to temp dir
-uscan --watchfile ${WATCHFILE} --force-download --download-version ${VERSION} --destdir ${TMPDIR}
-
-cd ${TMPDIR}
-
-if [ ! -e "${TARFILE}" ]; then
-	echo "Error: Tarball not found: ${TARFILE}"
-	exit 1
-fi
-
-rm -rf ${TARDIR}
-
-tar -xaf ${TARFILE}
-
-UPSTREAMTARDIR=`find . -mindepth 1 -maxdepth 1 -type d`
-if [ "${UPSTREAMTARDIR}" != "${TARDIR}" ] ; then
-    mv "${UPSTREAMTARDIR}" "${TARDIR}"
-fi
-
-FILES="OpenLayers.js OpenLayers.debug.js"
-FILES="${FILES} OpenLayers.light.js OpenLayers.light.debug.js"
-FILES="${FILES} OpenLayers.mobile.js OpenLayers.mobile.debug.js"
-FILES="${FILES} examples/Jugl.js"
-FILES="${FILES} tools/BeautifulSoup.py"
-FILES="${FILES} tools/exampleparser.py"
-FILES="${FILES} tools/jsmin.c"
-FILES="${FILES} tools/jsmin.py"
-FILES="${FILES} tools/minimize.py"
-FILES="${FILES} tools/shrinksafe.py"
-FILES="${FILES} tools/update_dev_dir.sh"
-
-for FILE in ${FILES}; do
-	rm -rfv "${TARDIR}/${FILE}"
-done
-
-ORIGTARFILE="${PACKAGE}_${VERSION}+ds1.orig.tar.${COMPRESS}"
-
-GZIP="--best --no-name" XZ_OPT="-6v" tar --owner=root --group=root --mode=a+rX -caf ${ORIGTARFILE} "${TARDIR}"
-
-mv ${ORIGTARFILE} ${PARENTDIR}
-
-rm -rf ${TARDIR}
-cd -
-rm -rf ${TMPDIR}
-
-exit 0
diff --git a/debian/rules b/debian/rules
index fb78c71..d130f21 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,5 +48,5 @@ override_dh_compress:
 	dh_compress -Xexamples
 
 get-orig-source:
-	debian/get-orig-source
+	uscan --verbose --force-download
 
diff --git a/debian/watch b/debian/watch
index 416b74b..21869ee 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,7 @@
 version=3
-opts=uversionmangle=s/-rc/~rc/;s/-withdocs/+docs/,dversionmangle=s/\+ds.*// \
+opts=\
+dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/,\
+repacksuffix=+ds \
 https://github.com/openlayers/ol2/releases/ \
 download/release-\d.*?/OpenLayers-(\d.*?)\.tar\.gz

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