Merge tag '0.4.2' into debian/experimental

Tag leap.keymanager version 0.4.2

Conflicts:
	pkg/requirements.pip
	src/leap/keymanager/_version.py

1 files changed, 5 insertions, 9 deletions

diff --git a/src/leap/keymanager/_version.py b/src/leap/keymanager/_version.py
index ad54645..ea862a7 100644
--- a/src/leap/keymanager/_version.py
+++ b/src/leap/keymanager/_version.py
@@ -1,13 +1,9 @@
-
-# This file was generated by the `freeze_debianver` command in setup.py
-# Using 'versioneer.py' (0.7+) from
-# revision-control system data, or from the parent directory name of an
-# unpacked source archive. Distribution tarballs contain a pre-generated copy
-# of this file.
+# This file helps to compute a version number in source trees obtained from
+# git-archive tarball (such as those provided by githubs download-from-tag
+# feature). Distribution tarballs (build by setup.py sdist) and build
+# directories (produced by setup.py build) will contain a much shorter file
+# that just contains the computed version number.
 
 version_version = '0.3.8'
 version_full = '0929d3953191e7ad5ec51f3e94ad6d7608428d48'
 
-
-def get_versions(default={}, verbose=False):
-        return {'version': version_version, 'full': version_full}