summaryrefslogtreecommitdiff
path: root/docs/dev/environment.rst
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-10-16 16:39:13 -0300
committerKali Kaneko <kali@leap.se>2013-10-22 10:31:32 -0200
commit297694e06ffb1eb4b191cbc164bd1d7a8ba5f46b (patch)
tree6d9e3ed1f630646dde5a7e28be99fb10032026f2 /docs/dev/environment.rst
parentc5da232623fb8322ab66f79fe823d16600be0090 (diff)
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
Diffstat (limited to 'docs/dev/environment.rst')
-rw-r--r--docs/dev/environment.rst15
1 files changed, 7 insertions, 8 deletions
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::