[maven-debian-helper] 01/01: Improved the mangling of the release candidate versions (1.0-rc2 -> 1.0~rc2)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository maven-debian-helper.

commit c9cb7d69832e83de6b366f71046b786957a43388
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Jul 12 23:39:47 2014 +0200

    Improved the mangling of the release candidate versions (1.0-rc2 -> 1.0~rc2)
---
 bin/mh_make                                                             | 2 +-
 debian/changelog                                                        | 1 +
 .../main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java    | 1 +
 maven-packager-utils/src/main/resources/orig-tar.svn.vm                 | 2 +-
 maven-packager-utils/src/main/resources/watch.svn.vm                    | 2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/bin/mh_make b/bin/mh_make
index 6cb62ee..c565be0 100755
--- a/bin/mh_make
+++ b/bin/mh_make
@@ -207,7 +207,7 @@ if [ $? != 0 ]; then
 fi
 
 if [ ! -f debian/changelog ]; then
-    debianVersion=$(echo ${maven_UpstreamPackageVersion} | sed -re's/-(alpha|beta)-?/~\1/')
+    debianVersion=$(echo ${maven_UpstreamPackageVersion} | sed -re's/-(alpha|beta|rc)-?/~\1/')
     dch --create --newversion=${debianVersion}-1 --package=$PACKAGE "Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>"
 fi
 
diff --git a/debian/changelog b/debian/changelog
index dc1916d..d3076d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ maven-debian-helper (1.6.8) UNRELEASED; urgency=medium
     to the ignored plugins
   * Use the --download-current-version uscan option in the generated
     debian/rules files
+  * Release candidate versions are now properly mangled (1.0-rc2 -> 1.0~rc2)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 14 Mar 2014 13:57:53 +0100
 
diff --git a/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java b/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
index 962834a..528b555 100644
--- a/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
+++ b/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
@@ -416,6 +416,7 @@ public class GenerateDebianFilesMojo extends AbstractMojo {
 
             String debianVersion = projectVersion.replace("-alpha-", "~alpha");
             debianVersion = debianVersion.replace("-beta-", "~beta");
+            debianVersion = debianVersion.replace("-rc-", "~rc");
             debianVersion += "-1";
             context.put("version.vm", debianVersion);
 
diff --git a/maven-packager-utils/src/main/resources/orig-tar.svn.vm b/maven-packager-utils/src/main/resources/orig-tar.svn.vm
index 9d9e03a..b25e90d 100644
--- a/maven-packager-utils/src/main/resources/orig-tar.svn.vm
+++ b/maven-packager-utils/src/main/resources/orig-tar.svn.vm
@@ -7,7 +7,7 @@
 VERSION=$2
 TAR=../${package}_$VERSION.orig.tar.xz
 DIR=${package}-$VERSION
-TAG=$(echo "${tagMarker}$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
+TAG=$(echo "${tagMarker}$VERSION" | sed -re's/~(alpha|beta|rc)/-\1-/')
 
 svn export ${baseUrl}/${TAG}${suffixUrl} $DIR
 XZ_OPT=--best tar -c -J -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
diff --git a/maven-packager-utils/src/main/resources/watch.svn.vm b/maven-packager-utils/src/main/resources/watch.svn.vm
index 19ef0a3..c86aa31 100644
--- a/maven-packager-utils/src/main/resources/watch.svn.vm
+++ b/maven-packager-utils/src/main/resources/watch.svn.vm
@@ -1,4 +1,4 @@
 version=3
-opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
+opts="uversionmangle=s/-(alpha|beta|rc)(-)?/~$1$2/" \
   ${baseUrl}/ \
   ${tagMarker}(\d.*)/ debian debian/orig-tar.sh

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