diff --git a/ChangeLog b/ChangeLog
index cabf0ec0..46aeefc4 100644
--- a/ChangeLog
+++ b/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
diff --git a/package.xml b/package.xml
index 41b7026f..6dfa05fa 100644
--- a/package.xml
+++ b/package.xml
@@ -21,7 +21,7 @@ IMPORTANT: Version 2.x API is not compatible with earlier versions.
scottmac@php.net
no
- 2013-09-23
+ 2013-10-05
3.2.0b1
3.2.0
@@ -32,11 +32,13 @@ IMPORTANT: Version 2.x API is not compatible with earlier versions.
PHP License
-- 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
@@ -68,6 +70,36 @@ IMPORTANT: Version 2.x API is not compatible with earlier versions.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/php_imagick.h b/php_imagick.h
index c403f0ac..0402358a 100644
--- a/php_imagick.h
+++ b/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 */
diff --git a/validate.sh b/validate.sh
new file mode 100755
index 00000000..8c62eb9c
--- /dev/null
+++ b/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
\ No newline at end of file