From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 3 May 2010 21:11:14 +0000 (-0700)
Subject: Prepare for release.
X-Git-Tag: upstream/2.20~5840
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e28c88707ef0529593fccedf1a94c3fce3df0ef3;p=platform%2Fupstream%2Flinaro-glibc.git

Prepare for release.
---

diff --git a/ChangeLog b/ChangeLog
index 064dbf9..318e779 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 887e410..98bce6b 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 db60a0c..02cc488 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"