switch to package2.xml

3 files changed, 188 insertions, 178 deletions

diff --git a/ext/pdo_sqlite/package.xml b/ext/pdo_sqlite/package.xml
deleted file mode 100755
index 19ac59893b..0000000000
--- a/ext/pdo_sqlite/package.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>

-<!DOCTYPE package SYSTEM "../pear/package.dtd">

-<package version="1.0">

- <name>PDO_SQLITE</name>

- <summary>SQLite v3 Interface driver for PDO</summary>

- <maintainers>

-  <maintainer>

-   <user>wez</user>

-   <name>Wez Furlong</name>

-   <email>wez@php.net</email>

-   <role>lead</role>

-  </maintainer>

- </maintainers>

- <!-- configureoptions>

-	 <configureoption name="with-pdo-sqlite" prompt="Path to your sqlite3 install"/>

-</configureoptions -->

- <description>

-	 This extension provides an SQLite v3 driver for PDO.

-	 SQLite V3 is NOT compatible with the bundled SQLite 2 in PHP 5, but is a significant

-	 step forwards, featuring complete utf-8 support, native support for blobs,

-	 native support for prepared statements with bound parameters and improved

-	 concurrency.

- </description>

- <license>PHP</license>

- <release>

-  <state>stable</state>

-  <version>1.0</version>

-  <date>2005-11-26</date>

-

-  <notes>

-You need to install the PDO core module before you can make use of this one.

-This package includes a bundled SQLite 3 library.

-

-Windows binary:

-http://pecl4win.php.net/ext.php/php_pdo_sqlite.dll

-

-- Fixed PECL Bug #5633; build issues

-- Added sqliteCreateFunction() and sqliteCreateAggregate()

-- Fixed PECL Bug #3452; problem when first row of a result set contains a NULL value.

-- Upgraded bundled sqlite to 3.1.3

-- setting PDO_ATTR_TIMEOUT controls the busy timeout

-- Fixed PECL Bug #3391; cannot bind NULL parameters	

-- Fixed build problem when building the bundled sqlite library

-  </notes>

-

-  <filelist>

-   <file role="src" name="config.m4"/>

-   <file role="src" name="config.w32"/>

-   <file role="src" name="pdo_sqlite.c"/>

-   <file role="src" name="sqlite_driver.c"/>

-   <file role="src" name="sqlite_statement.c"/>

-   <file role="src" name="php_pdo_sqlite.h"/>

-   <file role="src" name="php_pdo_sqlite_int.h"/>

-

-   <file role="doc" name="CREDITS"/>

-

-   <dir name="sqlite">

-<file role="src" name="aclocal.m4"/>

-<file role="src" name="config.guess"/>

-<file role="src" name="config.sub"/>

-<file role="src" name="configure"/>

-<file role="src" name="configure.ac"/>

-<file role="src" name="install-sh"/>

-<file role="src" name="ltmain.sh"/>

-<file role="src" name="main.mk"/>

-<file role="src" name="Makefile.in"/>

-<file role="src" name="Makefile.linux-gcc"/>

-<file role="src" name="mkdll.sh"/>

-<file role="src" name="mkopcodec.awk"/>

-<file role="src" name="mkopcodeh.awk"/>

-<file role="src" name="mkso.sh"/>

-<file role="src" name="publish.sh"/>

-<file role="src" name="README"/>

-<file role="src" name="spec.template"/>

-<file role="src" name="sqlite.1"/>

-<file role="src" name="sqlite3.def"/>

-<file role="src" name="sqlite3.pc.in"/>

-<file role="src" name="sqlite.pc.in"/>

-<file role="src" name="VERSION"/>

-<dir name="src">

-<file role="src" name="analyze.c"/>

-<file role="src" name="attach.c"/>

-<file role="src" name="alter.c"/>

-<file role="src" name="auth.c"/>

-<file role="src" name="btree.c"/>

-<file role="src" name="btree.h"/>

-<file role="src" name="build.c"/>

-<file role="src" name="callback.c"/>

-<file role="src" name="date.c"/>

-<file role="src" name="delete.c"/>

-<file role="src" name="expr.c"/>

-<file role="src" name="experimental.c"/>

-<file role="src" name="func.c"/>

