Merge remote-tracking branch 'chiiph/feature/relnotes' into develop

1 files changed, 9 insertions, 7 deletions

diff --git a/setup.py b/setup.py
index 4b39189c..4b36ad72 100755
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@ import versioneer
 versioneer.versionfile_source = 'src/leap/_version.py'
 versioneer.versionfile_build = 'leap/_version.py'
 versioneer.tag_prefix = ''  # tags are like 1.2.0
-versioneer.parentdir_prefix = 'leap_client-'
+versioneer.parentdir_prefix = 'bitmask-'
 
 from setuptools import Command
 
@@ -52,7 +52,7 @@ trove_classifiers = [
 parsed_reqs = utils.parse_requirements()
 
 cmdclass = versioneer.get_cmdclass()
-leap_launcher = 'leap-client=leap.app:main'
+leap_launcher = 'bitmask=leap.app:main'
 
 from setuptools.command.develop import develop as _develop
 
@@ -70,6 +70,7 @@ def copy_reqs(path, withsrc=False):
     with open(reqsfile, "w") as f:
         f.write('\n'.join(parsed_reqs))
 
+
 class cmd_develop(_develop):
     def run(self):
         # versioneer:
@@ -109,7 +110,7 @@ cmdclass["sdist"] = cmd_sdist
 
 
 setup(
-    name="leap-client",
+    name="bitmask",
     package_dir={"": "src"},
     version=versioneer.get_version(),
     cmdclass=cmdclass,
@@ -131,7 +132,8 @@ setup(
     test_suite='nose.collector',
     tests_require=utils.parse_requirements(
         reqfiles=['pkg/requirements-testing.pip']),
-    keywords='LEAP, client, qt, encryption, proxy, openvpn, imap, smtp',
+    keywords=('Bitmask, LEAP, client, qt, encryption, '
+              'proxy, openvpn, imap, smtp'),
     author='The LEAP Encryption Access Project',
     author_email='info@leap.se',
     url='https://leap.se',
@@ -145,10 +147,10 @@ setup(
     # not being used? -- setuptools does not like it.
     # looks like debhelper is honoring it...
     data_files=[
-    #    ("share/man/man1",
-    #        ["docs/man/leap-client.1"]),
+        # ("share/man/man1",
+        #     ["docs/man/bitmask.1"]),
         ("share/polkit-1/actions",
-            ["pkg/linux/polkit/net.openvpn.gui.leap.policy"]),
+         ["pkg/linux/polkit/net.openvpn.gui.leap.policy"]),
     ],
     zip_safe=False,
     platforms="all",