Merge branch 'master' into windows

Conflicts:
	configure.ac

4 files changed, 37 insertions, 32 deletions

diff --git a/NEWS b/NEWS
index c50c95e6..834c76a3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
-pygtk-2.23.2 XX-XX-2011
-    - XX
+pygtk-2.24.1 XX-XXX-2011
+    -
+
+pygtk-2.24.0 01-Apr-2011
+    - Many many documentation improvements and updates (Dieter Verfaillie)
+    - Add --without-glade configure option. No change to current behaviour
+    - Small setup.py fixes
 
 pygtk-2.23.1 12-Mar-2011
     - Many many documentation improvements and updates (Dieter Verfaillie)
diff --git a/README b/README
index e253932e..feecc855 100644
--- a/README
+++ b/README
@@ -3,16 +3,16 @@ PyGTK
 Original authors: James Henstridge <james@daa.com.au>
                   Johan Dahlin <johan@gnome.org>
 
-Current maintainers: Gustavo J A M Carneiro <gjc@gnome.org>
-                     Paul Pogonyshev <pogonyshev@gmx.net>
-                     Gian Mario Tagliaretti <gianmt@gnome.org>
+Past maintainers: Gustavo J A M Carneiro <gjc@gnome.org>
+                  Paul Pogonyshev <pogonyshev@gmx.net>
+                  Gian Mario Tagliaretti <gianmt@gnome.org>
 
-This archive contains modules that allow you to use gtk in Python
-programs.  At present, it is a fairly complete set of bindings.
-Despite the low version number, this piece of software is quite
-useful, and is usable to write moderately complex programs.  (see the
-examples directory for some examples of the simpler programs you could
-write).
+Maintainers:      John Stowers <john.stowers@gmail.com>
+                  Dieter Verfaillie <dieterv@optionexplicit.be>
+
+This archive contains modules that allow you to use GTK+-2 in Python
+programs.  At present, it is a complete set of bindings up to and including
+the gtk+-2.24 API.
 
 If you have any enhancements or bug reports, please file them in
 bugzilla at:
@@ -41,15 +41,20 @@ the web interface:
 
 Requirements
 ============
-  * C compiler (GCC and MSVC supported)
+  * C compiler (GCC, MSVC and mingw supported)
   * Python 2.3.5 or higher
-  * PyGObject 2.12.1 or higher
+  * PyGObject 2.21.3 or higher
+  * Pycairo 1.0.2 or higher
   * Glib 2.8.0 or higher
   * GTK+ 2.8.0 or higher (optional) or
     GTK+ 2.10.0 or higher for 2.10 API
     GTK+ 2.12.0 or higher for 2.12 API
     GTK+ 2.14.0 or higher for 2.14 API
     GTK+ 2.16.0 or higher for 2.16 API
+    GTK+ 2.18.0 or higher for 2.18 API
+    GTK+ 2.20.0 or higher for 2.20 API
+    GTK+ 2.22.0 or higher for 2.22 API
+    GTK+ 2.24.0 or higher for 2.24 API
   * libglade 2.5.0 or higher (optional)
   * pycairo 1.0.2 or higher (optional)
   * numpy (optional)
@@ -62,6 +67,9 @@ This release is supporting the following GTK+ releases:
   2.14.x
   2.16.x
   2.18.x
+  2.20.x
+  2.22.x
+  2.24.x
 
 To include support for the 2.10 API you'll need GTK+ 2.10.0 etc.
 
@@ -103,21 +111,6 @@ is installed you'll need to set the PYTHONPATH variable to the
 $prefix/lib/pythonX.Y/site-packages directory created by
 the PyGTK installation.
 
-Upgrading from 0.6.x
-====================
-
-The API has changed a fair bit compared to the 0.6.x releases of pygtk
-in response to feedback from the mailing list.  The main changes are:
-  - no low level procedural interface.  The extension now implements
-    the object oriented API directly, rather than layering it on top
-    of a procedural API.
-  - class names have been shortened.  Eg. instead of gtk.GtkWindow, we
-    now have gtk.Window.
-  - GDK classes and functions have been moved to the "gtk.gdk" module.
-  - the GTK and GDK modules have been removed, with their constants
-    being moved into the "gtk" and "gtk.gdk" modules.
-
-
 Tests
 =====
 
diff --git a/configure.ac b/configure.ac
index 222b509a..6b92d663 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@ AC_PREREQ(2.52)
 
 dnl the pygtk version number
 m4_define(pygtk_major_version, 2)
-m4_define(pygtk_minor_version, 23)
-m4_define(pygtk_micro_version, 2)
+m4_define(pygtk_minor_version, 24)
+m4_define(pygtk_micro_version, 1)
 m4_define(pygtk_version, pygtk_major_version.pygtk_minor_version.pygtk_micro_version)
 
 dnl versions of packages we require ...
@@ -386,8 +386,12 @@ if test "x$have_pycairo" = "xtrue"; then
   AC_DEFINE([HAVE_GTK_2_24], [$have_gtk_224], [If Gtk 2.24 was found])
 
   dnl libglade
-  PKG_CHECK_MODULES(LIBGLADE, [libglade-2.0 >= libglade_required_version],
-      have_libglade=true, have_libglade=false)
+  have_libglade=false
+  AC_ARG_WITH([glade], AS_HELP_STRING([--without-glade], [Build without glade library (default: test)]))
+  if test "x$with_glade" != "xno"; then
+    PKG_CHECK_MODULES(LIBGLADE, [libglade-2.0 >= libglade_required_version],
+	  have_libglade=true, have_libglade=false)
+  fi
   AC_SUBST(LIBGLADE_CFLAGS)
   AC_SUBST(LIBGLADE_LIBS)
   AM_CONDITIONAL(BUILD_LIBGLADE, $have_libglade)
diff --git a/setup.py b/setup.py
index f2628aa9..fcef009d 100755
--- a/setup.py
+++ b/setup.py
@@ -120,6 +120,9 @@ class PyGtkInstallLib(InstallLib):
         for testfile in glob.glob('tests/test*.py'):
             self.copy_test(os.path.basename(testfile))
 
+        for gladefile in glob.glob('tests/*.glade'):
+            self.copy_test(os.path.basename(gladefile))
+
 
 class PyGtkInstallData(InstallData):
     def run(self):