- Changing the API numbers, which might be a bit premature, but it allows

  to differentiate between different branches.
- Bumbed the version number to 6.0.0-dev. I know we didn't discuss this yet,
  but I feel it should be 6.0. See mail to the mailinglist.

diff --git a/Zend/zend_extensions.h b/Zend/zend_extensions.h
index a13b93c6ced35d832f153b5c4491c2baaa539be9..24ea843d8c6f4b44580e85a550fd1e6eda3810df 100644 (file)
--- a/Zend/zend_extensions.h
+++ b/Zend/zend_extensions.h
@@ -27,7 +27,7 @@
 /* The first number is the engine version and the rest is the date.
  * This way engine 2 API no. is always greater than engine 1 API no..
  */
-#define ZEND_EXTENSION_API_NO  220050617
+#define ZEND_EXTENSION_API_NO  220050809
 
 typedef struct _zend_extension_version_info {
        int zend_extension_api_no;

diff --git a/Zend/zend_modules.h b/Zend/zend_modules.h
index c859e5fe6c11b947848c4431be000a230d4ad4b0..653125b97e10a16f38e4648806a38c269b1486a1 100644 (file)
--- a/Zend/zend_modules.h
+++ b/Zend/zend_modules.h
@@ -38,7 +38,7 @@ extern struct _zend_arg_info third_arg_force_ref[4];
 extern struct _zend_arg_info fourth_arg_force_ref[5];
 extern struct _zend_arg_info all_args_by_ref[1];
 
-#define ZEND_MODULE_API_NO 20050617
+#define ZEND_MODULE_API_NO 20050809
 #ifdef ZTS
 #define USING_ZTS 1
 #else

diff --git a/configure.in b/configure.in
index a99eab8f486518a007cccce4c1d2341c663b99b3..3c5bfc63a0b55935d5bd718300800d9f25a67877 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -39,8 +39,8 @@ PHP_CANONICAL_HOST_TARGET
 
 AC_CONFIG_HEADER(main/php_config.h)
 
-MAJOR_VERSION=5
-MINOR_VERSION=1
+MAJOR_VERSION=6
+MINOR_VERSION=0
 RELEASE_VERSION=0
 EXTRA_VERSION="-dev"
 VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"

diff --git a/main/php.h b/main/php.h
index ba7c2ca2a8bfeb8857a4b75ab2450012b847ae45..b40585fd9adf801a2e5f1ccc95767ca5384ceb29 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -26,7 +26,7 @@
 #include <dmalloc.h>
 #endif
 
-#define PHP_API_VERSION 20041225
+#define PHP_API_VERSION 20050809
 #define PHP_HAVE_STREAMS
 #define YYDEBUG 0
 

diff --git a/main/php_version.h b/main/php_version.h
index eefa06de776db7c4389d5dcfda0c97181c152db5..f801a280e8df8d1ac9cc70686d98696f4fd6ec00 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_MAJOR_VERSION 6
+#define PHP_MINOR_VERSION 0
 #define PHP_RELEASE_VERSION 0
 #define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.1.0-dev"
+#define PHP_VERSION "6.0.0-dev"