From 205324734626a5dece03fc871448d0f71bbfb46d Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Wed, 24 Oct 2012 04:25:46 +0900
Subject: removed branding info from branding config file

So we officially can say this is a generic client now.
Branding config file is still at pkg/branding/config.py

Note that with this change the package is called now leap-client
so you will have to remove old installs of leap-foo-client in your
path (from previous branded builds).

Changing the package name was an AWFUL and painful idea, and we will not
do that again. (launcher is another story). Lesson learned.
---
 setup.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index e1566752..c280860d 100755
--- a/setup.py
+++ b/setup.py
@@ -187,8 +187,12 @@ class cmd_post_install(_install_data):
 
 cmdclass = versioneer.get_cmdclass()
 cmdclass["branding"] = DoBranding
-cmdclass["build"] = cmd_build
-cmdclass["sdist"] = cmd_sdist
+
+# Uncomment this to have the branding command run automatically
+# on the build and sdist commands.
+#cmdclass["build"] = cmd_build
+#cmdclass["sdist"] = cmd_sdist
+
 cmdclass["install_data"] = cmd_post_install
 
 
@@ -196,7 +200,7 @@ launcher_name = branding.get_shortname()
 if launcher_name:
     leap_launcher = 'leap-%s-client=leap.app:main' % launcher_name
 else:
-    leap_launcher = 'leap=leap.app:main'
+    leap_launcher = 'leap-client=leap.app:main'
 
 setup(
     name=branding.get_name(),
-- 
cgit v1.2.3


From b093b632049e1cf4c61d714c025831fb8d373ed7 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Fri, 25 Jan 2013 01:54:18 +0900
Subject: fix manpage path

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index c280860d..db95c1ac 100755
--- a/setup.py
+++ b/setup.py
@@ -239,7 +239,7 @@ setup(
     # not being used since setuptools does not like it.
     data_files=[
         ("share/man/man1",
-            ["docs/leap.1"]),
+            ["docs/man/leap.1"]),
         ("share/polkit-1/actions",
             ["pkg/linux/polkit/net.openvpn.gui.leap.policy"])
     ],
-- 
cgit v1.2.3


From d7a84c54ea631eec457d92839bf16d1ec027cb3b Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Wed, 30 Jan 2013 05:38:03 +0900
Subject: remove copy data hook from setup

---
 setup.py | 30 +-----------------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index db95c1ac..e73690ae 100755
--- a/setup.py
+++ b/setup.py
@@ -159,32 +159,6 @@ class cmd_sdist(_sdist):
             versioneer.SHORT_VERSION_PY % self._versioneer_generated_versions)
         f.close()
 
-from distutils.command.install_data import install_data as _install_data
-
-
-class cmd_post_install(_install_data):
-    """
-    workaround for installing non-package data
-    outside of the bounds of our internal data
-    Debian or other packaging should igore this.
-    """
-    # We could use a environmental flag.
-    def run(self):
-        _install_data.run(self)
-        # is this the real life?
-        # is this just fantasy?
-        if not hasattr(sys, 'real_prefix'):
-            # looks like we are NOT
-            # running inside a virtualenv...
-            # let's install data.
-            # XXX should add platform switch
-            import shutil
-            print("Now installing policykit file...")
-            shutil.copyfile(
-                "pkg/linux/polkit/net.openvpn.gui.leap.policy",
-                "/usr/share/polkit-1/actions"
-                "/net.openvpn.gui.leap.policy")
-
 cmdclass = versioneer.get_cmdclass()
 cmdclass["branding"] = DoBranding
 
@@ -193,9 +167,6 @@ cmdclass["branding"] = DoBranding
 #cmdclass["build"] = cmd_build
 #cmdclass["sdist"] = cmd_sdist
 
-cmdclass["install_data"] = cmd_post_install
-
-
 launcher_name = branding.get_shortname()
 if launcher_name:
     leap_launcher = 'leap-%s-client=leap.app:main' % launcher_name
@@ -237,6 +208,7 @@ setup(
     zip_safe=False,
 
     # not being used since setuptools does not like it.
+    # XXX it should be only for linux!
     data_files=[
         ("share/man/man1",
             ["docs/man/leap.1"]),
-- 
cgit v1.2.3


From 3daf4e945194dc55c718db6eed89f1a3fcc68cd9 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Wed, 30 Jan 2013 05:39:05 +0900
Subject: cosmetic fixes

---
 setup.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index e73690ae..64c2a4f5 100755
--- a/setup.py
+++ b/setup.py
@@ -196,11 +196,11 @@ setup(
     test_suite='nose.collector',
     test_requires=utils.parse_requirements(
         reqfiles=['pkg/test-requirements.pip']),
-    keywords='leap, client, qt, encryption, proxy',
-    author='The LEAP project',
+    keywords='LEAP, client, qt, encryption, proxy, openvpn',
+    author='The LEAP Encryption Access Project',
     author_email='info@leap.se',
     url='https://leap.se',
-    license='GPL',
+    license='GPLv3+',
     packages=find_packages(
         'src',
         exclude=['ez_setup', 'setup', 'examples', 'tests']),
@@ -216,7 +216,7 @@ setup(
             ["pkg/linux/polkit/net.openvpn.gui.leap.policy"])
     ],
     platforms="all",
-    entry_points = {
+    entry_points={
         'console_scripts': [leap_launcher]
     },
 )
-- 
cgit v1.2.3