[pkg-java] r13605 - branches/groovy/1.8/debian

[Miguel Landaeta]

Author: nomadium-guest
Date: 2011-04-28 00:44:26 +0000 (Thu, 28 Apr 2011)
New Revision: 13605

Modified:
   branches/groovy/1.8/debian/changelog
   branches/groovy/1.8/debian/orig-tar.sh
   branches/groovy/1.8/debian/rules
   branches/groovy/1.8/debian/watch
Log:
* New upstream release.


Modified: branches/groovy/1.8/debian/changelog
===================================================================
--- branches/groovy/1.8/debian/changelog	2011-04-27 12:09:23 UTC (rev 13604)
+++ branches/groovy/1.8/debian/changelog	2011-04-28 00:44:26 UTC (rev 13605)
@@ -1,3 +1,9 @@
+groovy (1.8.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Wed, 27 Apr 2011 12:37:33 -0430
+
 groovy (1.8.0~rc4-1) experimental; urgency=low
 
   * New upstream release.

Modified: branches/groovy/1.8/debian/orig-tar.sh
===================================================================
--- branches/groovy/1.8/debian/orig-tar.sh	2011-04-27 12:09:23 UTC (rev 13604)
+++ branches/groovy/1.8/debian/orig-tar.sh	2011-04-28 00:44:26 UTC (rev 13605)
@@ -2,11 +2,10 @@
 
 # called by uscan with '--upstream-version' <version> <file>
 TAR=../groovy_$2.orig.tar.gz
-DIR=groovy-$2.orig
+DIR=groovy-$2
 
 # clean up the upstream tarball
 unzip $3
-mv groovy-$(echo $2 | sed 's/~rc\(.*\)/-rc-\1/') $DIR
 GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.pdf' $DIR
 rm -rf $3 $DIR
 

Modified: branches/groovy/1.8/debian/rules
===================================================================
--- branches/groovy/1.8/debian/rules	2011-04-27 12:09:23 UTC (rev 13604)
+++ branches/groovy/1.8/debian/rules	2011-04-28 00:44:26 UTC (rev 13605)
@@ -5,7 +5,6 @@
 
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
 VERSION              := $(DEB_UPSTREAM_VERSION)
-DEB_UPSTREAM_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION)| sed 's/~rc/-rc-/')
 JAVA_HOME 	     := /usr/lib/jvm/default-java
 DEB_ANT_BUILDFILE    := build.xml
 DEB_ANT_BUILD_TARGET := install doc

Modified: branches/groovy/1.8/debian/watch
===================================================================
--- branches/groovy/1.8/debian/watch	2011-04-27 12:09:23 UTC (rev 13604)
+++ branches/groovy/1.8/debian/watch	2011-04-28 00:44:26 UTC (rev 13605)
@@ -1,3 +1,2 @@
 version=3
-opts=uversionmangle=s/-rc-([0-9])+/~rc$1/ \
 http://dist.groovy.codehaus.org/distributions/ groovy-src-(.*).zip debian debian/orig-tar.sh