From 691b40fd6d593d1b9af316d1108258f02a305a70 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Wed, 24 Oct 2012 04:31:27 +0900
Subject: revoved all refs to branded client from README

---
 README.rst | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'README.rst')

diff --git a/README.rst b/README.rst
index d1f91c4b..e6b203b7 100644
--- a/README.rst
+++ b/README.rst
@@ -54,11 +54,6 @@ Install leap-client
 
 After getting the source and installing all the dependencies, proceed to install ``leap-client`` package:
 
-# need to run this if you are installing from the git source tree
-# not needed if installing from a tarball::
-
-  python setup.py branding
-
 # run this if you have installed previous versions before::
 
   python setup.py clean
@@ -71,18 +66,17 @@ And finally, build and install leap-client::
 Running the App
 -----------------
 
-If you're running a branded build, the script name will have a infix that
-depends on your build flavor. Look for it in ``/usr/local/bin``::
+After a successful installation, there should be a launcher called leap-client somewhere in your path::
 
-  % leap-springbok-client
+  % leap-client
 
 In order to run the client in debug mode::
 
-  % leap-springbok-client --debug --logfile /tmp/leap.log
+  % leap-client --debug --logfile /tmp/leap.log
 
 To see all the available command line options::
 
-  % leap-springbok-client --help
+  % leap-client --help
 
 
 Development
@@ -120,7 +114,6 @@ Some steps need to be run when setting a development environment for the first t
 
   (leap_client)% git checkout develop
   (leap_client)% pkg/postmkvenv.sh
-  (leap_client)% python setup.py branding
   (leap_client)% python setup.py develop  
 
 to avoid messing with the entry point and global versions installed,
-- 
cgit v1.2.3


From 6de7d4ca4b018b00a02df27656cce536bb7c72e3 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Wed, 24 Oct 2012 08:44:15 +0900
Subject: add notes about version freezings and couple of TODOs

---
 README.rst | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'README.rst')

diff --git a/README.rst b/README.rst
index e6b203b7..cc30c544 100644
--- a/README.rst
+++ b/README.rst
@@ -20,17 +20,21 @@ Python packages are listed in ``pkg/requirements.pip`` and ``pkg/test-requiremen
 
 Debian systems
 --------------
+# XXX TODO: move to packaging doc.
 
 * python-qt4
-* python-gnutls == 1.1.9
-* python-keyring
 * python-crypto
 * python setuptools
 * python-nose, python-mock, python-coverage (if you want to run tests)
 
+Note: these two need a version that is not found in the current debian stable or in ubuntu 12.04. 
+
+* python-gnutls == 1.1.9
+* python-keyring
+
 Under a debian-based system, you can run::
 
-  # apt-get install openvpn python-qt4 python-keyring python-crypto
+  # apt-get install openvpn python-qt4 python-crypto
 
 For testing:
 
@@ -43,7 +47,9 @@ For _building_ the package you will need to install also::
 
 Install python dependencies with pip
 -------------------------------------
-Use pip (preferrable inside a virtualenv) to install all the required python packages::
+# XXX TODO: move to developers doc.
+
+Use pip (preferrable inside a virtualenv) to install the required python packages::
 
   # apt-get install python-pip python-dev libgnutls-dev
   % pip install -r pkg/requirements.pip
-- 
cgit v1.2.3