Set version to 2.12

diff --git a/ChangeLog b/ChangeLog
index 28c164aca49dde1a0acc96fa771263ecc8a9ae20..5e73e39e5313b2ff1fde37939df99ff2c3c480ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-30  Matthias Clasen  <mclasen@redhat.com>
+
+       * configure.in: Set version to 2.12.0
+
 2006-06-20  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gtimer.c (mktime_utc): Fix an off-by-2 error

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 28c164aca49dde1a0acc96fa771263ecc8a9ae20..5e73e39e5313b2ff1fde37939df99ff2c3c480ef 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,7 @@
+2006-06-30  Matthias Clasen  <mclasen@redhat.com>
+
+       * configure.in: Set version to 2.12.0
+
 2006-06-20  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gtimer.c (mktime_utc): Fix an off-by-2 error

diff --git a/configure.in b/configure.in
index 00542f67cde44ae974f4c81c5d648dc8cf53bfcf..42eefdb7b49c0c265f93bbf295ddac17d2aaac3d 100644 (file)
--- 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], [11])
-m4_define([glib_micro_version], [5])
-m4_define([glib_interface_age], [3])
+m4_define([glib_minor_version], [12])
+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],
@@ -855,7 +855,7 @@ fi
 AC_MSG_RESULT(unsigned $glib_size_type)
 
 # Check for some functions
-AC_CHECK_FUNCS(lstat strerror strsignal memmove mkstemp vsnprintf stpcpy strcasecmp strncasecmp poll getcwd nanosleep vasprintf setenv unsetenv getc_unlocked readlink symlink)
+AC_CHECK_FUNCS(lstat strerror strsignal memmove vsnprintf stpcpy strcasecmp strncasecmp poll getcwd nanosleep vasprintf setenv unsetenv getc_unlocked readlink symlink)
 
 AC_CHECK_HEADERS(crt_externs.h)
 AC_CHECK_FUNCS(_NSGetEnviron)