Creation of the 5.2 branch

diff --git a/NEWS b/NEWS
index 86a74c4e58333648e2c124602e2df2d3c8139f5f..dba4c605d2d34a239bdc6d162a9afa1b1c58fb60 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2006, PHP 5.?.?
+?? ??? 2006, PHP 5.2.0
 - Fixed bug #37313 (sigemptyset() used without including <signal.h>).
   (jdolecek)
 

diff --git a/configure.in b/configure.in
index 8c6cd8631fb684c86812aba5294cbfc98e6a2ae2..e4caa4aa24696fa3bbc78b5abe981966a19ecf98 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -10,6 +10,8 @@ dnl ## options and check for the basic compile tools.
 dnl ## Diversion 2 is the initial checking of OS features, programs,
 dnl ## libraries and so on.
 
+
+
 dnl ## In diversion 3 we check for compile-time options to the PHP
 dnl ## core and how to deal with different system dependencies.  This
 dnl ## includes what regex library is used and whether debugging or short
@@ -40,8 +42,8 @@ PHP_CANONICAL_HOST_TARGET
 AC_CONFIG_HEADER(main/php_config.h)
 
 MAJOR_VERSION=5
-MINOR_VERSION=1
-RELEASE_VERSION=5
+MINOR_VERSION=2
+RELEASE_VERSION=0
 EXTRA_VERSION="-dev"
 VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
 

diff --git a/main/php_version.h b/main/php_version.h
index 120dcf23d8f16dfaee4bb562b26f59505c756899..40c21ea777a97c361d49661a5f55817c0ebac2df 100644 (file)
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -1,7 +1,7 @@
 /* automatically generated by configure */
 /* edit configure.in to change version number */
 #define PHP_MAJOR_VERSION 5
-#define PHP_MINOR_VERSION 1
-#define PHP_RELEASE_VERSION 5
+#define PHP_MINOR_VERSION 2
+#define PHP_RELEASE_VERSION 0
 #define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.1.5-dev"
+#define PHP_VERSION "5.2.0-dev"