Preparations for 2.10

6 files changed, 51 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index dfa4a23dc..39add94c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-02-24  Matthias Clasen  <mclasen@redhat.com>
 
+	* README.in: Mention the slice allocator and GInitiallyUnowned.
+
+	* NEWS: Updates
+
+	* configure.in: Bump version to 2.10.0
+
 	* tests/utf8-pointer.c: Add tests for g_utf8_strlen().
 
 	* glib/gutf8.c: Fix boundary cases in g_utf8_strlen().
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index dfa4a23dc..39add94c2 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,11 @@
 2006-02-24  Matthias Clasen  <mclasen@redhat.com>
 
+	* README.in: Mention the slice allocator and GInitiallyUnowned.
+
+	* NEWS: Updates
+
+	* configure.in: Bump version to 2.10.0
+
 	* tests/utf8-pointer.c: Add tests for g_utf8_strlen().
 
 	* glib/gutf8.c: Fix boundary cases in g_utf8_strlen().
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index dfa4a23dc..39add94c2 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,5 +1,11 @@
 2006-02-24  Matthias Clasen  <mclasen@redhat.com>
 
+	* README.in: Mention the slice allocator and GInitiallyUnowned.
+
+	* NEWS: Updates
+
+	* configure.in: Bump version to 2.10.0
+
 	* tests/utf8-pointer.c: Add tests for g_utf8_strlen().
 
 	* glib/gutf8.c: Fix boundary cases in g_utf8_strlen().
diff --git a/NEWS b/NEWS
index e4f2237fa..af2209878 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,21 @@
+Overview of Changes from GLib 2.9.6 to GLib 2.10.0
+==================================================
+
+* Bugs fixed:
+ 328997 64bit pointer trunction in glib slab-allocator
+        [Pascal Hofstee]
+ 331110 g_cond_broadcast(inform_cond) without holding 
+        inform_mutex [Chris Wilson, Sebastian Wilhelmi]
+ 332093 Fix some leaks in the tests [Kjartan Maraas]
+ 332435 g_utf8_strlen returns wrong value if a maximum 
+        number of bytes to check is specified 
+        [Matthias Clasen]
+
+* Documentation improvements [Matthias, Kang Jeong-Hee,
+  Tor Lillqvist, Stefan Kost]
+
+* Translation updates (el,eu,ka,uk)
+
 Overview of Changes from GLib 2.9.5 to GLib 2.9.6
 =================================================
 
diff --git a/README.in b/README.in
index 9f9c35d78..e3d0b9683 100644
--- a/README.in
+++ b/README.in
@@ -45,6 +45,18 @@ Notes about GLib 2.10
   'make check' will also fail on systems where the C compiler does not
   support ELF visibility attributes.
 
+* The GMemChunk API has been deprecated in favour of a new 'slice 
+  allocator'. See the g_slice documentation for more details. 
+
+* A new type, GInitiallyUnowned, has been introduced, which is
+  intended to serve as a common implementation of the 'floating reference'
+  concept that is e.g. used by GtkObject. Note that changing the
+  inheritance hierarchy of a type can cause problems for language
+  bindings and other code which needs to work closely with the type
+  system. Therefore, switching to GInitiallyUnowned should be done
+  carefully. g_object_compat_control() has been added to GLib 2.8.5
+  to help with the transition.
+
 Notes about GLib 2.6.0
 ======================
 
diff --git a/configure.in b/configure.in
index 480d7b15e..534f7194e 100644
--- a/configure.in
+++ b/configure.in
@@ -26,9 +26,9 @@ m4_include(m4macros/glib-gettext.m4)dnl
 # set glib_binary_age _and_ glib_interface_age to 0.
 #
 m4_define([glib_major_version], [2])
-m4_define([glib_minor_version], [9])
-m4_define([glib_micro_version], [7])
-m4_define([glib_interface_age], [5])
+m4_define([glib_minor_version], [10])
+m4_define([glib_micro_version], [0])
+m4_define([glib_interface_age], [0])
 m4_define([glib_binary_age],
           [m4_eval(100 * glib_minor_version + glib_micro_version)])
 m4_define([glib_version],