bakery r116 - trunk

[murrayc svn gnome org]

Author: murrayc
Date: Thu Oct  9 15:43:31 2008
New Revision: 116
URL: http://svn.gnome.org/viewvc/bakery?rev=116&view=rev

Log:
Increased version

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/configure.in

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Thu Oct  9 15:43:31 2008
@@ -1,3 +1,15 @@
+2.6.0:
+
+(Bakery-2.6 installs in parallel with bakery-2.4.)
+
+* Document_XML::get_node_child_named(): Ignore TextNodes.
+* Document_XML::write_to_disk(): Avoid a refcount problem with 
+  glibmm 2.16.0,  though that is not necessary now. The fix is 
+  harmless with fixed glibmm versions.
+  (Murray Cumming)
+* Maemo build fix.
+  (Armin Burgmeier)
+
 2.5.1:
 
 This is a new bakery-2.6 API/ABI. It installs in parallel with bakery-2.4.

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Oct  9 15:43:31 2008
@@ -5,8 +5,8 @@
 
 #We use pushdef here because we can't use shell variables before AC_INIT, but we want to use a variable with AC_INIT:
 pushdef([GENERIC_MAJOR_VERSION],     [2])
-pushdef([GENERIC_MINOR_VERSION],     [5])
-pushdef([GENERIC_MICRO_VERSION],     [1])
+pushdef([GENERIC_MINOR_VERSION],     [6])
+pushdef([GENERIC_MICRO_VERSION],     [0])
 pushdef([GENERIC_EXTRA_VERSION],     [])
 pushdef([GENERIC_VERSION], GENERIC_MAJOR_VERSION.GENERIC_MINOR_VERSION.GENERIC_MICRO_VERSION[]GENERIC_EXTRA_VERSION)
 AC_INIT([bakery], GENERIC_VERSION, [gtkmm-list gnome org])