diff options
author | Hartmut Goebel <h.goebel@crazy-compilers.com> | 2019-03-03 10:56:01 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-04-03 13:44:54 +0200 |
commit | 88c55363e17beaa1c2d7344b3d4a90e1d639dc67 (patch) | |
tree | f8ac15ea3a1176c99ae1641928746323f2d6c194 | |
parent | 8f07aace2f2842b506350e608616c8055a2c71f9 (diff) | |
download | gnunet-88c55363e17beaa1c2d7344b3d4a90e1d639dc67.tar.gz gnunet-88c55363e17beaa1c2d7344b3d4a90e1d639dc67.zip |
gnunet-qr: Update documentation and scripts to changed dependencies.
Requirement python-zbar is gone, and thus the requirement for
Python 2.7. Instead development package for libzbar is required now.
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | contrib/vagrant/bootstrap.ubuntu.sh | 2 | ||||
-rw-r--r-- | doc/system_specific/FROM_SOURCE | 4 |
3 files changed, 4 insertions, 4 deletions
@@ -124,6 +124,7 @@ These are the optional dependencies: | |||
124 | - libogg >= 1.3.0 (for experimental conversation tool) | 124 | - libogg >= 1.3.0 (for experimental conversation tool) |
125 | - libnss (certtool binary (for convenient | 125 | - libnss (certtool binary (for convenient |
126 | installation of GNS proxy)) | 126 | installation of GNS proxy)) |
127 | - libzbar >= 0.10 (for gnunet-qr) | ||
127 | - libpbc >= 0.5.14 (for Attribute-Based Encryption and | 128 | - libpbc >= 0.5.14 (for Attribute-Based Encryption and |
128 | Identity Provider functionality) | 129 | Identity Provider functionality) |
129 | - libgabe (for Attribute-Based Encryption and | 130 | - libgabe (for Attribute-Based Encryption and |
@@ -135,7 +136,6 @@ These are the optional dependencies: | |||
135 | - perl5 (for some utilities) | 136 | - perl5 (for some utilities) |
136 | - python2.7 = 2.7 (for gnunet-qr, only python 2.7 | 137 | - python2.7 = 2.7 (for gnunet-qr, only python 2.7 |
137 | supported) | 138 | supported) |
138 | - python-zbar >= 0.10 (for gnunet-qr, not optional) | ||
139 | - TeX Live >= 2012 (for gnunet-bcd[*]) | 139 | - TeX Live >= 2012 (for gnunet-bcd[*]) |
140 | - texi2mdoc (for automatic mdoc generation [*2]) | 140 | - texi2mdoc (for automatic mdoc generation [*2]) |
141 | 141 | ||
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 \ |