From 19dcb9fda304707ada06441cbd70e80216960cad Mon Sep 17 00:00:00 2001
From: Thilo Raufeisen <traufeisen@php.net>
Date: Mon, 6 Nov 2006 14:53:44 +0000
Subject: [PATCH] going 1.3

---
 gnupg.c      |  2 +-
 package.xml  | 66 +++++++++++++++++++++++++------------------
 package2.xml | 80 ++++++++++++++++++++++++++++++++--------------------
 3 files changed, 88 insertions(+), 60 deletions(-)

diff --git a/gnupg.c b/gnupg.c
index 396b13d..ae4bd25 100644
--- a/gnupg.c
+++ b/gnupg.c
@@ -27,7 +27,7 @@
 
 static int le_gnupg;
 
-#define PHP_GNUPG_VERSION "1.2"
+#define PHP_GNUPG_VERSION "1.3"
 
 #ifdef ZEND_ENGINE_2
 static zend_object_handlers gnupg_object_handlers;
diff --git a/package.xml b/package.xml
index 3a3dea2..2dad08b 100644
--- a/package.xml
+++ b/package.xml
@@ -14,14 +14,15 @@
   </maintainer>
   </maintainers>
  <release>
-  <version>1.2</version>
-  <date>2006-05-23</date>
+  <version>1.3</version>
+  <date>2006-11-06</date>
   <license>BSD, revised</license>
   <state>stable</state>
-  <notes>fixed bug #7587 (gnupg_verify fails with detached signature)
-added "summary" into signature-array</notes>
+  <notes>PHP 5.2 compatibility
+gnupg_deletekey now allows deleting a secret key in procedural usage
+raised min version to 4.4</notes>
   <deps>
-   <dep type="php" rel="ge" version="4.3"/>
+   <dep type="php" rel="ge" version="4.4"/>
   </deps>
   <filelist>
    <file role="doc" name="LICENSE"/>
@@ -32,34 +33,43 @@ added "summary" into signature-array</notes>
    <file role="src" name="php_gnupg_keylistiterator.h" />
    <file role="src" name="gnupg.c"/>
    <file role="src" name="gnupg_keylistiterator.c" />
-   <dir name="examples">
-	<file role="doc" name="main.php"/>
-    <file role="doc" name="clearsign.php"/>
-    <file role="doc" name="verify.php"/>
-    <file role="doc" name="encrypt.php"/>
-    <file role="doc" name="decrypt.php"/>
-    <file role="doc" name="keyinfo.php"/>
-    <file role="doc" name="encryptsign.php" />
-    <file role="doc" name="export.php" />
-    <file role="doc" name="import.php" />
-   </dir>
    <dir name="tests">
-	<file role="test" name="0001_gnupg_import_oo.phpt" />
-    <file role="test" name="gnupg_encrypt_oo.phpt" />
-    <file role="test" name="gnupg_encryptsign_oo.phpt" />
-    <file role="test" name="gnupg_export_oo.phpt" />
-    <file role="test" name="gnupg_keyinfo_oo.phpt" />
-    <file role="test" name="gnupg_listsignatures_oo.phpt" />
-    <file role="test" name="gnupg_sign_clear_oo.phpt" />
-    <file role="test" name="gnupg_sign_detach_nonarmor.phpt" />
-    <file role="test" name="gnupg_sign_detach_oo.phpt" />
-    <file role="test" name="gnupg_sign_normal_nonarmor.phpt" />
-    <file role="test" name="gnupg_sign_normal.phpt" />
-    <file role="test" name="vars.inc" />
+	<file role="test" name="gnupg_oo_0001_import.phpt" />
+	<file role="test" name="gnupg_oo_encrypt.phpt" />
+	<file role="test" name="gnupg_oo_encryptsign.phpt" />
+	<file role="test" name="gnupg_oo_export.phpt" />
+	<file role="test" name="gnupg_oo_keyinfo.phpt" />
+	<file role="test" name="gnupg_oo_listsignatures.phpt" />
+	<file role="test" name="gnupg_oo_sign_clear.phpt" />
+	<file role="test" name="gnupg_oo_sign_detach_nonarmor.phpt" />
+	<file role="test" name="gnupg_oo_sign_detach.phpt" />
+	<file role="test" name="gnupg_oo_sign_normal_noarmor.phpt" />
+	<file role="test" name="gnupg_oo_sign_normal.phpt" />
+	<file role="test" name="gnupg_oo_zzz_deletekey.phpt" />
+	<file role="test" name="gnupg_res_0001_import.phpt" />
+	<file role="test" name="gnupg_res_encrypt.phpt" />
+	<file role="test" name="gnupg_res_encryptsign.phpt" />
+	<file role="test" name="gnupg_res_export.phpt" />
+	<file role="test" name="gnupg_res_keyinfo.phpt" />
+	<file role="test" name="gnupg_res_listsignatures.phpt" />
+	<file role="test" name="gnupg_res_sign_clear.phpt" />
+	<file role="test" name="gnupg_res_sign_detach_nonarmor.phpt" />
+	<file role="test" name="gnupg_res_sign_detach.phpt" />
+	<file role="test" name="gnupg_res_sign_normal_noarmor.phpt" />
+	<file role="test" name="gnupg_res_sign_normal.phpt" />
+	<file role="test" name="gnupg_res_zzz_deletekey.phpt" />
    </dir>
   </filelist>
  </release>
  <changelog>
