[pkg-java] r12386 - trunk/ehcache/debian

[Torsten Werner]

Author: twerner
Date: 2010-05-12 12:32:35 +0000 (Wed, 12 May 2010)
New Revision: 12386

Modified:
   trunk/ehcache/debian/changelog
   trunk/ehcache/debian/rules
   trunk/ehcache/debian/watch
Log:
Download ehcache-core in debian/watch.

Modified: trunk/ehcache/debian/changelog
===================================================================
--- trunk/ehcache/debian/changelog	2010-05-12 12:20:08 UTC (rev 12385)
+++ trunk/ehcache/debian/changelog	2010-05-12 12:32:35 UTC (rev 12386)
@@ -2,8 +2,9 @@
 
   * UNRELEASED
   * Switch to servlet-api-2.5.
+  * Download ehcache-core in debian/watch.
 
- -- Torsten Werner <twerner at debian.org>  Wed, 12 May 2010 14:18:08 +0200
+ -- Torsten Werner <twerner at debian.org>  Wed, 12 May 2010 14:26:47 +0200
 
 ehcache (1.5.0+dak1-3) unstable; urgency=low
 

Modified: trunk/ehcache/debian/rules
===================================================================
--- trunk/ehcache/debian/rules	2010-05-12 12:20:08 UTC (rev 12385)
+++ trunk/ehcache/debian/rules	2010-05-12 12:32:35 UTC (rev 12386)
@@ -16,4 +16,4 @@
 	dh_link -plibehcache-java usr/share/java/ehcache-${DEB_UPSTREAM_VERSION}.jar usr/share/java/ehcache.jar
 
 get-orig-source:
-	-uscan --upstream-version 0 --rename
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename

Modified: trunk/ehcache/debian/watch
===================================================================
--- trunk/ehcache/debian/watch	2010-05-12 12:20:08 UTC (rev 12385)
+++ trunk/ehcache/debian/watch	2010-05-12 12:32:35 UTC (rev 12386)
@@ -1,3 +1,3 @@
 version=3
 opts="uversionmangle=s/-/~/,dversionmangle=s/-/~/" \
-  http://sf.net/ehcache/ehcache-([\d.]+)(-distribution)?\.(tgz|tar\.gz) debian debian/orig-tar.sh
+  http://sf.net/ehcache/ehcache-core-([\d.]+)-distribution\.tar\.gz debian debian/orig-tar.sh