Increased version

svn path=/branches/glibmm-2-12/; revision=375

3 files changed, 12 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index e91e4bf5..3e077c2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+2.12.5:
+
 Thu, 25 Jan 2007 23:13:05 +0100 Dodji Seketeli
 
 	* tools/m4/base.m4:
@@ -6,6 +8,8 @@ Thu, 25 Jan 2007 23:13:05 +0100 Dodji Seketeli
 	  to compilation errors on some distros.
 	  This should fix #397167. Thanks to Daniel Elstner for spotting this.
 
+2.12.4:
+
 2006-11-28  Daniel Elstner  <danielk@openismus.com>
 
 	* tools/pm/GtkDefs.pm (read_defs): Allow an empty pair of
diff --git a/NEWS b/NEWS
index 2cd18ed1..e3811547 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,13 @@
+2.12.5:
+
+* Fix code generation when using the latest m4, and functions named 
+  mkstemp, as experienced on Ubuntu Feisty.
+  Bug #397167 (Dodji Seketeli, Daniel Elstner)
+
 2.12.4:
 
 * gmmproc improvements:
-  - gmmproc: Allow () in property and signal docuemntation.
+  - gmmproc: Allow () in property and signal documentation.
   - gmmproc: Do not try to remove a common prefix from the 
   C enam values, if there is no common prefix.
   - enum.pl: Allow whitespace in front of an enum typedef. 
diff --git a/configure.in b/configure.in
index 2929a52a..bd449768 100644
--- a/configure.in
+++ b/configure.in
@@ -19,7 +19,7 @@ AC_PREREQ(2.50)
 #########################################################################
 GLIBMM_MAJOR_VERSION=2
 GLIBMM_MINOR_VERSION=12
-GLIBMM_MICRO_VERSION=4
+GLIBMM_MICRO_VERSION=5
 GLIBMM_VERSION=$GLIBMM_MAJOR_VERSION.$GLIBMM_MINOR_VERSION.$GLIBMM_MICRO_VERSION
 GLIBMM_RELEASE=$GLIBMM_MAJOR_VERSION.$GLIBMM_MINOR_VERSION
 AC_DEFINE_UNQUOTED([GLIBMM_MAJOR_VERSION], $GLIBMM_MAJOR_VERSION, [Major Version])