Update apt-get dependencies

* Also, tweak different sections to be consistent with the
  new quickstart.
* Squashed contributions by Jeremy (@bneg)
* add note about authors.rst

6 files changed, 103 insertions, 22 deletions

diff --git a/README.rst b/README.rst
index 7a8329b9..a9af236e 100644
--- a/README.rst
+++ b/README.rst
@@ -41,7 +41,9 @@ Getting dependencies under debian
 
 With a Debian based system, to be able to run Bitmask you need to run the following command::
 
-  $ sudo apt-get install openvpn python-pyside pyside-tools python-setuptools python-all-dev python-pip python-dev python-openssl
+    $ sudo apt-get install git python-dev python-setuptools
+    python-virtualenv python-pip python-openssl libsqlite3-dev g++ openvpn
+    pyside-tools python-pyside 
 
 Installing
 -----------
@@ -102,13 +104,6 @@ Run Bitmask::
 
   (bitmask)$ bitmask --debug
 
-
-If you are testing a new provider that doesn't have the proper certificates yet, you can use --danger flag, but **DO NOT use it on a regular basis**.
-
-**WARNING**: If you use the --danger flag you may be victim to a MITM_ attack without noticing. Use at your own risk.
-
-.. _MITM: http://en.wikipedia.org/wiki/Man-in-the-middle_attack
-
 Testing
 =======
 
diff --git a/docs/dev/environment.rst b/docs/dev/environment.rst
index e942b1cb..8e6fd89d 100644
--- a/docs/dev/environment.rst
+++ b/docs/dev/environment.rst
@@ -13,14 +13,14 @@ Cloning the repo
 
 ::
 
-    git clone git://leap.se/bitmask_client
+    git clone https://leap.se/git/?p=bitmask_client.git
     git checkout develop
 
 .. XXX change this when repo changes.
 
 Base Dependencies
 ------------------
-Bitmask depends on these libraries:
+Bitmask depends on these base libraries:
 
 * `python 2.6 or 2.7`
 * `qt4` libraries (see also :ref:`Troubleshooting PySide install <pysidevirtualenv>` about how to install inside your virtualenv)
@@ -29,13 +29,11 @@ Bitmask depends on these libraries:
 
 Debian
 ^^^^^^
-In debian-based systems::
+In debian-based systems, you can get everything you need:
 
-  $ apt-get install openvpn python-pyside python-openssl
-
-To install the software from sources::
-
-  $ apt-get install python-pip python-dev
+.. include:: quickstart.rst
+   :start-after: begin-debian-deps
+   :end-before: end-debian-deps
 
 .. _virtualenv:
 
@@ -122,6 +120,7 @@ If you *only* are running bitmask from inside a virtualenv, you will need to cop
 
 Missing Authentication agent
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+.. TODO I think we could be safely removing this section by now.
 
 If you are using linux and running a desktop other than unity or gnome, you might get an error saying that you are not running the authentication agent. For systems with gnome libraries installed you can launch it like this::
 
