Back to dev

diff --git a/NEWS b/NEWS
index 99bee76209e0d2dcfe6ddefdb893c3be87426e31..f1f30713a6358ad9e017c533fd796b85c3913f49 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-08 Nov 2007 , PHP 5.2.5
+?? ??? 2008, PHP 5.2.6
+
+08 Nov 2007, PHP 5.2.5
 - Upgraded PCRE to version 7.3 (Nuno)
 - Added optional parameter $provide_object to debug_backtrace(). (Sebastian)
 - Added alpha support for imagefilter() IMG_FILTER_COLORIZE. (Pierre)

diff --git a/configure.in b/configure.in
index bf09a03e30b870f06414b3502bff9907c51bc1d1..177b1095d995323686d922218acab9fc536a4a9f 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=5
-PHP_EXTRA_VERSION=""
+PHP_RELEASE_VERSION=6
+PHP_EXTRA_VERSION="-dev"
 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 c4cd550849b0bed763d67f1e4e971f0ed681ed65..4edfe87cb8c7822375d2ccda0b09266c21f7c3ab 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 5
-#define PHP_EXTRA_VERSION ""
-#define PHP_VERSION "5.2.5"
-#define PHP_VERSION_ID 50205
+#define PHP_RELEASE_VERSION 6
+#define PHP_EXTRA_VERSION "-dev"
+#define PHP_VERSION "5.2.6-dev"
+#define PHP_VERSION_ID 50206