Update requirements

diff --git a/ChangeLog b/ChangeLog
index 828ad77fa6cbdf72ca5e258c51695450aad4e2a1..2db19ebdbe2d028cc011486351e8fa6d2e059703 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
-2006-06-30  Matthias Clasen  <mclasen@redhat.com>
+2006-07-02  Matthias Clasen  <mclasen@redhat.com>
+
+       * configure.in: Require cairo 1.2 and GLib 2.12,
+       set version to 2.10
 
+2006-06-30  Matthias Clasen  <mclasen@redhat.com>
+       
        * gtk/gtknotebook.c (gtk_notebook_tab_space): Remove
        redundant assignments to page, which may cause NULL
        dereferences.  (#346334, Dave Vasilevsky)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 828ad77fa6cbdf72ca5e258c51695450aad4e2a1..2db19ebdbe2d028cc011486351e8fa6d2e059703 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
-2006-06-30  Matthias Clasen  <mclasen@redhat.com>
+2006-07-02  Matthias Clasen  <mclasen@redhat.com>
+
+       * configure.in: Require cairo 1.2 and GLib 2.12,
+       set version to 2.10
 
+2006-06-30  Matthias Clasen  <mclasen@redhat.com>
+       
        * gtk/gtknotebook.c (gtk_notebook_tab_space): Remove
        redundant assignments to page, which may cause NULL
        dereferences.  (#346334, Dave Vasilevsky)

diff --git a/configure.in b/configure.in
index 1c57a86b748b1fba9263afeb5829e59e5618de1e..16f6479367121ba8eb663671423578589034c201 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,11 +11,11 @@ AC_PREREQ(2.54)
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
 
 m4_define([gtk_major_version], [2])
-m4_define([gtk_minor_version], [9])
-m4_define([gtk_micro_version], [5])
+m4_define([gtk_minor_version], [10])
+m4_define([gtk_micro_version], [0])
 m4_define([gtk_version],
           [gtk_major_version.gtk_minor_version.gtk_micro_version])
-m4_define([gtk_interface_age], [2])
+m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 # This is the X.Y used in -lgtk-FOO-X.Y
@@ -31,10 +31,10 @@ m4_define([gtk_api_version], [2.0])
 m4_define([gtk_binary_version], [2.10.0])
 
 # required versions of other packages
-m4_define([glib_required_version], [2.11.4])
+m4_define([glib_required_version], [2.12.0])
 m4_define([pango_required_version], [1.13.0])
 m4_define([atk_required_version], [1.9.0])
-m4_define([cairo_required_version], [1.1.8])
+m4_define([cairo_required_version], [1.2.0])
 
 
 AC_INIT([gtk+], [gtk_version],