diff --git a/docs/dev/quickstart.rst b/docs/dev/quickstart.rst
new file mode 100644
index 00000000..8f0e90dd
--- /dev/null
+++ b/docs/dev/quickstart.rst
@@ -0,0 +1,81 @@
+Quickstart
+==========
+
+**Assumptions:** These instructions were made on a clean Ubuntu 12.04.3
+system.
+
+**Goal:** With minimal effort or reading install the necessary packages
+to build the latest development code for ``bitmask_client``
+
+**Outcome:** At the end of these instructions, you should be able to run
+the latest development branch for bitmask client, getting the GUI in debug
+mode and connect to a LEAP provider (bitmask.net)
+
+
+Prerequisites
+-------------
+
+.. begin-debian-deps
+::
+
+    $ sudo apt-get install git python-dev python-setuptools
+    python-virtualenv python-pip python-openssl libsqlite3-dev g++ openvpn
+    pyside-tools python-pyside 
+    
+.. python-qt4  ??? (for translations)
+.. TODO I'm pretty sure python-qt4 shoudln't be there...
+   Nor libsqlite-dev, that's a bug in python-sqlcipher/soledad.
+
+
+.. XXX any change HERE ^^^^ should be reflected also in README.rst.
+   From any other place in the documentation, it should be just included.
+
+.. end-debian-deps
+
+Clone the repo into your working directory, and checkout development branch::
+
+    $ git clone https://github.com/leapcode/bitmask_client
+    $ cd bitmask_client
+    $ git checkout develop
+
+
+Create and activate the virtualenv, and symlink to your gloabal PySide install::
+
+    $ virtualenv .
+    $ source bin/activate
+    $ pkg/postmkvenv.sh
+
+
+Python libraries
+----------------
+
+.. TODO Check! -- this step should not be needed. setup develop should do it for you.
+Install python requirements::
+
+    $ pip install -r pkg/requirements.pip
+
+Install the bitmask package in development mode inside the virtualenv::
+
+    $ ./setup.py develop
+
+Compile the resource files::
+
+    $ make
+
+Copy necessary files into system folders, with root privileges::
+
+    $ sudo mkdir -p /etc/leap
+    $ sudo cp pkg/linux/resolv-update /etc/leap
+    $ sudo cp pkg/linux/polkit/net.openvpn.gui.leap.policy /usr/share/polkit-1/actions/
+
+
+Running
+--------
+
+Run ``bitmask_client`` in debug mode::
+
+    $ bitmask --debug  
+
+You should see the ``bitmask_client`` window prompting to connect to an
+existing node or add a new one. If not, something went wrong, maybe ask
+on #leap-dev at irc.freenode.net
diff --git a/docs/dev/workflow.rst b/docs/dev/workflow.rst
index abd228c1..f217df24 100644
--- a/docs/dev/workflow.rst
+++ b/docs/dev/workflow.rst
@@ -90,3 +90,8 @@ Other methods
 -------------
 
 Feel free to use any other methods like format-patch and mail or whatever method you prefer, although we recommend you follow the same workflow as we do.
+
+Contributors
+------------
+
+Please, add yourself to ``dev/authors.rst`` if you contribute code to Bitmask.
diff --git a/docs/index.rst b/docs/index.rst
index d0b0ff22..f210be8c 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -44,6 +44,7 @@ If you want to contribute to the project, we wrote this for you.
 .. toctree::
    :maxdepth: 1
 
+   dev/quickstart
    dev/environment
    dev/tests
    dev/workflow
diff --git a/docs/testers/howto.rst b/docs/testers/howto.rst
index 1e276f7d..24a90de5 100644
--- a/docs/testers/howto.rst
+++ b/docs/testers/howto.rst
@@ -108,13 +108,13 @@ compact way suitable (ahem) also for non developers.
 
 Install dependencies
 ^^^^^^^^^^^^^^^^^^^^
-First, install all the base dependencies plus git, virtualenv and development
-files needed to compile several extensions::
+First, install all the development files and dependencies needed to compile::
 
-   apt-get install openvpn git-core python-dev python-pyside python-setuptools python-virtualenv
+   sudo apt-get install openvpn git-core python-dev python-pyside python-setuptools \
+   python-virtualenv python-all-dev python-pip python-dev python-openssl git \
+   libgnutls-dev python-qt4 g++ libsqlite3-dev
 
-.. TODO Should review these dependencies. I think python-sqlite is missing, we
-   have an issue for that^^
+.. TODO Should review these dependencies.
 
 .. TODO we really should keep the dependencies in a single file that we are able to
    include, to avoid phasing out.
@@ -132,7 +132,7 @@ Download and source the following script in the parent folder where you want you
 
 .. code-block:: bash
 
-   cd /tmp
+   cd /tmp  
    wget https://raw.github.com/leapcode/bitmask_client/develop/pkg/scripts/bitmask_bootstrap.sh
    source bitmask_bootstrap.sh