[pkg-java] r14039 - trunk/libdb-je-java/debian

[Torsten Werner]

Author: twerner
Date: 2011-08-07 11:06:37 +0000 (Sun, 07 Aug 2011)
New Revision: 14039

Modified:
   trunk/libdb-je-java/debian/changelog
   trunk/libdb-je-java/debian/orig-tar.sh
   trunk/libdb-je-java/debian/rules
   trunk/libdb-je-java/debian/watch
Log:
* New upstream release
  - Fix debian/watch.
  (Closes: #599626)

Modified: trunk/libdb-je-java/debian/changelog
===================================================================
--- trunk/libdb-je-java/debian/changelog	2011-08-07 10:50:03 UTC (rev 14038)
+++ trunk/libdb-je-java/debian/changelog	2011-08-07 11:06:37 UTC (rev 14039)
@@ -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

Modified: trunk/libdb-je-java/debian/orig-tar.sh
===================================================================
--- trunk/libdb-je-java/debian/orig-tar.sh	2011-08-07 10:50:03 UTC (rev 14038)
+++ trunk/libdb-je-java/debian/orig-tar.sh	2011-08-07 11:06:37 UTC (rev 14039)
@@ -1,17 +1,14 @@
 #!/bin/sh -e
 
-# $1 = version
-TAR=../libdb-je-java_$1.orig.tar.gz
-DIR=libdb-je-java-$1.orig
+# $2 = version, $3 file
+TAR=$3
+DIR=libdb-je-java-$2.orig
 
-# Download source
-wget http://download.oracle.com/berkeley-db/je-$1.tar.gz
-
 # 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

Modified: trunk/libdb-je-java/debian/rules
===================================================================
--- trunk/libdb-je-java/debian/rules	2011-08-07 10:50:03 UTC (rev 14038)
+++ trunk/libdb-je-java/debian/rules	2011-08-07 11:06:37 UTC (rev 14039)
@@ -18,4 +18,4 @@
 	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

Modified: trunk/libdb-je-java/debian/watch
===================================================================
--- trunk/libdb-je-java/debian/watch	2011-08-07 10:50:03 UTC (rev 14038)
+++ trunk/libdb-je-java/debian/watch	2011-08-07 11:06:37 UTC (rev 14039)
@@ -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