[pkg-java] r17688 - trunk/commons-parent/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-01-20 20:41:47 +0000 (Mon, 20 Jan 2014)
New Revision: 17688

Modified:
   trunk/commons-parent/debian/changelog
   trunk/commons-parent/debian/orig-tar.sh
   trunk/commons-parent/debian/watch
Log:
debian/watch: Fixed the mangling of the upstream versions



Modified: trunk/commons-parent/debian/changelog
===================================================================
--- trunk/commons-parent/debian/changelog	2014-01-20 20:34:17 UTC (rev 17687)
+++ trunk/commons-parent/debian/changelog	2014-01-20 20:41:47 UTC (rev 17688)
@@ -3,7 +3,8 @@
   * Team upload.
   * debian/control:
     - Use canonical URLs for the Vcs-* fields
-    - Standards-Version updated to 3.9.5 (no changes) 
+    - Standards-Version updated to 3.9.5 (no changes)
+  * debian/watch: Fixed the mangling of the upstream versions
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 20 Jan 2014 21:23:08 +0100
 

Modified: trunk/commons-parent/debian/orig-tar.sh
===================================================================
--- trunk/commons-parent/debian/orig-tar.sh	2014-01-20 20:34:17 UTC (rev 17687)
+++ trunk/commons-parent/debian/orig-tar.sh	2014-01-20 20:41:47 UTC (rev 17688)
@@ -3,7 +3,7 @@
 VERSION=$2
 TAR=../commons-parent_$VERSION.orig.tar.gz
 DIR=commons-parent-$VERSION
-TAG=$(echo "commons-parent-$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
+TAG=$(echo "commons-parent-$VERSION" | sed -re's/~(alpha|beta|RC)/-\1/')
 
 svn export http://svn.apache.org/repos/asf/commons/proper/commons-parent/tags/${TAG}/ $DIR
 GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR

Modified: trunk/commons-parent/debian/watch
===================================================================
--- trunk/commons-parent/debian/watch	2014-01-20 20:34:17 UTC (rev 17687)
+++ trunk/commons-parent/debian/watch	2014-01-20 20:41:47 UTC (rev 17688)
@@ -1,4 +1,4 @@
 version=3
-opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
+opts="uversionmangle=s/-(alpha|beta|RC)/~$1/" \
   http://svn.apache.org/repos/asf/commons/proper/commons-parent/tags/ \
   commons-parent-(\d.*)/ debian debian/orig-tar.sh