epic-ts

diff --git a/debian/libperl-x86-64-linux-gnu.changelog b/debian/libperl-x86-64-linux-gnu.changelog
index 5a1ec89..2c111e6 100644 (file)
--- a/debian/libperl-x86-64-linux-gnu.changelog
+++ b/debian/libperl-x86-64-linux-gnu.changelog
@@ -2,5 +2,5 @@ projects (5.22.1-9ubuntu0.6) unstable; urgency=medium
   * libperl for cross compile
   * hint for build: a dir libperl* containing the files is expected to be
   * parallel to the projects dir
- -- Michael Wagner <michael@wagnertech.de>  Sat, Apr  6 18:34:36 CEST 2019
+ -- Michael Wagner <michael@wagnertech.de>  Sat, 6 Apr 2019 18:34:36 +0100
 

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index 5eca6fe..2cb0096 100755 (executable)
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -11,7 +11,7 @@ function echo_usage {
 
 function check_unversioned {
        # has to be called in the projects base directory
-       # result: "U" in stdout or nothing
+       # result: "M" in stdout or nothing
        
        project=$(pwd)
        project=${project##*/}
@@ -21,7 +21,7 @@ function check_unversioned {
                rm $project.batch
                if [ "${wc:0:5}" != "0 0 0" ]
                then
-                       echo "MU"
+                       echo "M"
                fi
        popd >/dev/null
 }
@@ -40,18 +40,18 @@ function set_build {
                tag=$(git describe --tags 2>/dev/null) || true
                if test -z "$tag"
                then
-                       tag="0.0-TOP"
+                       tag="0.0-0TOP"
                fi
                tag_paket=${tag%_*}
                if [ "$tag_paket" != "$paket" ]
                then
-                       tag="0.0-TOP"
+                       tag="0.0-0TOP"
                fi
                changes=$(check_unversioned)
                tag="$tag$changes"
-               version=${tag%%-*}
+               version=${tag%-*}
                version=${version##*_}
-               build=${tag#*-}
+               build=${tag##*-}
        else
                echo "No configuration system found. Cannot determine version."
                exit 1