Merge 'master' into 'gtk3'.

[pspp] / INSTALL

diff --git a/INSTALL b/INSTALL
index 34c0d64fff6e9d7838a3855f702439ac8bb8788a..3d6d20e9dce77c863bf58c4b63ddff519a24158e 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -61,12 +61,14 @@ The following packages are required to install PSPP:
       GNU libc includes an integrated libintl, so there is no need to
       separately install libintl on a GNU/Linux system.
 
+    * zlib (http://www.zlib.net/).
+
 The following packages are required to enable PSPP's graphing
 features.  If you cannot arrange to install them, you must run
 `configure' with --without-cairo (in which case you will get no graphing
 capability).
 
-    * Cairo (http://cairographics.org/), version 1.5 or later.
+    * Cairo (http://cairographics.org/), version 1.12 or later.
 
     * Pango (http://www.pango.org/), version 1.22 or later.
 
@@ -78,19 +80,16 @@ use the GUI, you must run `configure' with --without-gui.
       0.18 and 0.19 have a bug that will prevent library detection,
       but other versions should be fine.
 
-    * GTK+ (http://www.gtk.org/), version 2.24.0 or later.  However
-      it must be Gtk+ 2.something  - The Gtk+-3.x series will NOT work!
+    * GTK+ (http://www.gtk.org/), version 3.4.0 or later.
 
     * GtkSourceView (http://projects.gnome.org/gtksourceview/) 
-      version 2.2 or later.
+      version 3.4.0 or later.
 
 The following packages are optional:
 
 Installing the following packages will allow your PSPP program to read
 Gnumeric files.
 
-    * zlib (http://www.zlib.net/).
-
     * libxml2 (http://xmlsoft.org/).  
 
 Installing the following packages will allow your PSPP program to write