[commons-parent] 07/16: debian/watch: Fixed the mangling of the upstream versions

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository commons-parent.

commit 276578c1571faed15137201d197499c62f6e542b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jan 20 20:41:47 2014 +0000

    debian/watch: Fixed the mangling of the upstream versions
---
 debian/changelog   | 3 ++-
 debian/orig-tar.sh | 2 +-
 debian/watch       | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 954af98..fcf8c8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,8 @@ commons-parent (22-3) UNRELEASED; urgency=medium
   * 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
 
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index b30785c..ca02793 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -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
diff --git a/debian/watch b/debian/watch
index e0a938d..b8bd498 100644
--- a/debian/watch
+++ b/debian/watch
@@ -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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/commons-parent.git