+	<release>
+		<version>1.3</version>
+		<date>2006-11-06</date>
+		<state>stable</state>
+		<notes>PHP 5.2 compatibility
+gnupg_deletekey now allows deleting a secret key in procedural usage
+bumped min version to 4.4</notes>
+	</release>
 	<release>
 		<version>1.2</version>
 		<date>2006-05-23</date>
diff --git a/package2.xml b/package2.xml
index fc0f22e..bb555f3 100644
--- a/package2.xml
+++ b/package2.xml
@@ -15,47 +15,49 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <email>traufeisen@php.net</email>
   <active>yes</active>
  </lead>
- <date>2006-05-23</date>
- <time>21:25:00</time>
+ <date>2006-11-06</date>
+ <time>15:53:22</time>
  <version>
-  <release>1.2</release>
-  <api>1.2</api>
+  <release>1.3</release>
+  <api>1.3</api>
  </version>
  <stability>
   <release>stable</release>
   <api>stable</api>
  </stability>
  <license>BSD, revised</license>
- <notes>fixed bug #7587 (gnupg_verify fails with detached signature)
-added &quot;summary&quot; into signature-array
+ <notes>PHP 5.2 compatibility
+gnupg_deletekey now allows deleting a secret key in procedural usage
+raised min version to 4.4
  </notes>
  <contents>
   <dir name="/">
-   <dir name="examples">
-    <file name="clearsign.php" role="doc" />
-    <file name="decrypt.php" role="doc" />
-    <file name="encrypt.php" role="doc" />
-    <file name="encryptsign.php" role="doc" />
-    <file name="export.php" role="doc" />
-    <file name="import.php" role="doc" />
-    <file name="keyinfo.php" role="doc" />
-    <file name="main.php" role="doc" />
-    <file name="verify.php" role="doc" />
-   </dir> <!-- /examples -->
    <dir name="tests">
-    <file name="0001_gnupg_import_oo.phpt" role="test" />
-    <file name="gnupg_encryptsign_oo.phpt" role="test" />
-    <file name="gnupg_encrypt_oo.phpt" role="test" />
-    <file name="gnupg_export_oo.phpt" role="test" />
-    <file name="gnupg_keyinfo_oo.phpt" role="test" />
-    <file name="gnupg_listsignatures_oo.phpt" role="test" />
-    <file name="gnupg_sign_clear_oo.phpt" role="test" />
-    <file name="gnupg_sign_detach_nonarmor.phpt" role="test" />
-    <file name="gnupg_sign_detach_oo.phpt" role="test" />
-    <file name="gnupg_sign_normal.phpt" role="test" />
-    <file name="gnupg_sign_normal_nonarmor.phpt" role="test" />
-    <file name="vars.inc" role="test" />
-   </dir> <!-- /tests -->
+    <file name="gnupg_oo_0001_import.phpt" role="test" />
+    <file name="gnupg_oo_encrypt.phpt" role="test" />
+    <file name="gnupg_oo_encryptsign.phpt" role="test" />
+    <file name="gnupg_oo_export.phpt" role="test" />
+    <file name="gnupg_oo_keyinfo.phpt" role="test" />
+    <file name="gnupg_oo_listsignatures.phpt" role="test" />
+    <file name="gnupg_oo_sign_clear.phpt" role="test" />
+    <file name="gnupg_oo_sign_detach.phpt" role="test" />
+    <file name="gnupg_oo_sign_detach_nonarmor.phpt" role="test" />
+    <file name="gnupg_oo_sign_normal.phpt" role="test" />
+    <file name="gnupg_oo_sign_normal_noarmor.phpt" role="test" />
+    <file name="gnupg_oo_zzz_deletekey.phpt" role="test" />
+    <file name="gnupg_res_0001_import.phpt" role="test" />
+    <file name="gnupg_res_encrypt.phpt" role="test" />
+    <file name="gnupg_res_encryptsign.phpt" role="test" />
+    <file name="gnupg_res_export.phpt" role="test" />
+    <file name="gnupg_res_keyinfo.phpt" role="test" />
+    <file name="gnupg_res_listsignatures.phpt" role="test" />
+    <file name="gnupg_res_sign_clear.phpt" role="test" />
+    <file name="gnupg_res_sign_detach.phpt" role="test" />
+    <file name="gnupg_res_sign_detach_nonarmor.phpt" role="test" />
+    <file name="gnupg_res_sign_normal.phpt" role="test" />
+    <file name="gnupg_res_sign_normal_noarmor.phpt" role="test" />
+    <file name="gnupg_res_zzz_deletekey.phpt" role="test" />
+   </dir> <!-- //tests -->
    <file name="config.m4" role="src" />
    <file name="EXPERIMENTAL" role="doc" />
    <file name="gnupg.c" role="src" />
@@ -69,7 +71,7 @@ added &quot;summary&quot; into signature-array
  <dependencies>
   <required>
    <php>
-    <min>4.3</min>
+    <min>4.4</min>
    </php>
    <pearinstaller>
     <min>1.4.0b1</min>
@@ -79,6 +81,22 @@ added &quot;summary&quot; into signature-array
  <providesextension>gnupg</providesextension>
  <extsrcrelease />
  <changelog>
+  <release>
+   <version>
+    <release>1.3</release>
+    <api>1.3</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2006-11-06</date>
+   <license>BSD, revised</license>
+   <notes>PHP 5.2 compatibility
+gnupg_deletekey now allows deleting a secret key in procedural usage
+bumped min version to 4.4
+   </notes>
+  </release>
   <release>
    <version>
     <release>1.2</release>