[commons-csv] 31/35: Updated debian/watch

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository commons-csv.

commit 48c6be50066614e77eebaf13860ea28c879ceff9
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Sep 29 14:35:26 2015 +0200

    Updated debian/watch
---
 debian/changelog       |  1 +
 debian/copyright       |  1 +
 debian/get-orig-source | 27 ---------------------------
 debian/rules           |  2 +-
 debian/uscan           | 14 --------------
 debian/watch           |  3 +--
 6 files changed, 4 insertions(+), 44 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1021418..58206d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ commons-csv (0.1-SNAPSHOT+svn678580-4) UNRELEASED; urgency=medium
     - Removed the deprecated DM-Upload-Allowed field
   * Switch to debhelper level 9
   * debian/copyright: Converted to the Copyright Format 1.0
+  * Updated debian/watch
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 29 Sep 2015 13:23:47 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 35a01ca..cdfb152 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Apache Commons CSV
 Source: http://svn.apache.org/repos/asf/commons/proper/csv/
+Files-Excluded: */src/test/resources/perf/*
 
 Files: *
 Copyright: 2001-2008, The Apache Software Foundation
diff --git a/debian/get-orig-source b/debian/get-orig-source
deleted file mode 100755
index 73e6d27..0000000
--- a/debian/get-orig-source
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# Retrieves the svn revision indicated in the Debian changelog from the Apache
-# subversion repository and builds the .orig.tar.gz file.
-
-REVISION=`dpkg-parsechangelog | grep "^Version:" | grep -o "+svn[0-9]\+" | grep -o "[0-9]\+"`
-BASEURL="http://svn.apache.org/repos/asf/commons/sandbox/csv/trunk/"
-
-TEMPDIR=`mktemp -d`
-DESTDIR=$PWD/..
-
-cd $TEMPDIR
-echo "Checking out revision $REVISION from $BASEURL to $TEMPDIR"
-svn co -q -r $REVISION "$BASEURL" 
-
-cd trunk
-REVISION=`svn info | grep "^Revision:" | grep -o "[0-9]\+"`
-DESTFILE="${DESTDIR}/commons-csv_0.1-SNAPSHOT+svn${REVISION}.orig.tar.gz"
-
-echo "Creating $DESTFILE"
-tar czf "$DESTFILE" --exclude=".svn" .
-
-echo "Cleaning up $TEMPDIR"
-rm -rf "$TEMPDIR"
-
-LATEST_UPSTREAM_REVISION=`svn info -R $BASEURL | grep -i "last changed rev:" | grep -o "[0-9]\+" | sort -n | tail -n 1`
-echo "Using revision $REVISION; Latest revision in upstream repository: $LATEST_UPSTREAM_REVISION"
diff --git a/debian/rules b/debian/rules
index 605e228..dc0f2a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,4 +40,4 @@ restore-from-source: remove-source
 	tar xzf ../commons-csv_$(UPSTREAM_VERSION).orig.tar.gz
 
 get-orig-source:
-	debian/get-orig-source
+	uscan --download-current-version --rename --force-download
diff --git a/debian/uscan b/debian/uscan
deleted file mode 100755
index 0a1a15b..0000000
--- a/debian/uscan
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# Check whether the source version of the Debian package is the most recent
-# revision of commons-cvs in the Apache subversion repository.
-
-REVISION=`dpkg-parsechangelog | grep "^Version:" | grep -o "+svn[0-9]\+" | grep -o "[0-9]\+"`
-BASEURL="http://svn.apache.org/repos/asf/commons/sandbox/csv/trunk/"
-LATEST_UPSTREAM_REVISION=`svn info -R $BASEURL | grep -i "last changed rev:" | grep -o "[0-9]\+" | sort -n | tail -n 1`
-
-if [ "$REVISION" != "$LATEST_UPSTREAM_REVISION" ]; then
-  echo "Using revision $REVISION; Latest revision in upstream repository: $LATEST_UPSTREAM_REVISION"
-else 
-  echo "Using up-to-date revision $REVISION"
-fi
diff --git a/debian/watch b/debian/watch
index 243dc1b..ff7a938 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
 version=3
-opts=uversionmangle=s/^/0.1-SNAPSHOT+svn/ \
- http://svn.apache.org/viewvc/commons/sandbox/csv/trunk/ /viewvc\?view=revision&revision=(\d+)$
+http://archive.apache.org/dist/commons/csv/source/commons-csv-([\d\.]+)-src.tar.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/commons-csv.git