X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=README;h=4c3c1c215efdccaed7ab574d2e0bd4818fe7821c;hb=30c72242b0d5c9ee30a08fae7e69b723450e2899;hp=f3d57a4f31ea811ffe7dbf0edba05d773337e545;hpb=2032baa561c7fefbe2605f5d6b979a295a61637d;p=oweals%2Fgnunet.git

diff --git a/README b/README
index f3d57a4f3..4c3c1c215 100644
--- a/README
+++ b/README
@@ -1,14 +1,3 @@
-======================================================================
-
-THIS SVN VERSION OF GNUNET IS INCOMPATIBLE TO ALL PREVIOUS RELEASES.
-WE ARE WORKING ON CHANGING FUNDAMENTAL PARTS OF THE CRYPTOGRAPHIC
-PARTS OF THE SYSTEM.
-
-You need to install libgcrypt from git master (1.6.0beta93 at least)
-for the code to compile.
-
-=======================================================================
-
                        Welcome to GNUnet
 
 
@@ -40,11 +29,11 @@ packages.  Hence please make sure to use  the versions listed below.
 These are the direct dependencies for running GNUnet:
 
 - libextractor  >= 0.6.1
-- libmicrohttpd >= 0.9.31
-- libgcrypt     >= 1.2
-- libcurl       >= 7.21.3
+- libmicrohttpd >= 0.9.33
+- libgcrypt     >= 1.6
+- libgnurl      >= 7.34.0 (available from https://gnunet.org/gnurl)
 - libunistring  >= 0.9.2
-- gnutls        >= 2.12.0
+- gnutls        >= 3.2.5
 - libidn        >= 1.0
 - libglpk       >= 4.45
 - openssl       >= 1.0 (binary, used to generate X.509 certificate)
@@ -54,6 +43,8 @@ These are the direct dependencies for running GNUnet:
 - postgres      >= 8.3 (alternative to sqlite)
 - libopus       >= 0.9.14 (optional for experimental conversation tool)
 - libpulse      >= 2.0 (optional for experimental conversation tool)
+- python-zbar   >= 0.10 (optional for gnunet-qr)
+- TeX Live      >= 2012 (optional for gnunet-bcd) 
 
 Recommended autotools for compiling the SVN version are:
 - autoconf >= 2.59
@@ -115,8 +106,9 @@ the $HOME-directory of your "gnunet" user is, you might need to set
 the SERVICEHOME option in section "[PATHS]" to "/var/lib/gnunet" to
 do this.  Depending on your personal preferences, you may also want to
 use "/etc/gnunet.conf" for the location of the configuration file in
-this case (instead of ~gnunet/.gnunet/gnunet.conf").  In this case,
-you need to start GNUnet using "gnunet-arm -s -c /etc/gnunet.conf".
+this case (instead of ~gnunet/.config/gnunet.conf").  In this case,
+you need to start GNUnet using "gnunet-arm -s -c /etc/gnunet.conf" or
+set "XDG_CONFIG_HOME=/etc/".
 
 You can avoid running 'make install' as root if you run configure
 with the "--with-sudo=yes" option and have extensive sudo rights
@@ -172,7 +164,7 @@ GNUnet uses two types of configuration files, one that specifies the
 system-wide defaults (typically located in
 $GNUNET_PREFIX/share/gnunet/config.d/) and a second one that overrides
 default values with user-specific preferences.  The user-specific
-configuration file should be located in "~/.gnunet/gnunet.conf" or its
+configuration file should be located in "~/.config/gnunet.conf" or its
 location can be specified by giving the "-c" option to the respective
 GNUnet application.