[pkg-java] r17978 - trunk/jtreg/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-04-04 11:24:26 +0000 (Fri, 04 Apr 2014)
New Revision: 17978

Modified:
   trunk/jtreg/debian/changelog
   trunk/jtreg/debian/orig-tar.sh
   trunk/jtreg/debian/watch
Log:
Fetch the latest tagged build from the Mercurial repository



Modified: trunk/jtreg/debian/changelog
===================================================================
--- trunk/jtreg/debian/changelog	2014-04-04 11:03:55 UTC (rev 17977)
+++ trunk/jtreg/debian/changelog	2014-04-04 11:24:26 UTC (rev 17978)
@@ -1,6 +1,8 @@
 jtreg (4.1-3) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Updated debian/watch and debian/orig-tar.sh to fetch the latest tagged
+    build from the upsteam Mercurial repository.
   * debian/control:
     - Standards-Version updated to 3.9.5 (no changes)
     - Added the missing Vcs-Browser field

Modified: trunk/jtreg/debian/orig-tar.sh
===================================================================
--- trunk/jtreg/debian/orig-tar.sh	2014-04-04 11:03:55 UTC (rev 17977)
+++ trunk/jtreg/debian/orig-tar.sh	2014-04-04 11:24:26 UTC (rev 17978)
@@ -1,20 +1,15 @@
 #!/bin/sh -e
 
 # called by uscan with '--upstream-version' <version> <file>
-
-VERSION=$(dpkg-parsechangelog | sed -ne 's,^Version: \(.*\)-.*,\1,p')
-SOURCE=$(dpkg-parsechangelog | sed -ne 's,Source: \(.*\),\1,p')
-
+VERSION=$2
 DIR=jtreg-${VERSION}
-TAR=../${SOURCE}_${VERSION}.orig.tar.bz2
+TAR=../jtreg_${VERSION}.orig.tar.gz
 
-# clean up the upstream tarball
-# Export to the $DIR directory since there is no directory in 
-# the archive
-unzip $3 -d $DIR
-tar -c -j -f $TAR $DIR # -X debian/orig-tar.exclude $DIR
-rm -rf $DIR $3
+rm -f $3
+wget http://hg.openjdk.java.net/code-tools/jtreg/archive/jtreg$VERSION.tar.gz
+mv jtreg$VERSION.tar.gz $TAR
 
+
 # move to directory 'tarballs'
 if [ -r .svn/deb-layout ]; then
     . .svn/deb-layout

Modified: trunk/jtreg/debian/watch
===================================================================
--- trunk/jtreg/debian/watch	2014-04-04 11:03:55 UTC (rev 17977)
+++ trunk/jtreg/debian/watch	2014-04-04 11:24:26 UTC (rev 17978)
@@ -1,4 +1,2 @@
 version=3
-http://download.java.net/openjdk/jtreg/ \
- .*/jtreg-(.*)-src-.*.zip debian debian/orig-tar.sh
-
+https://adopt-openjdk.ci.cloudbees.com/job/jtreg/lastSuccessfulBuild/artifact/jtreg([\d\.]+(?:-b[0-9]+)?).tar.gz debian debian/orig-tar.sh