-<file role="src" name="hash.c"/>

-<file role="src" name="hash.h"/>

-<file role="src" name="insert.c"/>

-<file role="src" name="legacy.c"/>

-<file role="src" name="main.c"/>

-<file role="src" name="md5.c"/>

-<file role="src" name="keywordhash.h"/>

-<file role="src" name="opcodes.c"/>

-<file role="src" name="opcodes.h"/>

-<file role="src" name="os_common.h"/>

-<file role="src" name="os.h"/>

-<file role="src" name="os_mac.c"/>

-<file role="src" name="os_mac.h"/>

-<file role="src" name="os_test.c"/>

-<file role="src" name="os_test.h"/>

-<file role="src" name="os_unix.c"/>

-<file role="src" name="os_unix.h"/>

-<file role="src" name="os_win.c"/>

-<file role="src" name="os_win.h"/>

-<file role="src" name="pager.c"/>

-<file role="src" name="pager.h"/>

-<file role="src" name="parse.y"/>

-<file role="src" name="parse.c"/>

-<file role="src" name="parse.h"/>

-<file role="src" name="pragma.c"/>

-<file role="src" name="prepare.c"/>

-<file role="src" name="printf.c"/>

-<file role="src" name="random.c"/>

-<file role="src" name="select.c"/>

-<file role="src" name="shell.c"/>

-<file role="src" name="sqlite.h.in"/>

-<file role="src" name="sqliteInt.h"/>

-<file role="src" name="table.c"/>

-<file role="src" name="tclsqlite.c"/>

-<file role="src" name="test1.c"/>

-<file role="src" name="test2.c"/>

-<file role="src" name="test3.c"/>

-<file role="src" name="test4.c"/>

-<file role="src" name="test5.c"/>

-<file role="src" name="tokenize.c"/>

-<file role="src" name="trigger.c"/>

-<file role="src" name="update.c"/>

-<file role="src" name="utf.c"/>

-<file role="src" name="util.c"/>

-<file role="src" name="vacuum.c"/>

-<file role="src" name="vdbeapi.c"/>

-<file role="src" name="vdbeaux.c"/>

-<file role="src" name="vdbe.c"/>

-<file role="src" name="vdbefifo.c"/>

-<file role="src" name="vdbe.h"/>

-<file role="src" name="vdbeInt.h"/>

-<file role="src" name="vdbemem.c"/>

-<file role="src" name="where.c"/>

-</dir>

-

-<dir name="tool">

-<file role="src" name="diffdb.c"/>

-<file role="src" name="lemon.c"/>

-<file role="src" name="lempar.c"/>

-<file role="src" name="memleak2.awk"/>

-<file role="src" name="memleak3.tcl"/>

-<file role="src" name="memleak.awk"/>

-<file role="src" name="mkkeywordhash.c"/>

-<file role="src" name="mkopts.tcl"/>

-<file role="src" name="opcodeDoc.awk"/>

-<file role="src" name="report1.txt"/>

-<file role="src" name="showdb.c"/>

-<file role="src" name="showjournal.c"/>

-<file role="src" name="spaceanal.tcl"/>

-<file role="src" name="space_used.tcl"/>

-<file role="src" name="speedtest2.tcl"/>

-<file role="src" name="speedtest.tcl"/>

-</dir>

-

-   </dir>

-

-  </filelist>

-  <deps>

-   <dep type="php" rel="ge" version="5.0.3"/>

-   <dep type="ext" rel="ge" name="pdo" version="1.0"/>

-  </deps>

- </release>

-</package>

-<!-- vim: se ts=2 sw=2 et: -->

