From: Michael Wallner <mike@php.net>
Date: Tue, 1 Sep 2015 09:38:56 +0000 (+0200)
Subject: Merge branch 'master' into phpng
X-Git-Tag: release-2.0.0RC1~15
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=686c3eb652e7b639cd6c7a5cebfd87ff6b53bf76;hp=caeaf47971f6d8efa721b2faea00e0cd8d869ecb;p=m6w6%2Fext-propro

Merge branch 'master' into phpng
---

diff --git a/package.xml b/package.xml
index cd6a80c..f8f9d28 100644
--- a/package.xml
+++ b/package.xml
@@ -40,6 +40,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
    <file role="src" name="config.m4" />
    <file role="src" name="config.w32" />
    <file role="src" name="php_propro.h" />
+   <file role="src" name="php_propro_api.h" />
    <file role="src" name="php_propro.c" />
    <dir name="tests">
     <file role="test" name="001.phpt" />
@@ -50,7 +51,9 @@ http://pear.php.net/dtd/package-2.0.xsd">
  <dependencies>
   <required>
    <php>
-    <min>5.3</min>
+    <min>5.3.0</min>
+    <max>7.0.0</max>
+    <exclude>7.0.0</exclude>
    </php>
    <pearinstaller>
     <min>1.4.0</min>
@@ -58,8 +61,6 @@ http://pear.php.net/dtd/package-2.0.xsd">
   </required>
  </dependencies>
  <providesextension>propro</providesextension>
- <extsrcrelease>
-  <configureoption default="yes" name="enable-propro" prompt="whether to enable property proxy support" />
- </extsrcrelease>
+ <extsrcrelease/>
 </package>