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

Conflicts:
	src/math/chart-geometry.c
	src/output/cairo-chart.c
	src/output/charts/plot-hist-cairo.c
	tests/math/chart-geometry.at

diff --combined configure.ac
index 1e6edf6d697beeb82e8eab7deaa03b2eacef823c,2d3b3bfe4222344b21756a1bd5ed57a3f3953730..9d38a8f53d2cb0da7e589876703b77f8df491155
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -2,7 -2,7 +2,7 @@@ dnl Process this file with autoconf to 
  
  dnl Initialize.
  AC_PREREQ(2.63)
- AC_INIT([GNU PSPP], [0.8.4], [bug-gnu-pspp@gnu.org], [pspp])
+ AC_INIT([GNU PSPP], [0.8.5], [bug-gnu-pspp@gnu.org], [pspp])
  AC_CONFIG_AUX_DIR([build-aux])
  AC_CONFIG_HEADERS([config.h])
  AC_CONFIG_TESTDIR([tests])
@@@ -70,15 -70,16 +70,15 @@@ if test "$with_cairo" != no && test "$w
    PKG_CHECK_MODULES([GTHREAD], [gthread-2.0], [],
      [PSPP_REQUIRED_PREREQ([gthread 2.0 (or use --without-gui)])])
  
 -  PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.24], [],
 -    [PSPP_REQUIRED_PREREQ([gtk+ 2.0 version 2.24 or later (or use --without-gui)])])
 +  PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.4.2], [],
 +    [PSPP_REQUIRED_PREREQ([gtk+ 3.0 version 3.4.2 or later (or use --without-gui)])])
 +
 +  PKG_CHECK_MODULES([GTKSOURCEVIEW], [gtksourceview-3.0 >= 3.4.2], [],
 +    [PSPP_REQUIRED_PREREQ([gtksourceview 3.0 version 3.4.2 or later (or use --without-gui)])])
  
    PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.32], [],
      [PSPP_REQUIRED_PREREQ([glib 2.0 version 2.32 or later (or use --without-gui)])])
  
 -
 -  PKG_CHECK_MODULES([GTKSOURCEVIEW], [gtksourceview-2.0 >= 2.2], [],
 -    [PSPP_REQUIRED_PREREQ([gtksourceview 2.0 version 2.2 or later (or use --without-gui)])])
 -
    AC_ARG_VAR([GLIB_GENMARSHAL])
    AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal])
    if test "x$GLIB_GENMARSHAL" = x; then
@@@ -222,7 -223,7 +222,7 @@@ AC_ARG_WITH
    gui_tools,
    [AS_HELP_STRING([--with-gui-tools], [build the gui developer tools.  For DEVELOPERS only! There is no reason why users will need this flag.])])
  if test x"$with_gui_tools" = x"yes" ; then 
 -      PKG_CHECK_MODULES(GLADE_UI, gladeui-1.0)
 +      PKG_CHECK_MODULES(GLADE_UI, gladeui-2.0)
  fi
  AM_CONDITIONAL(WITH_GUI_TOOLS, test x"$with_gui_tools" = x"yes")
  

diff --combined src/ui/gui/automake.mk
index e6da60e164e50e4681941ce41c425c12759eb71c,27175d4b362fe31d15d26fe617f657298a0045bf..59200b09a7dd6c6454ec2031eb6fb2ef1792ddc5
--- 1/src/ui/gui/automake.mk
--- 2/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@@ -56,6 -56,7 +56,7 @@@ EXTRA_DIST += doc/help-pages-lis
  
  
  EXTRA_DIST += \
+       src/ui/gui/memorandum.txt \
        src/ui/gui/artwork/actions/.empty \
        src/ui/gui/artwork/apps/scalable/.empty \
        src/ui/gui/gen-dot-desktop.sh \
@@@ -67,8 -68,8 +68,8 @@@ if HAVE_GU
  bin_PROGRAMS += src/ui/gui/psppire 
  noinst_PROGRAMS += src/ui/gui/spreadsheet-test 
  
 -src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
 -src_ui_gui_spreadsheet_test_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
 +src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1 
 +src_ui_gui_spreadsheet_test_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1 
  
  
  src_ui_gui_psppire_LDFLAGS = \