From: John Darrington <john@darrington.wattle.id.au>
Date: Mon, 24 Jun 2013 19:34:33 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into gtk3
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2b2b0a29f80de89d96bcceea90f117930ab47b9;p=pspp

Merge remote-tracking branch 'origin/master' into gtk3

Conflicts:
	INSTALL
---

b2b2b0a29f80de89d96bcceea90f117930ab47b9
diff --cc INSTALL
index 6223aa376d,093138be45..03739d5816
--- a/INSTALL
+++ b/INSTALL
@@@ -56,9 -63,10 +63,10 @@@ The following packages are required to 
  
  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.
+ `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.
  
@@@ -70,13 -78,15 +78,14 @@@ use the GUI, you must run `configure' w
        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.16.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 binary to read
+ Installing the following packages will allow your PSPP program to read
  Gnumeric files.
  
      * zlib (http://www.zlib.net/).