[gtkmm/gtkmm-2-22] 2.21.5

[Murray Cumming <murrayc src gnome org>]

commit f88d313f3e64512c38b5887690507904db2f21aa
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Jul 14 10:37:16 2010 +0200

    2.21.5

 ChangeLog    |    4 +++-
 NEWS         |   12 ++++++++++++
 configure.ac |    4 ++--
 3 files changed, 17 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index eb20499..4f5fde4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
+2.21.5:
+
 2010-07-14  Murray Cumming  <murrayc murrayc com>
 
-    Rearrange include sin tests and demos for the undefs.
+    Rearrange includes in tests and demos for the undefs.
 
 	* demos/gtk-demo/demowindow.cc:
 	* demos/gtk-demo/demowindow.h:
diff --git a/NEWS b/NEWS
index bb027af..959cb0f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+2.21.5 (unstable):
+
+* Adapt to recent GDK and Gtk+ deprecations.
+  You may need to include gtkmm/box, gtkmm/dialog.h, gtkmm/main.h,
+  gtkmm/treepath, or gtkmm.h before other gtkmm or gtk+ includes to build with
+  disabled deprecations and warnings as errors.
+  We might yet find a way to make that unnecessary. It is only an issue in
+  gtkmm 2.22, not with gtkmm-3.0.
+  (Murray Cumming)
+* PrintOperation: get_default_page_setup(): refcount fix.
+  (Murray Cumming) Bug #622957 (Kjell Ahlstedt).
+
 2.21.1 (unstable):
 
 * atkmm is now a separate tarball module.
diff --git a/configure.ac b/configure.ac
index 7fa0d29..a76885c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU Lesser General Public License
 ## along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([gtkmm], [2.21.1],
+AC_INIT([gtkmm], [2.21.5],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gtkmm],
         [gtkmm], [http://www.gtkmm.org/])
 AC_PREREQ([2.59])
@@ -54,7 +54,7 @@ AS_IF([test "x$enable_static" = xyes],
       [AC_DEFINE([GTKMM_STATIC_LIB], [1], [Define when building gtkmm as a static library])])
 
 # gdkmm really does need GTK+, because part of Gdk::DragContext is in GTK+.
-AC_SUBST([GDKMM_MODULES], ['giomm-2.4 >= 2.24 pangomm-1.4 >= 2.26 gtk+-2.0 >= 2.20.0'])
+AC_SUBST([GDKMM_MODULES], ['giomm-2.4 >= 2.24 pangomm-1.4 >= 2.26 gtk+-2.0 >= 2.21.5'])
 
 AS_IF([test "x$gtkmm_host_windows" = xyes],
       [GTKMM_MODULES=$GDKMM_MODULES],