Fix package layout.

diff --git a/framework/Rpc/package.xml b/framework/Rpc/package.xml
index f6f69cc..45a4782 100644 (file)
--- a/framework/Rpc/package.xml
+++ b/framework/Rpc/package.xml
@@ -3,7 +3,7 @@
 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>Horde_RPC</name>
+ <name>Rpc</name>
  <channel>pear.horde.org</channel>
  <summary>Horde RPC API</summary>
  <description>The Horde_RPC:: class provides a common abstracted interface to
@@ -36,36 +36,33 @@ various remote methods of accessing Horde functionality.
  </notes>
  <contents>
   <dir name="/">
-   <dir name="RPC">
-    <file baseinstalldir="/Horde" name="PhpSoap.php" role="php" />
-    <file baseinstalldir="/Horde" name="jsonrpc.php" role="php" />
-    <file baseinstalldir="/Horde" name="phpgw.php" role="php" />
-    <file baseinstalldir="/Horde" name="soap.php" role="php" />
-    <file baseinstalldir="/Horde" name="syncml.php" role="php" />
-    <file baseinstalldir="/Horde" name="syncml_wbxml.php" role="php" />
-    <file baseinstalldir="/Horde" name="webdav.php" role="php" />
-    <file baseinstalldir="/Horde" name="xmlrpc.php" role="php" />
-   </dir> <!-- /RPC -->
-   <dir name="tests">
-    <file baseinstalldir="/Horde" name="rpc-test.php" role="test" />
-   </dir> <!-- /tests -->
-   <file baseinstalldir="/Horde" name="RPC.php" role="php" />
+   <dir name="lib">
+    <dir name="Horde">
+     <dir name="Rpc">
+      <dir name="Syncml">
+       <file name="Wbxml.php" role="php" />
+      </dir> <!-- /lib/Horde/Rpc/Syncml -->
+      <file name="Jsonrpc.php" role="php" />
+      <file name="Phpgw.php" role="php" />
+      <file name="Soap.php" role="php" />
+      <file name="Syncml.php" role="php" />
+      <file name="Webdav.php" role="php" />
+      <file name="Xmlrpc.php" role="php" />
+     </dir> <!-- /lib/Horde/Rpc -->
+     <file name="Rpc.php" role="php" />
+    </dir> <!-- /lib/Horde -->
+   </dir> <!-- /lib -->
   </dir> <!-- / -->
  </contents>
  <dependencies>
   <required>
    <php>
-    <min>4.3.0</min>
+    <min>5.2.0</min>
    </php>
    <pearinstaller>
-    <min>1.4.0b1</min>
+    <min>1.5.0</min>
    </pearinstaller>
    <package>
-    <name>SOAP</name>
-    <channel>pear.php.net</channel>
-    <min>0.8RC3</min>
-   </package>
-   <package>
     <name>Horde_Framework</name>
     <channel>pear.horde.org</channel>
    </package>
@@ -78,7 +75,18 @@ various remote methods of accessing Horde functionality.
    </extension>
   </required>
  </dependencies>
- <phprelease />
+ <phprelease>
+  <filelist>
+   <install name="lib/Horde/Rpc/Syncml/Wbxml.php" as="Horde/Rpc/Syncml/Wbxml.php" />
+   <install name="lib/Horde/Rpc/Jsonrpc.php" as="Horde/Rpc/Jsonrpc.php" />
+   <install name="lib/Horde/Rpc/Phpgw.php" as="Horde/Rpc/Phpgw.php" />
+   <install name="lib/Horde/Rpc/Soap.php" as="Horde/Rpc/Soap.php" />
+   <install name="lib/Horde/Rpc/Syncml.php" as="Horde/Rpc/Syncml.php" />
+   <install name="lib/Horde/Rpc/Webdav.php" as="Horde/Rpc/Webdav.php" />
+   <install name="lib/Horde/Rpc/Xmlrpc.php" as="Horde/Rpc/Xmlrpc.php" />
+   <install name="lib/Horde/Rpc.php" as="Horde/Rpc.php" />
+  </filelist>
+ </phprelease>
  <changelog>
   <release>
    <version>