Update changelog, package.xml and add simple script for validating re…

…lease

ChangeLog

@@ -1,3 +1,12 @@
+3.2.0b1
+- Added Countable interface to Imagick class
+- Added experimental support for Zend MM
+- Added additional parameter to writeImageFile to allow setting format
+- Distribute tests as part of the release
+- Fixed Bug #65043: Destroy and clear method do the same things
+- Fixed Bug #64945: ZEND_ACC_ALLOW_STATIC vs ZEND_ACC_STATIC
+- A lot of internal refactoring: rewrite macros as functions, clean up naming etc
+
 3.1.2
 - Fixed ZTS build
 - Added LICENSE file to comply with Fedora Packaging Guidelines

package.xml

@@ -21,7 +21,7 @@ IMPORTANT: Version 2.x API is not compatible with earlier versions.
 		<email>scottmac@php.net</email>
 		<active>no</active>
 	</lead>
-	<date>2013-09-23</date>
+	<date>2013-10-05</date>
 	<version>
 		<release>3.2.0b1</release>
 		<api>3.2.0</api>
@@ -32,11 +32,13 @@ IMPORTANT: Version 2.x API is not compatible with earlier versions.
 	</stability>
 	<license uri="http://www.php.net/license">PHP License</license>
 <notes>
-- Large amount of internal refactoring, removal of unnecessary macros
-- Removed unused code
-- Added error handling around object creation and cloning failures
-- Fixed PHP bug #64945	ZEND_ACC_ALLOW_STATIC vs ZEND_ACC_STATIC
-- Fixed Doc Bug #65043	Destroy and clear method do the same things
+- Added Countable interface to Imagick class
+- Added experimental support for Zend MM
+- Added additional parameter to writeImageFile to allow setting format
+- Distribute tests as part of the release
+- Fixed Bug #65043: Destroy and clear method do the same things
+- Fixed Bug #64945: ZEND_ACC_ALLOW_STATIC vs ZEND_ACC_STATIC
+- A lot of internal refactoring: rewrite macros as functions, clean up naming etc
 </notes>
 	<contents>
 		<dir name="/">
@@ -68,6 +70,36 @@ IMPORTANT: Version 2.x API is not compatible with earlier versions.
 				<file name="thumbnail.php" role="doc" />
 				<file name="watermark.php" role="doc" />
 			</dir>
+			<dir name="tests">
+				<file name="001_imagick_readimage.phpt" role="test" />
+				<file name="002_thumbnail.phpt" role="test" />
+				<file name="003_cast_color_opacity.phpt" role="test" />
+				<file name="004_clone.phpt" role="test" />
+				<file name="005_bestfit.phpt" role="test" />
+				<file name="006_cropthumbnail.phpt" role="test" />
+				<file name="007_thumbnail_fill.phpt" role="test" />
+				<file name="008_newpseudoimage.phpt" role="test" />
+				<file name="009_properties.phpt" role="test" />
+				<file name="010_importimagepixels.phpt" role="test" />
+				<file name="011_polygon.phpt" role="test" />
+				<file name="012-clone-separation.phpt" role="test" />
+				<file name="013-read-filehandle.phpt" role="test" />
+				<file name="014-setresourcelimit.phpt" role="test" />
+				<file name="015-imagickdrawsetresolution.phpt" role="test" />
+				<file name="016-static-methods.phpt" role="test" />
+				<file name="017-clear-destroy.phpt" role="test" />
+				<file name="018-clone-length.phpt" role="test" />
+				<file name="019-readimages.phpt" role="test" />
+				<file name="020-pixeliterator.phpt" role="test" />
+				<file name="021-countable.phpt" role="test" />
+				<file name="022-writeimagefileformat.phpt" role="test" />
+				<file name="023-php-allocators.phpt" role="test" />
+				<file name="bug20636.phpt" role="test" />
+				<file name="bug21229.phpt" role="test" />
+				<file name="bug64015.phpt" role="test" />
+				<file name="php.gif" role="doc" />
+				<file name="skipif.inc" role="doc" />
+			</dir>
 		</dir>
 	</contents>
 	<dependencies>

php_imagick.h

@@ -24,7 +24,7 @@
 /* Define Extension Properties */
 #define PHP_IMAGICK_EXTNAME    "imagick"
 #define PHP_IMAGICK_VERSION    "@PACKAGE_VERSION@"
-#define PHP_IMAGICK_EXTNUM     30102
+#define PHP_IMAGICK_EXTNUM     30200
 
 /* Import configure options when building 
    outside of the PHP source tree */

validate.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+#
+# Simple shell script to validate releases
+#
+
+EXTNUM=$(grep PHP_IMAGICK_EXTNUM php_imagick.h | awk '{print $3'})
+echo "php_imagick.h EXTNUM:          $EXTNUM"
+
+REL_VERSION=$(xpath package.xml 'string(/package/version/release)' 2>/dev/null)
+API_VERSION=$(xpath package.xml 'string(/package/version/api)' 2>/dev/null)
+
+echo "package.xml release version:   ${REL_VERSION}"
+echo "package.xml api version:       ${API_VERSION}"
+
+REL_STABILITY=$(xpath package.xml 'string(/package/stability/release)' 2>/dev/null)
+API_STABILITY=$(xpath package.xml 'string(/package/stability/api)' 2>/dev/null)
+
+echo "package.xml release stability: ${REL_STABILITY}"
+echo "package.xml api stability:     ${API_STABILITY}"
+
+echo ""
+echo "Validation results: "
+
+if test "${REL_STABILITY}" = "beta"; then
+	$(echo ${REL_VERSION} | egrep -i 'b|rc' >/dev/null 2>&1)
+
+	if test $? != 0; then
+		echo "Error: release is marked 'beta' but version doesn't include b or RC";
+		exit 1;
+	fi
+fi
+
+EXTNUM_FROM_PKG_XML=$(echo $REL_VERSION | gsed 's/^\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/' | awk -F . '{ printf ("%d%02d%02d", $1, $2, $3); }')
+
+if test $EXTNUM_FROM_PKG_XML != $EXTNUM; then
+	echo "Error: package.xml and php_imagick.h EXTNUM mismatch"
+	exit 1
+fi
+
+
+
+if test "${REL_STABILITY}" != "${API_STABILITY}"; then
+	echo "Warning: API and release stability differ";
+fi