From 297694e06ffb1eb4b191cbc164bd1d7a8ba5f46b Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Wed, 16 Oct 2013 16:39:13 -0300 Subject: 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 --- docs/testers/howto.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'docs/testers/howto.rst') 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 -- cgit v1.2.3 From 96e2bcb0a103130b20026c2f943e16205867ec80 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Wed, 16 Oct 2013 17:01:23 -0300 Subject: add include to testing howto too --- docs/testers/howto.rst | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'docs/testers/howto.rst') diff --git a/docs/testers/howto.rst b/docs/testers/howto.rst index 24a90de5..d9536632 100644 --- a/docs/testers/howto.rst +++ b/docs/testers/howto.rst @@ -108,16 +108,11 @@ compact way suitable (ahem) also for non developers. Install dependencies ^^^^^^^^^^^^^^^^^^^^ -First, install all the development files and dependencies needed to compile:: +First, install all the development files and dependencies needed to compile: - 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. - -.. TODO we really should keep the dependencies in a single file that we are able to - include, to avoid phasing out. +.. include:: ../dev/quickstart.rst + :start-after: begin-debian-deps + :end-before: end-debian-deps Bootstrap script -- cgit v1.2.3