From: Ulrich Drepper <drepper@gmail.com>
Date: Fri, 23 Dec 2011 19:03:55 +0000 (-0500)
Subject: Preliminaries for 2.15 release
X-Git-Tag: glibc-2.15^0
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c0da14cdda1fa552262ce3624156194eef43e973;p=thirdparty%2Fglibc.git

Preliminaries for 2.15 release
---

diff --git a/ChangeLog b/ChangeLog
index f1a0742f3f9..e81ffc170e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-12-23  Ulrich Drepper  <drepper@gmail.com>
 
+	* version.h (RELEASE): Bump for 2.15 release.
+	* include/features.h (__GLIBC_MINOR__): Bump to 15.
+
 	* sysdeps/x86_64/dl-machine.h: Fix typos in comments.
 	Patch by Marek Polacek <mpolacek@redhat.com>.
 
diff --git a/include/features.h b/include/features.h
index 8f888578fcb..c7b7972806e 100644
--- a/include/features.h
+++ b/include/features.h
@@ -339,7 +339,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__	14
+#define	__GLIBC_MINOR__	15
 
 #define __GLIBC_PREREQ(maj, min) \
 	((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min))
diff --git a/version.h b/version.h
index a37c4c77d4d..1dac42529b4 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.14.90"
+#define RELEASE "stable"
+#define VERSION "2.15"