about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2010-05-03 14:11:14 -0700
committerUlrich Drepper <drepper@redhat.com>2010-05-03 14:11:14 -0700
commite28c88707ef0529593fccedf1a94c3fce3df0ef3 (patch)
treed454699e104708c21d0b159fceb3c20a16e7cdb9
parent7dee26605bf8627f0673f81635c38c8a565dd2b7 (diff)
downloadglibc-e28c88707ef0529593fccedf1a94c3fce3df0ef3.tar.gz
glibc-e28c88707ef0529593fccedf1a94c3fce3df0ef3.tar.xz
glibc-e28c88707ef0529593fccedf1a94c3fce3df0ef3.zip
Prepare for release. glibc-2.12
-rw-r--r--ChangeLog3
-rw-r--r--include/features.h2
-rw-r--r--version.h4
3 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 064dbf93f0..318e779562 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-05-03  Ulrich Drepper  <drepper@redhat.com>
 
+	* version.h (VERSION): Bump for 2.11 release.
+	* include/features.h (__GLIBC_MINOR__): Bump to 11.
+
 	[BZ #11149]
 	* elf/ldconfig.c (search_dir): Fix handling of symlinks in chroot.
 
diff --git a/include/features.h b/include/features.h
index 887e410b44..98bce6be5a 100644
--- a/include/features.h
+++ b/include/features.h
@@ -337,7 +337,7 @@
 /* Major and minor version number of the GNU C library package.  Use
    these macros to test for features in specific releases.  */
 #define	__GLIBC__	2
-#define	__GLIBC_MINOR__	11
+#define	__GLIBC_MINOR__	12
 
 #define __GLIBC_PREREQ(maj, min) \
 	((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min))
diff --git a/version.h b/version.h
index db60a0c44e..02cc48871a 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
 /* This file just defines the current version number of libc.  */
 
-#define RELEASE "development"
-#define VERSION "2.11.90"
+#define RELEASE "stable"
+#define VERSION "2.12"