From 89e3ac9531099e46c625e5e213dcb5a5480b7170 Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Sat, 6 May 2006 21:58:03 +0000 Subject: [PATCH] Creation of the 5.2 branch --- NEWS | 2 +- configure.in | 6 ++++-- main/php_version.h | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index 86a74c4e58..dba4c605d2 100644 --- 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 ). (jdolecek) diff --git a/configure.in b/configure.in index 8c6cd8631f..e4caa4aa24 100644 --- 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 120dcf23d8..40c21ea777 100644 --- 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" -- 2.50.1