summaryrefslogtreecommitdiff
path: root/vcslib
diff options
context:
space:
mode:
authorDmitry Shachnev <mitya57@gmail.com>2017-08-30 16:52:55 +0300
committerDmitry Shachnev <mitya57@gmail.com>2017-08-30 16:52:55 +0300
commit91f03c2aed13c838db5c5b304fe9e14c71513b96 (patch)
tree6a2fe692a4ee0147d36a9cb8e8e97a895a382269 /vcslib
parentd13502d969d2c98d3d4ad08cc5fd740f1f337da8 (diff)
downloadpkg-kde-tools-91f03c2aed13c838db5c5b304fe9e14c71513b96.tar.gz
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.
Diffstat (limited to 'vcslib')
-rw-r--r--vcslib/git.sh4
1 files changed, 2 insertions, 2 deletions
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()