[libdb-je-java] 10/22: * New upstream release - Fix debian/watch. (Closes: #599626)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository libdb-je-java.

commit e078605c83999526ab274e6c6f52c1c062481016
Author: Torsten Werner <twerner at debian.org>
Date:   Sun Aug 7 11:06:37 2011 +0000

    * New upstream release
      - Fix debian/watch.
      (Closes: #599626)
---
 debian/changelog   |  8 ++++++++
 debian/orig-tar.sh | 15 ++++++---------
 debian/rules       |  2 +-
 debian/watch       |  4 +++-
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 61ef609..415b4bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libdb-je-java (3.3.98-1) unstable; urgency=low
+
+  * New upstream release
+    - Fix debian/watch.
+    (Closes: #599626)
+
+ -- Torsten Werner <twerner at debian.org>  Sun, 07 Aug 2011 12:59:39 +0200
+
 libdb-je-java (3.3.62-3) unstable; urgency=low
 
   * Convert to default-jre/jdk, thanks to Chris Cheney for the patch
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 3f63a7b..fa08756 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -1,17 +1,14 @@
 #!/bin/sh -e
 
-# $1 = version
-TAR=../libdb-je-java_$1.orig.tar.gz
-DIR=libdb-je-java-$1.orig
-
-# Download source
-wget http://download.oracle.com/berkeley-db/je-$1.tar.gz
+# $2 = version, $3 file
+TAR=$3
+DIR=libdb-je-java-$2.orig
 
 # clean up the upstream tarball
-tar -x -z -f je-$1.tar.gz
-mv je-$1 $DIR
+tar -x -z -f $TAR
+mv je-$2 $DIR
 GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*/docs/*' $DIR
-rm -rf $DIR je-$1.tar.gz
+rm -rf $DIR
 
 # move to directory 'tarballs'
 if [ -r .svn/deb-layout ]; then
diff --git a/debian/rules b/debian/rules
index f3b6f8b..f6fd1bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,4 +18,4 @@ binary-predeb/libdb-je-java::
 	find  $(DEB_DESTDIR) -type 'd' -empty -delete
 
 get-orig-source:
-	sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION)
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
diff --git a/debian/watch b/debian/watch
index aa855f3..d35529b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,4 @@
 version=3
-http://download.oracle.com/berkeley-db/je-(.*).tar.gz
+http://www.oracle.com/technetwork/database/berkeleydb/downloads/index-098622.html \
+  http://download.oracle.com/berkeley-db/je-(.*).tar.gz \
+  debian debian/orig-tar.sh

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