Merge branch 'feature/generic-wizard' into develop

The generic wizard (big) branch is now stabilised.
A bunch of refactors have gone together with this topic branch:

- client does not have any info included for default service providers.
- user has to run the first-run wizard and manually entry domain for sample provider.
- remove all remains of the older branding strategy for default provider.
- srp registration + authentication are integrated with the signup process.

1 files changed, 7 insertions, 3 deletions

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(),