summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README3
-rw-r--r--contrib/vagrant/bootstrap.ubuntu.sh2
-rw-r--r--doc/system_specific/FROM_SOURCE4
3 files changed, 4 insertions, 5 deletions
diff --git a/README b/README
index 37ca19a0d..b5ba741f2 100644
--- a/README
+++ b/README
@@ -75,8 +75,7 @@ These are the optional dependencies:
- libpulse >= 2.0 (for experimental conversation tool)
- libogg >= 1.3.0 (for experimental conversation tool)
- libnss (certtool binary (for convenient installation of GNS proxy))
-- python2.7 = 2.7 (for gnunet-qr, only python 2.7 supported)
-- python-zbar >= 0.10 (for gnunet-qr, not optional)
+- libzbar >= 0.10 (for gnunet-qr)
- TeX Live >= 2012 (for gnunet-bcd[*])
- texi2mdoc (for automatic mdoc generation [*2])
- 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
# optional for gnunet-conversation
# apt-get -y install libpulse-dev libopus-dev libogg-dev gstreamer1.0
# optional for gnunet-qr
-apt-get -y install python-zbar
+apt-get -y install libzbar-dev
# optional for experimental code
apt-get -y install libglpk-dev
#
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.
We begin by installing a few Debian packages from stable:@
@example
-# apt-get install gcc make python-zbar libltdl-dev libsqlite3-dev \
+# apt-get install gcc make libzbar-dev libltdl-dev libsqlite3-dev \
libunistring-dev libopus-dev libpulse-dev openssl libglpk-dev \
texlive libidn11-dev libmysqlclient-dev libpq-dev libarchive-dev \
libbz2-dev libexiv2-dev libflac-dev libgif-dev libglib2.0-dev \
@@ -778,7 +778,7 @@ as a normal user.
We begin by installing a few Debian packages from stable:
@example
-# apt-get install gcc make python-zbar libltdl-dev libsqlite3-dev \
+# apt-get install gcc make libzbar-dev libltdl-dev libsqlite3-dev \
libunistring-dev libopus-dev libpulse-dev openssl libglpk-dev texlive \
libidn11-dev libmysqlclient-dev libpq-dev libarchive-dev libbz2-dev \
libflac-dev libgif-dev libglib2.0-dev libgtk-3-dev libmpeg2-4-dev \