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.
---
 MANIFEST.in              |  1 -
 data/branding/cacert.pem | 24 ------------------------
 pkg/branding/config.py   |  8 ++++----
 setup.cfg                |  2 +-
 setup.py                 | 10 +++++++---
 5 files changed, 12 insertions(+), 33 deletions(-)
 delete mode 100644 data/branding/cacert.pem

diff --git a/MANIFEST.in b/MANIFEST.in
index 685cee16..d7a5201e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,4 +2,3 @@ include pkg/*
 include pkg/branding/*
 include docs/*
 include versioneer.py
-include src/leap/certs/*.pem
diff --git a/data/branding/cacert.pem b/data/branding/cacert.pem
deleted file mode 100644
index ed12e159..00000000
--- a/data/branding/cacert.pem
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIECzCCAl2gAwIBAgIEUFDp9TANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDEwRU
-RVNUMB4XDTEyMDkxMjIwMDA1M1oXDTEzMDkxMjIwMDA1M1owDzENMAsGA1UEAxME
-VEVTVDCCAbgwDQYJKoZIhvcNAQEBBQADggGlADCCAaACggGXANsoS1m9wj9iv+UV
-BXfeq14SR94gSot96eJu7PZVRrcGlGe/PRfbmfxF3j/gXM9B8sIkyM2L46OMtOKw
-1iOTKtYYdMhtnUSd3FRshWGtYeuy+OCe9umU0jfZDBZ2pXlUmSqCNqfD0OPkksYL
-GDjQUKjaEd1oURwpCG8uEU+3tjBNCMuEwhcMEoUYmI8t4vss2hdFb+LKefVMPTzz
-oiNM/o8Z/ANzWCC0qSW5FsB4wGhUS5HKLDOr4tACgdxaJSWtAqFFAnyMeG9g8aqe
-PTM+URlqVnzzGckrJwBbd4y0zEpv/R7SAiSAP725cnB1GKptwdrcNIIHnQjOdAOl
-uNg6JlRXrv6fV1gApka4INfJAf1yMf+fA0WdZ22UJQ9Up7tdzi8lL+3HsEpEx4Pz
-NyzuqzEw9LJ6SUmMcE/VP00t4RjTOVoncwcLjvURY8jt2DQ9E36JEPwUoyALq/De
-bGBjeK2KGzBZcOu1HZAwWLLWR2++WKuCEXbRbahwSIlbMfmAe8xGx4bbHol0D1A+
-wmu0uxjAze6FvUkCAwEAAaNDMEEwDwYDVR0TAQH/BAUwAwEB/zAPBgNVHQ8BAf8E
-BQMDBwQAMB0GA1UdDgQWBBT/PX8XZ0Y2jDkppz6PHs23IgzQEDANBgkqhkiG9w0B
-AQsFAAOCAZcAMfi+HLbcFaB0/Mv8/GkIdjpThUBVEeFrIiDy9GmGWUDOXgP1Skld
-5H4eY5inE5lFfB69yacHIGS4OiZIBuBKfKNl5d6XO+ztJEJpG3yrbF4MtGV/aHEp
-OlbJCncnk3fspBk6tFGrv4Inak4gza6SQPfBEZj29ciwfwrqrtuWZ7km+og0Clcd
-pIB0g+DK0K//NtaDZDK0havQw2AFJKyXlNfI8XZ2jsNmQYR1wtiMci+UfGQr7bjn
-Kw9yyVCf0ohXvnSK4ortz/bDQbcMWkK0m/VCCEK8PSldk+XFzPWFWn5ndKCczcvd
-1BQc392n12ZstEuzm6+d9A0D3kCxralJUXUC+4kThq4Rtjey/gBjyZQnZ+5tIxMF
-5ZFAStEglNxqm6HB17q7owJqTvIg9Cf9GATsvoFFQDJrBXewRX7cWVeSr0zNSQB4
-ydIlSUOkyE3AyfLN+lx8NVS/I7gp4fWDuHrh27NKKDtMxalxPL5pTGO7l4uTybLY
-4aVzQYGvzA5HVS++VAtcTQ6TP9p4HURL2cllEU9u9A==
------END CERTIFICATE-----
diff --git a/pkg/branding/config.py b/pkg/branding/config.py
index 665cfbda..bcacc3bc 100644
--- a/pkg/branding/config.py
+++ b/pkg/branding/config.py
@@ -1,11 +1,11 @@
 # Configuration file for branding
 
-BRANDED_BUILD = True
+BRANDED_BUILD = False
 
 APP_BASE_NAME = "leap-client"
 APP_PREFIX = "%s-" % APP_BASE_NAME
 
 BRANDED_OPTS = {
-    'short_name': "springbok",
-    'provider_domain': "springbok",
-    'provider_ca_path': "data/branding/cacert.pem"}
+    'short_name': "",
+    'provider_domain': "",
+    'provider_ca_path': ""}
diff --git a/setup.cfg b/setup.cfg
index 3c2fdf51..4b049f97 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,2 @@
 [egg_info]
-tag_build = dev
+#tag_build = dev
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