From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 9 Nov 2016 21:37:52 +0000 (+0000)
Subject: Version tags mangling: Protect dots, as per proposed update to DEP-14.
X-Git-Tag: archive/debian/2.12~16
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=f93eae496d1ab8aebe85d9080c4e372ebe9b3715

Version tags mangling: Protect dots, as per proposed update to DEP-14.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index a3c27539..1bac97bd 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -147,8 +147,9 @@ sub debugcmd {
 
 sub dep14_version_mangle ($) {
     my ($v) = @_;
-    # DEP-14 2014-11-05 "Version Mangling"
+    # DEP-14 patch proposed 2016-11-09  "Version Mangling"
     $v =~ y/~:/_%/;
+    $v =~ s/\.(?=\.|$|lock$)/.#/g;
     return $v;
 }
 
diff --git a/debian/changelog b/debian/changelog
index 5211a3c0..4ee6485d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ dgit (2.12~) unstable; urgency=medium
     GIT_ALTERNATE_OBJECT_DIRECTORIES in the pre-receive-hook.
   * dgit-maint-merge(7): Explain how to change to this workflow
     from an existing git workflow.  [Sean Whitton]  Closes:#847807.
+  * Version tags mangling: Protect dots, as per proposed update to DEP-14.
 
   Test suite:
   * Provide and use stunt lintian and debuild, to avoid lintian