diff --git a/ext/pdo_sqlite/package2.xml b/ext/pdo_sqlite/package2.xml
new file mode 100644
index 0000000000..25d6e95dd0
--- /dev/null
+++ b/ext/pdo_sqlite/package2.xml
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package packagerversion="1.4.5" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
+http://pear.php.net/dtd/tasks-1.0.xsd
+http://pear.php.net/dtd/package-2.0
+http://pear.php.net/dtd/package-2.0.xsd">
+ <name>PDO_SQLITE</name>
+ <channel>pecl.php.net</channel>
+ <summary>SQLite v3 Interface driver for PDO</summary>
+ <description>This extension provides an SQLite v3 driver for PDO.
+SQLite V3 is NOT compatible with the bundled SQLite 2 in PHP 5, but is a significant
+step forwards, featuring complete utf-8 support, native support for blobs,
+native support for prepared statements with bound parameters and improved
+concurrency.
+ 
+ </description>
+ <lead>
+  <name>Wez Furlong</name>
+  <user>wez</user>
+  <email>wez@php.net</email>
+  <active>yes</active>
+ </lead>
+ <date>2005-12-04</date>
+ <version>
+  <release>1.0.1</release>
+  <api>1.0.1</api>
+ </version>
+ <stability>
+  <release>stable</release>
+  <api>stable</api>
+ </stability>
+ <license uri="http://www.php.net/license">PHP</license>
+ <notes>
+- Upgraded to new package2 format; no code changes in this release
+
+- Fixed PECL Bug #5633; build issues
+- Added sqliteCreateFunction() and sqliteCreateAggregate()
+- Fixed PECL Bug #3452; problem when first row of a result set contains a NULL value.
+- Upgraded bundled sqlite to 3.1.3
+- setting PDO_ATTR_TIMEOUT controls the busy timeout
+- Fixed PECL Bug #3391; cannot bind NULL parameters	
+- Fixed build problem when building the bundled sqlite library
+
+Windows binary:
+http://pecl4win.php.net/ext.php/php_pdo_sqlite.dll
+ </notes>
+ <contents>
+  <dir name="/">
+   <dir name="sqlite">
+    <dir name="src">
+     <file name="alter.c" role="src" />
+     <file name="analyze.c" role="src" />
+     <file name="attach.c" role="src" />
+     <file name="auth.c" role="src" />
+     <file name="btree.c" role="src" />
+     <file name="btree.h" role="src" />
+     <file name="build.c" role="src" />
+     <file name="callback.c" role="src" />
+     <file name="date.c" role="src" />
+     <file name="delete.c" role="src" />
+     <file name="experimental.c" role="src" />
+     <file name="expr.c" role="src" />
+     <file name="func.c" role="src" />
+     <file name="hash.c" role="src" />
+     <file name="hash.h" role="src" />
+     <file name="insert.c" role="src" />
+     <file name="keywordhash.h" role="src" />
+     <file name="legacy.c" role="src" />
+     <file name="main.c" role="src" />
+     <file name="md5.c" role="src" />
+     <file name="opcodes.c" role="src" />
+     <file name="opcodes.h" role="src" />
+     <file name="os.h" role="src" />
+     <file name="os_common.h" role="src" />
+     <file name="os_mac.c" role="src" />
+     <file name="os_mac.h" role="src" />
+     <file name="os_test.c" role="src" />
+     <file name="os_test.h" role="src" />
+     <file name="os_unix.c" role="src" />
+     <file name="os_unix.h" role="src" />
+     <file name="os_win.c" role="src" />
+     <file name="os_win.h" role="src" />
+     <file name="pager.c" role="src" />
+     <file name="pager.h" role="src" />
+     <file name="parse.c" role="src" />
+     <file name="parse.h" role="src" />
+     <file name="parse.y" role="src" />
+     <file name="pragma.c" role="src" />
+     <file name="prepare.c" role="src" />
+     <file name="printf.c" role="src" />
+     <file name="random.c" role="src" />
+     <file name="select.c" role="src" />
+     <file name="shell.c" role="src" />
+     <file name="sqlite.h.in" role="src" />
+     <file name="sqliteInt.h" role="src" />
+     <file name="table.c" role="src" />
+     <file name="tclsqlite.c" role="src" />
+     <file name="test1.c" role="src" />
+     <file name="test2.c" role="src" />
+     <file name="test3.c" role="src" />
+     <file name="test4.c" role="src" />
+     <file name="test5.c" role="src" />
+     <file name="tokenize.c" role="src" />
+     <file name="trigger.c" role="src" />
+     <file name="update.c" role="src" />
+     <file name="utf.c" role="src" />
+     <file name="util.c" role="src" />
+     <file name="vacuum.c" role="src" />
+     <file name="vdbe.c" role="src" />
+     <file name="vdbe.h" role="src" />
+     <file name="vdbeapi.c" role="src" />
+     <file name="vdbeaux.c" role="src" />
+     <file name="vdbefifo.c" role="src" />
+     <file name="vdbeInt.h" role="src" />
+     <file name="vdbemem.c" role="src" />
+     <file name="where.c" role="src" />
+    </dir> <!-- //sqlite/src -->
+    <dir name="tool">
+     <file name="diffdb.c" role="src" />
+     <file name="lemon.c" role="src" />
+     <file name="lempar.c" role="src" />
+     <file name="memleak.awk" role="src" />
+     <file name="memleak2.awk" role="src" />
+     <file name="memleak3.tcl" role="src" />
+     <file name="mkkeywordhash.c" role="src" />
+     <file name="mkopts.tcl" role="src" />
+     <file name="opcodeDoc.awk" role="src" />
+     <file name="report1.txt" role="src" />
+     <file name="showdb.c" role="src" />
+     <file name="showjournal.c" role="src" />
+     <file name="spaceanal.tcl" role="src" />
+     <file name="space_used.tcl" role="src" />
+     <file name="speedtest.tcl" role="src" />
+     <file name="speedtest2.tcl" role="src" />
+    </dir> <!-- //sqlite/tool -->
+    <file name="aclocal.m4" role="src" />
+    <file name="config.guess" role="src" />
+    <file name="config.sub" role="src" />
+    <file name="configure" role="src" />
+    <file name="configure.ac" role="src" />
+    <file name="install-sh" role="src" />
+    <file name="ltmain.sh" role="src" />
+    <file name="main.mk" role="src" />
+    <file name="Makefile.in" role="src" />
+    <file name="Makefile.linux-gcc" role="src" />
+    <file name="mkdll.sh" role="src" />
+    <file name="mkopcodec.awk" role="src" />
+    <file name="mkopcodeh.awk" role="src" />
+    <file name="mkso.sh" role="src" />
+    <file name="publish.sh" role="src" />
+    <file name="README" role="src" />
+    <file name="spec.template" role="src" />
+    <file name="sqlite.1" role="src" />
+    <file name="sqlite.pc.in" role="src" />
+    <file name="sqlite3.def" role="src" />
+    <file name="sqlite3.pc.in" role="src" />
+    <file name="VERSION" role="src" />
+   </dir> <!-- //sqlite -->
+   <file name="config.m4" role="src" />
+   <file name="config.w32" role="src" />
+   <file name="CREDITS" role="doc" />
+   <file name="pdo_sqlite.c" role="src" />
+   <file name="php_pdo_sqlite.h" role="src" />
+   <file name="php_pdo_sqlite_int.h" role="src" />
+   <file name="sqlite_driver.c" role="src" />
+   <file name="sqlite_statement.c" role="src" />
+  </dir> <!-- / -->
+ </contents>
+ <dependencies>
+  <required>
+   <php>
+    <min>5.0.3</min>
+   </php>
+   <pearinstaller>
+    <min>1.4.0</min>
+   </pearinstaller>
+   <package>
+    <name>pdo</name>
+    <channel>pecl.php.net</channel>
+    <min>1.0</min>
+    <providesextension>PDO</providesextension>
+   </package>
+  </required>
+ </dependencies>
+ <providesextension>PDO_SQLITE</providesextension>
+ <extsrcrelease />
+</package>
+<!-- vim:se ts=1 sw=1 et: -->
diff --git a/ext/pdo_sqlite/pdo_sqlite.c b/ext/pdo_sqlite/pdo_sqlite.c
index 40fdc80dc6..edcfa31d85 100644
--- a/ext/pdo_sqlite/pdo_sqlite.c
+++ b/ext/pdo_sqlite/pdo_sqlite.c
@@ -31,7 +31,7 @@
 #include "php_pdo_sqlite_int.h"
 #include "zend_exceptions.h"
 
-#define PHP_PDO_SQLITE_MODULE_VERSION	"1.0"
+#define PHP_PDO_SQLITE_MODULE_VERSION	"1.0.1"
 
 /* {{{ pdo_sqlite_functions[] */
 function_entry pdo_sqlite_functions[] = {