Re-branch 5.2.15

diff --git a/NEWS b/NEWS
index b858ef31fddacc12765cc6c63c3681787b62736c..f836c6876048d7e045a65e5736420d7ec3da9c1c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,5 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ?? ????, PHP 5.2.16
-
 09 Dec 2010, PHP 5.2.15
 - Fixed extract() to do not overwrite $GLOBALS and $this when using
   EXTR_OVERWRITE. (jorto at redhat dot com)  

diff --git a/configure.in b/configure.in
index a74485ce3b74d200d023d8a732824365b273f231..9cedfa8a1924968829a906e9695297084227d284 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -41,8 +41,8 @@ AC_CONFIG_HEADER(main/php_config.h)
 
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=2
-PHP_RELEASE_VERSION=16
-PHP_EXTRA_VERSION="-dev"
+PHP_RELEASE_VERSION=15
+PHP_EXTRA_VERSION=""
 PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`
 

diff --git a/main/php_version.h b/main/php_version.h
index 883d5f29695e57c70ff6dc4a8277ef6f62f9d6ed..fe29056662256467b0fb7fadf7a48227c3772516 100644 (file)
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,7 +2,7 @@
 /* edit configure.in to change version number */
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 2
-#define PHP_RELEASE_VERSION 16
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.2.16-dev"
-#define PHP_VERSION_ID 50216
+#define PHP_RELEASE_VERSION 15
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.2.15"
+#define PHP_VERSION_ID 50215