[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.15.24-6-g91f03c2

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/pkg-kde-tools.git;a=commitdiff;h=91f03c2

The following commit has been merged in the master branch:
commit 91f03c2aed13c838db5c5b304fe9e14c71513b96
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Aug 30 16:52:55 2017 +0300

    pkgkde-vcs: Make Git version mangling more close to DEP-14.
    
    Do not strip epoch numbers, and replace tildes with underscores.
    
    Thanks to Sandro Knauß and Maximiliano Curia for the suggestions.
---
 debian/changelog | 2 ++
 pkgkde-vcs       | 4 +---
 vcslib/git.sh    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ff89bb9..f87740c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ pkg-kde-tools (0.15.25) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * pkgkde-vcs: Add jessie and stretch to supported distributions (Closes:
     #873243). Thanks to Sandro Knauß for the initial patch.
+  * pkgkde-vcs: Make Git version mangling more close to DEP-14: do not
+    strip epoch numbers, and replace tildes with underscores.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 27 Jun 2017 15:44:05 +0300
 
diff --git a/pkgkde-vcs b/pkgkde-vcs
index 98f5368..96269b7 100755
--- a/pkgkde-vcs
+++ b/pkgkde-vcs
@@ -131,9 +131,7 @@ get_debian_package_info()
     if [ -f "$rootdir/debian/changelog" ]; then
         _pchangelog="$(dpkg-parsechangelog "-l$rootdir/debian/changelog")"
         DEB_VERSION="$(echo "$_pchangelog" | _get_deb_field 'Version')"
-        if [ -n "$DEB_VERSION" ]; then
-            DEB_VERSION_WO_EPOCH=$(echo $DEB_VERSION | sed 's/^[[:digit:]]\+://')
-        else
+        if [ -z "$DEB_VERSION" ]; then
             die "unable to determine package version."
         fi
         DEB_SOURCE="$(echo "$_pchangelog" | _get_deb_field 'Source')"
diff --git a/vcslib/git.sh b/vcslib/git.sh
index 4f46993..3359fab 100644
--- a/vcslib/git.sh
+++ b/vcslib/git.sh
@@ -24,7 +24,7 @@ git_tag()
     is_distribution_valid || die "invalid Debian distribution for tagging - $DEB_DISTRIBUTION"
     git_is_working_tree_clean || die "working tree is dirty. Commit changes before tagging."
 
-    tag_path="debian/`git_compat_debver $DEB_VERSION_WO_EPOCH`"
+    tag_path="debian/`git_compat_debver $DEB_VERSION`"
     tag_msg="$DEB_VERSION $DEB_DISTRIBUTION; urgency=$DEB_URGENCY"
 
     runcmd git tag $tag_path -m "$tag_msg" "$@"
@@ -127,7 +127,7 @@ git_update_config()
 
 git_compat_debver()
 {
-    echo "$1" | tr "~" "-"
+    echo "$1" | tr ":" "%" | tr "~" "_"
 }
 
 git_is_working_tree_clean()

-- 
Debian Qt/KDE packaging tools