diff options
| -rw-r--r-- | README | 3 | ||||
| -rw-r--r-- | contrib/vagrant/bootstrap.ubuntu.sh | 2 | ||||
| -rw-r--r-- | doc/system_specific/FROM_SOURCE | 4 |
3 files changed, 4 insertions, 5 deletions
| @@ -75,8 +75,7 @@ These are the optional dependencies: | |||
| 75 | - libpulse >= 2.0 (for experimental conversation tool) | 75 | - libpulse >= 2.0 (for experimental conversation tool) |
| 76 | - libogg >= 1.3.0 (for experimental conversation tool) | 76 | - libogg >= 1.3.0 (for experimental conversation tool) |
| 77 | - libnss (certtool binary (for convenient installation of GNS proxy)) | 77 | - libnss (certtool binary (for convenient installation of GNS proxy)) |
| 78 | - python2.7 = 2.7 (for gnunet-qr, only python 2.7 supported) | 78 | - libzbar >= 0.10 (for gnunet-qr) |
| 79 | - python-zbar >= 0.10 (for gnunet-qr, not optional) | ||
| 80 | - TeX Live >= 2012 (for gnunet-bcd[*]) | 79 | - TeX Live >= 2012 (for gnunet-bcd[*]) |
| 81 | - texi2mdoc (for automatic mdoc generation [*2]) | 80 | - texi2mdoc (for automatic mdoc generation [*2]) |
| 82 | - libglpk >= 4.45 (for experimental code) | 81 | - libglpk >= 4.45 (for experimental code) |
diff --git a/contrib/vagrant/bootstrap.ubuntu.sh b/contrib/vagrant/bootstrap.ubuntu.sh index 6b28d3075..f0b7c454e 100644 --- a/contrib/vagrant/bootstrap.ubuntu.sh +++ b/contrib/vagrant/bootstrap.ubuntu.sh | |||
| @@ -27,7 +27,7 @@ apt-get -y install zlib1g-dev | |||
| 27 | # optional for gnunet-conversation | 27 | # optional for gnunet-conversation |
| 28 | # apt-get -y install libpulse-dev libopus-dev libogg-dev gstreamer1.0 | 28 | # apt-get -y install libpulse-dev libopus-dev libogg-dev gstreamer1.0 |
| 29 | # optional for gnunet-qr | 29 | # optional for gnunet-qr |
| 30 | apt-get -y install python-zbar | 30 | apt-get -y install libzbar-dev |
| 31 | # optional for experimental code | 31 | # optional for experimental code |
| 32 | apt-get -y install libglpk-dev | 32 | apt-get -y install libglpk-dev |
| 33 | # | 33 | # |
diff --git a/doc/system_specific/FROM_SOURCE b/doc/system_specific/FROM_SOURCE index 72660798d..7b0ebf436 100644 --- a/doc/system_specific/FROM_SOURCE +++ b/doc/system_specific/FROM_SOURCE | |||
| @@ -534,7 +534,7 @@ at all. | |||
| 534 | We begin by installing a few Debian packages from stable:@ | 534 | We begin by installing a few Debian packages from stable:@ |
| 535 | 535 | ||
| 536 | @example | 536 | @example |
| 537 | # apt-get install gcc make python-zbar libltdl-dev libsqlite3-dev \ | 537 | # apt-get install gcc make libzbar-dev libltdl-dev libsqlite3-dev \ |
| 538 | libunistring-dev libopus-dev libpulse-dev openssl libglpk-dev \ | 538 | libunistring-dev libopus-dev libpulse-dev openssl libglpk-dev \ |
| 539 | texlive libidn11-dev libmysqlclient-dev libpq-dev libarchive-dev \ | 539 | texlive libidn11-dev libmysqlclient-dev libpq-dev libarchive-dev \ |
| 540 | libbz2-dev libexiv2-dev libflac-dev libgif-dev libglib2.0-dev \ | 540 | libbz2-dev libexiv2-dev libflac-dev libgif-dev libglib2.0-dev \ |
| @@ -778,7 +778,7 @@ as a normal user. | |||
| 778 | We begin by installing a few Debian packages from stable: | 778 | We begin by installing a few Debian packages from stable: |
| 779 | 779 | ||
| 780 | @example | 780 | @example |
| 781 | # apt-get install gcc make python-zbar libltdl-dev libsqlite3-dev \ | 781 | # apt-get install gcc make libzbar-dev libltdl-dev libsqlite3-dev \ |
| 782 | libunistring-dev libopus-dev libpulse-dev openssl libglpk-dev texlive \ | 782 | libunistring-dev libopus-dev libpulse-dev openssl libglpk-dev texlive \ |
| 783 | libidn11-dev libmysqlclient-dev libpq-dev libarchive-dev libbz2-dev \ | 783 | libidn11-dev libmysqlclient-dev libpq-dev libarchive-dev libbz2-dev \ |
| 784 | libflac-dev libgif-dev libglib2.0-dev libgtk-3-dev libmpeg2-4-dev \ | 784 | libflac-dev libgif-dev libglib2.0-dev libgtk-3-dev libmpeg2-4-dev \ |