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 a3c27539c719cb547e7f6fcebaac155356255b23..1bac97bde55d02a5cc00e0ba388348f7f8537012 100644 (file)
--- 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 5211a3c07c0ac3f096f513915ad344e12e0a60ff..4ee6485dba02c43bcbf6c3feacb8daff29957236 100644 (file)
--- 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