[SCM] pkg-kde-jenkins packaging branch, master, updated. f6d02288e5e7de06fe974fe01942701ac3b4c8b2

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/pkg-kde-jenkins.git;a=commitdiff;h=f6d0228

The following commit has been merged in the master branch:
commit f6d02288e5e7de06fe974fe01942701ac3b4c8b2
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Nov 15 15:59:27 2016 +0100

    Implement double dot version to tag fix following dep14 update
---
 scripts/prepare_build.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh
index a6f687d..964ce92 100755
--- a/scripts/prepare_build.sh
+++ b/scripts/prepare_build.sh
@@ -51,13 +51,15 @@ expand_tag () {
         return
     fi
     version="$1"
-    python -c "print '$UPSTREAM_VCS_TAG' % {'version': '$version'}"
+    python3 -c "print('$UPSTREAM_VCS_TAG' % {'version': '$version'})"
 }
 tag_to_version () {
-    echo "$1" | sed 's/^v//;s|^upstream/||;y/%_/:~/'
+    echo "$1" | sed 's/^v//;s|^upstream/||;y/%_/:~/;s/#//'
 }
 version_to_tag () {
-    echo "$1" | tr ':~' '%_'
+    echo "$1" | tr ':~' '%_' | python3 -c '
+import re
+print(re.sub(r"\.(?=\.|$|lock$)", ".#", input()))'
 }
 
 

-- 
pkg-kde-jenkins packaging