setup, tools(utils): fixed versioning in setup and getRepositoryData

setup.py

@@ -62,13 +62,10 @@ is_dev_version = VERSION.endswith('D')
 def sat_dev_version():
     """Use mercurial data to compute version"""
     def version_scheme(version):
-        return VERSION
+        return VERSION.replace('D', '.dev0')
 
     def local_scheme(version):
-        # XXX: setuptools_scm seems buggy and the '+' and the '_' are replaced by '-'
-        #      breaking the local version identifier scheme
-        #      cf. https://github.com/pypa/setuptools_scm/issues/237
-        return "+{rev}_{distance}".format(
+        return "+{rev}.{distance}".format(
             rev=version.node[1:],
             distance=version.distance)