Fix various issues with package.xml parsing
authorMichael J. Rubinsky <mrubinsk@horde.org>
Sun, 15 Aug 2010 19:35:18 +0000 (15:35 -0400)
committerMichael J. Rubinsky <mrubinsk@horde.org>
Sun, 15 Aug 2010 19:35:18 +0000 (15:35 -0400)
framework/Cli/package.xml
framework/Group/package.xml
framework/Icalendar/test/Horde/Icalendar/patch.txt [new file with mode: 0644]
framework/Kolab_Format/package.xml
framework/Kolab_Resource/package.xml
framework/Text_Filter/package.xml
framework/Util/package.xml

index 0574bca..97894fc 100644 (file)
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<package packagerversion="1.4.9" 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">
+<package packagerversion="1.9.1" 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>Cli</name>
  <channel>pear.horde.org</channel>
  <summary>Horde Command Line Interface API</summary>
- <description>Horde_Cli:: API for basic command-line functionality/checks
- </description>
+ <description>Horde_Cli:: API for basic command-line functionality/checks</description>
  <lead>
   <name>Chuck Hagenbuch</name>
   <user>chuck</user>
@@ -20,7 +16,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <email>jan@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2009-06-10</date>
+ <date>2010-08-15</date>
+ <time>15:33:56</time>
  <version>
   <release>0.2.0</release>
   <api>0.2.0</api>
@@ -30,11 +27,12 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <api>beta</api>
  </stability>
  <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
- <notes>* Horde_CLI:: -> Horde_Cli::
+ <notes>
+* Horde_CLI:: -&gt; Horde_Cli::
  * Initial Horde 4 package.
  </notes>
  <contents>
-  <dir name="/">
+  <dir baseinstalldir="/" name="/">
    <dir name="doc">
     <dir name="Horde">
      <dir name="Cli">
@@ -57,33 +55,35 @@ http://pear.php.net/dtd/package-2.0.xsd">
    <pearinstaller>
     <min>1.5.4</min>
    </pearinstaller>
-   <extension>
-    <name>gettext</name>
-   </extension>
    <package>
     <name>Support</name>
     <channel>pear.horde.org</channel>
    </package>
+   <extension>
+    <name>gettext</name>
+   </extension>
   </required>
  </dependencies>
  <phprelease>
   <filelist>
-   <install name="lib/Horde/Cli.php" as="Horde/Cli.php" />
+   <install as="Horde/Cli/colors.php" name="doc/Horde/Cli/colors.php" />
+   <install as="Horde/Cli.php" name="lib/Horde/Cli.php" />
   </filelist>
  </phprelease>
  <changelog>
   <release>
-   <date>2006-12-31</date>
    <version>
-    <release>0.1.0</release>
-    <api>0.1.0</api>
+    <release>0.0.1</release>
+    <api>0.0.1</api>
    </version>
    <stability>
     <release>alpha</release>
     <api>alpha</api>
    </stability>
+   <date>2003-07-04</date>
    <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
-   <notes>Add 'default' parameter to Horde_CLI::prompt().
+   <notes>
+Initial release as a PEAR package
    </notes>
   </release>
   <release>
@@ -97,21 +97,39 @@ http://pear.php.net/dtd/package-2.0.xsd">
    </stability>
    <date>2006-05-08</date>
    <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
-   <notes>Converted to package.xml 2.0 for pear.horde.org
+   <notes>
+Converted to package.xml 2.0 for pear.horde.org
    </notes>
   </release>
   <release>
+   <date>2006-12-31</date>
    <version>
-    <release>0.0.1</release>
-    <api>0.0.1</api>
+    <release>0.1.0</release>
+    <api>0.1.0</api>
    </version>
    <stability>
     <release>alpha</release>
     <api>alpha</api>
    </stability>
-   <date>2003-07-04</date>
    <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
-   <notes>Initial release as a PEAR package
+   <notes>
+Add &apos;default&apos; parameter to Horde_CLI::prompt().
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>0.2.0</release>
+    <api>0.2.0</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2010-08-15</date>
+   <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
+   <notes>
+* Horde_CLI:: -&gt; Horde_Cli::
+ * Initial Horde 4 package.
    </notes>
   </release>
  </changelog>
index faa8e20..9827138 100644 (file)
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<package packagerversion="1.4.9" 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">
+<package packagerversion="1.9.1" 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>Group</name>
  <channel>pear.horde.org</channel>
  <summary>Horde User Groups System</summary>
- <description>Package for managing and accessing the Horde groups system.
- </description>
+ <description>Package for managing and accessing the Horde groups system.</description>
  <lead>
   <name>Chuck Hagenbuch</name>
   <user>chuck</user>
@@ -20,7 +16,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <email>jan@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2010-06-01</date>
+ <date>2010-08-15</date>
+ <time>15:32:50</time>
  <version>
   <release>0.2.0</release>
   <api>0.2.0</api>
@@ -30,11 +27,12 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <api>beta</api>
  </stability>
  <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
- <notes>* Throw exceptions, not PEAR_Errors.
+ <notes>
+* Throw exceptions, not PEAR_Errors.
  * Initial Horde 4 release.
  </notes>
  <contents>
-  <dir name="/">
+  <dir baseinstalldir="/" name="/">
    <dir name="lib">
     <dir name="Horde">
      <dir name="Group">
@@ -50,10 +48,10 @@ http://pear.php.net/dtd/package-2.0.xsd">
       <file name="Mock.php" role="php" />
       <file name="Sql.php" role="php" />
       <file name="SqlObject.php" role="php" />
-     </dir> <!-- /lib/Horde/Group -->
+     </dir> <!-- //lib/Horde/Group -->
      <file name="Group.php" role="php" />
-    </dir> <!-- /lib/Horde -->
-   </dir> <!-- /lib -->
+    </dir> <!-- //lib/Horde -->
+   </dir> <!-- //lib -->
   </dir> <!-- / -->
  </contents>
  <dependencies>
@@ -65,7 +63,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
     <min>1.7.0</min>
    </pearinstaller>
    <package>
-   <name>Core</name>
+    <name>Core</name>
     <channel>pear.horde.org</channel>
    </package>
    <package>
@@ -76,11 +74,11 @@ http://pear.php.net/dtd/package-2.0.xsd">
     <name>Exception</name>
     <channel>pear.horde.org</channel>
    </package>
-  </required>
    <package>
     <name>Util</name>
     <channel>pear.horde.org</channel>
    </package>
+  </required>
   <optional>
    <package>
     <name>Auth</name>
@@ -98,23 +96,55 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </dependencies>
  <phprelease>
   <filelist>
-   <install name="lib/Horde/Group/ContactListObject.php" as="Horde/Group/ContactListObject.php" />
-   <install name="lib/Horde/Group/Contactlists.php" as="Horde/Group/Contactlists.php" />
-   <install name="lib/Horde/Group/DataTreeObject.php" as="Horde/Group/DataTreeObject.php" />
-   <install name="lib/Horde/Group/Exception.php" as="Horde/Group/Exception.php" />
-   <install name="lib/Horde/Group/Hooks.php" as="Horde/Group/Hooks.php" />
-   <install name="lib/Horde/Group/Kolab.php" as="Horde/Group/Kolab.php" />
-   <install name="lib/Horde/Group/KolabObject.php" as="Horde/Group/KolabObject.php" />
-   <install name="lib/Horde/Group/Ldap.php" as="Horde/Group/Ldap.php" />
-   <install name="lib/Horde/Group/LdapObject.php" as="Horde/Group/LdapObject.php" />
-   <install name="lib/Horde/Group/Mock.php" as="Horde/Group/Mock.php" />
-   <install name="lib/Horde/Group/Sql.php" as="Horde/Group/Sql.php" />
-   <install name="lib/Horde/Group/SqlObject.php" as="Horde/Group/SqlObject.php" />
-   <install name="lib/Horde/Group.php" as="Horde/Group.php" />
+   <install as="Horde/Group.php" name="lib/Horde/Group.php" />
+   <install as="Horde/Group/ContactListObject.php" name="lib/Horde/Group/ContactListObject.php" />
+   <install as="Horde/Group/Contactlists.php" name="lib/Horde/Group/Contactlists.php" />
+   <install as="Horde/Group/DataTreeObject.php" name="lib/Horde/Group/DataTreeObject.php" />
+   <install as="Horde/Group/Exception.php" name="lib/Horde/Group/Exception.php" />
+   <install as="Horde/Group/Hooks.php" name="lib/Horde/Group/Hooks.php" />
+   <install as="Horde/Group/Kolab.php" name="lib/Horde/Group/Kolab.php" />
+   <install as="Horde/Group/KolabObject.php" name="lib/Horde/Group/KolabObject.php" />
+   <install as="Horde/Group/Ldap.php" name="lib/Horde/Group/Ldap.php" />
+   <install as="Horde/Group/LdapObject.php" name="lib/Horde/Group/LdapObject.php" />
+   <install as="Horde/Group/Mock.php" name="lib/Horde/Group/Mock.php" />
+   <install as="Horde/Group/Sql.php" name="lib/Horde/Group/Sql.php" />
+   <install as="Horde/Group/SqlObject.php" name="lib/Horde/Group/SqlObject.php" />
   </filelist>
  </phprelease>
  <changelog>
   <release>
+   <version>
+    <release>0.0.1</release>
+    <api>0.0.1</api>
+   </version>
+   <stability>
+    <release>alpha</release>
+    <api>alpha</api>
+   </stability>
+   <date>2003-07-05</date>
+   <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
+   <notes>
+Initial release as a PEAR package
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>0.0.2</release>
+    <api>0.0.2</api>
+   </version>
+   <stability>
+    <release>alpha</release>
+    <api>alpha</api>
+   </stability>
+   <date>2006-05-08</date>
+   <time>21:51:02</time>
+   <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
+   <notes>
+* Added ldap driver.
+* Converted to package.xml 2.0 for pear.horde.org.
+   </notes>
+  </release>
+  <release>
    <date>2008-09-16</date>
    <version>
     <release>0.1.0</release>
@@ -125,7 +155,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
     <api>beta</api>
    </stability>
    <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
-   <notes>* Added a mock driver for installations that don't need groups (Request #6157).
+   <notes>
+* Added a mock driver for installations that don&apos;t need groups (Request #6157).
    * Added a beta SQL Group driver (Request #6175).
    * Removed unused renameGroup() function.
    * Fixed loading subclasses before unserializing session objects (Bug #4650)
@@ -143,32 +174,18 @@ http://pear.php.net/dtd/package-2.0.xsd">
   </release>
   <release>
    <version>
-    <release>0.0.2</release>
-    <api>0.0.2</api>
-   </version>
-   <stability>
-    <release>alpha</release>
-    <api>alpha</api>
-   </stability>
-   <date>2006-05-08</date>
-   <time>21:51:02</time>
-   <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
-   <notes>* Added ldap driver.
-* Converted to package.xml 2.0 for pear.horde.org.
-   </notes>
-  </release>
-  <release>
-   <version>
-    <release>0.0.1</release>
-    <api>0.0.1</api>
+    <release>0.2.0</release>
+    <api>0.2.0</api>
    </version>
    <stability>
-    <release>alpha</release>
-    <api>alpha</api>
+    <release>beta</release>
+    <api>beta</api>
    </stability>
-   <date>2003-07-05</date>
+   <date>2010-08-15</date>
    <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
-   <notes>Initial release as a PEAR package
+   <notes>
+* Throw exceptions, not PEAR_Errors.
+ * Initial Horde 4 release.
    </notes>
   </release>
  </changelog>
diff --git a/framework/Icalendar/test/Horde/Icalendar/patch.txt b/framework/Icalendar/test/Horde/Icalendar/patch.txt
new file mode 100644 (file)
index 0000000..722f4c0
--- /dev/null
@@ -0,0 +1,58 @@
+diff --git a/framework/Icalendar/lib/Horde/Icalendar.php b/framework/Icalendar/lib/Horde/Icalendar.php
+index 8ee462f..a92b436 100644
+--- a/framework/Icalendar/lib/Horde/Icalendar.php
++++ b/framework/Icalendar/lib/Horde/Icalendar.php
+@@ -1282,31 +1282,21 @@ class Horde_Icalendar
+      * @todo A bunch of code calls this function outside this class, so it
+      * needs to be marked public for now.
+      *
+-     * @param $value TODO
++     * @param integer|object|array $value  The time value to export (either a
++     *                                     Horde_Date, array, or timestamp).
+      *
+-     * @return TODO
++     * @return string  The string representation of the datetime value.
+      */
+     public function _exportDateTime($value)
+     {
+         $temp = array();
+-        if (!is_object($value) && !is_array($value)) {
+-            $tz = date('O', $value);
+-            $TZOffset = (3600 * substr($tz, 0, 3)) + (60 * substr(date('O', $value), 3, 2));
+-            $value -= $TZOffset;
+-
+-            $temp['zone']   = 'UTC';
+-            $temp['year']   = date('Y', $value);
+-            $temp['month']  = date('n', $value);
+-            $temp['mday']   = date('j', $value);
+-            $temp['hour']   = date('G', $value);
+-            $temp['minute'] = date('i', $value);
+-            $temp['second'] = date('s', $value);
+-        } else {
+-            $dateOb = new Horde_Date($value);
+-            return $this->_exportDateTime($dateOb->timestamp());
+-        }
+-
+-        return $this->_exportDate($temp) . 'T' . $this->_exportTime($temp);
++        $date = new Horde_Date($value);
++        $date->setTimezone('UTC');
++        $time = array('hour' => $date->hour,
++                      'minute' => $date->min,
++                      'second' => $date->sec,
++                      'zone' => 'UTC');
++        return $this->_exportDate($date) . 'T' . $this->_exportTime($time);
+     }
+     /**
+@@ -1333,9 +1323,9 @@ class Horde_Icalendar
+     /**
+      * Exports a Time field.
+      *
+-     * @param $value TODO
++     * @param array $value An array of time parts.
+      *
+-     * @return TODO
++     * @return string  hhmmss[Z] representation of the time
+      */
+     protected function _exportTime($value)
+     {
index 8eb7617..f3fc615 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<package packagerversion="1.9.0" 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">
+<package packagerversion="1.9.1" 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>Kolab_Format</name>
  <channel>pear.horde.org</channel>
  <summary>A package for reading/writing Kolab data formats</summary>
@@ -29,8 +29,8 @@
   <email>jan@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2010-06-23</date>
- <time>10:35:06</time>
+ <date>2010-08-15</date>
+ <time>15:31:17</time>
  <version>
   <release>1.0.2</release>
   <api>1.0.0</api>
      <dir name="Kolab">
       <dir name="Format">
        <dir name="fixtures">
-        <file name="contact_category.xml" role="test" />
-        <file name="contact_mail.xml" role="test" />
-        <file name="contact_pgp.xml" role="test" />
-        <file name="event_umlaut.xml" role="test" />
-        <file name="event_umlaut_broken.xml" role="test" />
-        <file name="preferences_read_old.xml" role="test" />
-        <file name="preferences_write_old.xml" role="test" />
-        <file name="recur.xml" role="test" />
-        <file name="recur_fail.xml" role="test" />
         <file name="task.xml" role="test" />
        </dir> <!-- /test/Horde/Kolab/Format/fixtures -->
+       <dir name="Integration">
+        <dir name="fixtures">
+         <file name="contact_category.xml" role="test" />
+         <file name="contact_mail.xml" role="test" />
+         <file name="contact_pgp.xml" role="test" />
+         <file name="event_umlaut.xml" role="test" />
+         <file name="event_umlaut_broken.xml" role="test" />
+         <file name="preferences_read_old.xml" role="test" />
+         <file name="preferences_write_old.xml" role="test" />
+         <file name="recur.xml" role="test" />
+         <file name="recur_fail.xml" role="test" />
+        </dir> <!-- /test/Horde/Kolab/Format/Integration/fixtures -->
+        <file name="ContactTest.php" role="test" />
+        <file name="EventTest.php" role="test" />
+        <file name="MimeAttrTest.php" role="test" />
+        <file name="PreferencesTest.php" role="test" />
+        <file name="RecurrenceTest.php" role="test" />
+        <file name="TaskTest.php" role="test" />
+        <file name="XmlTest.php" role="test" />
+       </dir> <!-- /test/Horde/Kolab/Format/Integration -->
        <file name="AllTests.php" role="test" />
-       <file name="ContactTest.php" role="test" />
-       <file name="EventTest.php" role="test" />
-       <file name="MimeAttrTest.php" role="test" />
-       <file name="PreferencesTest.php" role="test" />
-       <file name="RecurrenceTest.php" role="test" />
-       <file name="TaskTest.php" role="test" />
-       <file name="XmlTest.php" role="test" />
+       <file name="Autoload.php" role="test" />
+       <file name="phpunit.xml" role="test" />
       </dir> <!-- /test/Horde/Kolab/Format -->
      </dir> <!-- /test/Horde/Kolab -->
     </dir> <!-- /test/Horde -->
    <install as="Horde/Kolab/Format/Xml/Note.php" name="lib/Horde/Kolab/Format/Xml/Note.php" />
    <install as="Horde/Kolab/Format/Xml/Task.php" name="lib/Horde/Kolab/Format/Xml/Task.php" />
    <install as="Horde/Kolab/Format/AllTests.php" name="test/Horde/Kolab/Format/AllTests.php" />
-   <install as="Horde/Kolab/Format/ContactTest.php" name="test/Horde/Kolab/Format/ContactTest.php" />
-   <install as="Horde/Kolab/Format/EventTest.php" name="test/Horde/Kolab/Format/EventTest.php" />
-   <install as="Horde/Kolab/Format/MimeAttrTest.php" name="test/Horde/Kolab/Format/MimeAttrTest.php" />
-   <install as="Horde/Kolab/Format/PreferencesTest.php" name="test/Horde/Kolab/Format/PreferencesTest.php" />
-   <install as="Horde/Kolab/Format/RecurrenceTest.php" name="test/Horde/Kolab/Format/RecurrenceTest.php" />
-   <install as="Horde/Kolab/Format/TaskTest.php" name="test/Horde/Kolab/Format/TaskTest.php" />
-   <install as="Horde/Kolab/Format/XmlTest.php" name="test/Horde/Kolab/Format/XmlTest.php" />
-   <install as="Horde/Kolab/Format/fixtures/contact_category.xml" name="test/Horde/Kolab/Format/fixtures/contact_category.xml" />
-   <install as="Horde/Kolab/Format/fixtures/contact_mail.xml" name="test/Horde/Kolab/Format/fixtures/contact_mail.xml" />
-   <install as="Horde/Kolab/Format/fixtures/contact_pgp.xml" name="test/Horde/Kolab/Format/fixtures/contact_pgp.xml" />
-   <install as="Horde/Kolab/Format/fixtures/event_umlaut.xml" name="test/Horde/Kolab/Format/fixtures/event_umlaut.xml" />
-   <install as="Horde/Kolab/Format/fixtures/event_umlaut_broken.xml" name="test/Horde/Kolab/Format/fixtures/event_umlaut_broken.xml" />
-   <install as="Horde/Kolab/Format/fixtures/preferences_read_old.xml" name="test/Horde/Kolab/Format/fixtures/preferences_read_old.xml" />
-   <install as="Horde/Kolab/Format/fixtures/preferences_write_old.xml" name="test/Horde/Kolab/Format/fixtures/preferences_write_old.xml" />
-   <install as="Horde/Kolab/Format/fixtures/recur.xml" name="test/Horde/Kolab/Format/fixtures/recur.xml" />
-   <install as="Horde/Kolab/Format/fixtures/recur_fail.xml" name="test/Horde/Kolab/Format/fixtures/recur_fail.xml" />
+   <install as="Horde/Kolab/Format/Autoload.php" name="test/Horde/Kolab/Format/Autoload.php" />
+   <install as="Horde/Kolab/Format/phpunit.xml" name="test/Horde/Kolab/Format/phpunit.xml" />
    <install as="Horde/Kolab/Format/fixtures/task.xml" name="test/Horde/Kolab/Format/fixtures/task.xml" />
+   <install as="Horde/Kolab/Format/Integration/ContactTest.php" name="test/Horde/Kolab/Format/Integration/ContactTest.php" />
+   <install as="Horde/Kolab/Format/Integration/EventTest.php" name="test/Horde/Kolab/Format/Integration/EventTest.php" />
+   <install as="Horde/Kolab/Format/Integration/MimeAttrTest.php" name="test/Horde/Kolab/Format/Integration/MimeAttrTest.php" />
+   <install as="Horde/Kolab/Format/Integration/PreferencesTest.php" name="test/Horde/Kolab/Format/Integration/PreferencesTest.php" />
+   <install as="Horde/Kolab/Format/Integration/RecurrenceTest.php" name="test/Horde/Kolab/Format/Integration/RecurrenceTest.php" />
+   <install as="Horde/Kolab/Format/Integration/TaskTest.php" name="test/Horde/Kolab/Format/Integration/TaskTest.php" />
+   <install as="Horde/Kolab/Format/Integration/XmlTest.php" name="test/Horde/Kolab/Format/Integration/XmlTest.php" />
+   <install as="Horde/Kolab/Format/Integration/fixtures/contact_category.xml" name="test/Horde/Kolab/Format/Integration/fixtures/contact_category.xml" />
+   <install as="Horde/Kolab/Format/Integration/fixtures/contact_mail.xml" name="test/Horde/Kolab/Format/Integration/fixtures/contact_mail.xml" />
+   <install as="Horde/Kolab/Format/Integration/fixtures/contact_pgp.xml" name="test/Horde/Kolab/Format/Integration/fixtures/contact_pgp.xml" />
+   <install as="Horde/Kolab/Format/Integration/fixtures/event_umlaut.xml" name="test/Horde/Kolab/Format/Integration/fixtures/event_umlaut.xml" />
+   <install as="Horde/Kolab/Format/Integration/fixtures/event_umlaut_broken.xml" name="test/Horde/Kolab/Format/Integration/fixtures/event_umlaut_broken.xml" />
+   <install as="Horde/Kolab/Format/Integration/fixtures/preferences_read_old.xml" name="test/Horde/Kolab/Format/Integration/fixtures/preferences_read_old.xml" />
+   <install as="Horde/Kolab/Format/Integration/fixtures/preferences_write_old.xml" name="test/Horde/Kolab/Format/Integration/fixtures/preferences_write_old.xml" />
+   <install as="Horde/Kolab/Format/Integration/fixtures/recur.xml" name="test/Horde/Kolab/Format/Integration/fixtures/recur.xml" />
+   <install as="Horde/Kolab/Format/Integration/fixtures/recur_fail.xml" name="test/Horde/Kolab/Format/Integration/fixtures/recur_fail.xml" />
   </filelist>
  </phprelease>
  <changelog>
     <release>stable</release>
     <api>stable</api>
    </stability>
-   <date>2010-06-23</date>
+   <date>2010-08-15</date>
    <license uri="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html">LGPL</license>
    <notes>
-* Remove dependency on the Kolab package within the task handler.
+* Removed dependency on Horde_Exception.
+* Removed dependency on the Kolab package within the task handler.
 * Converted to Horde4/PHP5
 * Removed Horde_DOM dependency.
    </notes>
index a2e6e0c..a38c2a8 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<package packagerversion="1.9.0" 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">
+<package packagerversion="1.9.1" 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>Kolab_Resource</name>
  <channel>pear.horde.org</channel>
  <summary>Resource management for the Kolab server</summary>
@@ -22,8 +22,8 @@
   <email>jan@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2010-07-15</date>
- <time>13:14:08</time>
+ <date>2010-08-15</date>
+ <time>15:30:39</time>
  <version>
   <release>0.1.0</release>
   <api>0.1.0</api>
@@ -63,8 +63,6 @@
        <dir name="Integration">
         <file name="ResourceTest.php" role="test" />
        </dir> <!-- /test/Horde/Kolab/Resource/Integration -->
-       <file name="AllTests.php" role="test" />
-       <file name="Autoload.php" role="test" />
        <file name="phpunit.xml" role="test" />
        <file name="TestCase.php" role="test" />
       </dir> <!-- /test/Horde/Kolab/Resource -->
    <install as="Horde/Kolab/Resource/Reply.php" name="lib/Horde/Kolab/Resource/Reply.php" />
    <install as="Horde/Kolab/Resource/Freebusy/Kolab.php" name="lib/Horde/Kolab/Resource/Freebusy/Kolab.php" />
    <install as="Horde/Kolab/Resource/Freebusy/Mock.php" name="lib/Horde/Kolab/Resource/Freebusy/Mock.php" />
-   <install as="Horde/Kolab/Resource/AllTests.php" name="test/Horde/Kolab/Resource/AllTests.php" />
-   <install as="Horde/Kolab/Resource/Autoload.php" name="test/Horde/Kolab/Resource/Autoload.php" />
    <install as="Horde/Kolab/Resource/phpunit.xml" name="test/Horde/Kolab/Resource/phpunit.xml" />
    <install as="Horde/Kolab/Resource/TestCase.php" name="test/Horde/Kolab/Resource/TestCase.php" />
    <install as="Horde/Kolab/Resource/Integration/ResourceTest.php" name="test/Horde/Kolab/Resource/Integration/ResourceTest.php" />
     <release>alpha</release>
     <api>alpha</api>
    </stability>
-   <date>2010-07-14</date>
+   <date>2010-08-15</date>
    <license uri="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html">LGPL</license>
    <notes>
 * Extracted package from Kolab_Filter.
index 62a4fd8..a1f1e07 100644 (file)
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<package packagerversion="1.4.9" 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">
+<package packagerversion="1.9.1" 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>Text_Filter</name>
  <channel>pear.horde.org</channel>
  <summary>Horde Text Filter API</summary>
  <description>The Horde_Text_Filter:: class provides common methods for
- fitering and converting text.
- </description>
+ fitering and converting text.</description>
  <lead>
   <name>Chuck Hagenbuch</name>
   <user>chuck</user>
@@ -27,7 +23,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <email>slusarz@horde.org</email>
   <active>yes</active>
  </developer>
- <date>2009-06-10</date>
+ <date>2010-08-15</date>
+ <time>15:28:59</time>
  <version>
   <release>0.1.0</release>
   <api>0.1.0</api>
@@ -37,12 +34,13 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <api>beta</api>
  </stability>
  <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
- <notes>* XSS filter now uses PHP DOM parser to process incoming text.
+ <notes>
+* XSS filter now uses PHP DOM parser to process incoming text.
  * Remove Horde/Core dependency.
  * Add Horde_Text_Filter_Exception::.
  * Html2text converter now uses XML parser to generate output.
  * Add ability to define filters to use with preg_replace_callback().
- * Add 'noprefetch' parameter to XSS filter (Ticket #8836).
+ * Add &apos;noprefetch&apos; parameter to XSS filter (Ticket #8836).
  * Add XSS filtering for data URLs in A HREF parameters (Bug #8715).
  * Add support for Google Closure Compiler in javascript minfiy filter.
  * Fix dimming signatures when mixed with quoted text (Bug #4299).
@@ -51,11 +49,14 @@ http://pear.php.net/dtd/package-2.0.xsd">
  * Initial Horde 4 package.
  </notes>
  <contents>
-  <dir name="/">
+  <dir baseinstalldir="/" name="/">
    <dir name="lib">
     <dir name="Horde">
      <dir name="Text">
       <dir name="Filter">
+       <dir name="JavascriptMinify">
+        <file name="JsMin.php" role="php" />
+       </dir> <!-- /lib/Horde/Text/Filter/JavascriptMinify -->
        <file name="Base.php" role="php" />
        <file name="Bbcode.php" role="php" />
        <file name="Cleanascii.php" role="php" />
@@ -68,9 +69,6 @@ http://pear.php.net/dtd/package-2.0.xsd">
        <file name="Highlightquotes.php" role="php" />
        <file name="Html2text.php" role="php" />
        <file name="JavascriptMinify.php" role="php" />
-       <dir name="JavascriptMinify">
-        <file name="JsMin.php" role="php" />
-       </dir> <!-- /lib/Horde/Text/Filter/JavascriptMinify -->
        <file name="Linkurls.php" role="php" />
        <file name="Simplemarkup.php" role="php" />
        <file name="Space2html.php" role="php" />
@@ -89,13 +87,13 @@ http://pear.php.net/dtd/package-2.0.xsd">
       <dir name="Filter">
        <file name="AllTests.php" role="test" />
        <file name="Autoload.php" role="test" />
-       <file name="Emails.php" role="test" />
+       <file name="EmailsTest.php" role="test" />
        <file name="EnvironmentTest.php" role="test" />
        <file name="Html2textTest.php" role="test" />
+       <file name="phpunit.xml" role="test" />
        <file name="Space2htmlTest.php" role="test" />
        <file name="Text2htmlTest.php" role="test" />
        <file name="XssTest.php" role="test" />
-       <file name="phpunit.xml" role="test" />
       </dir> <!-- /test/Horde/Text/Filter -->
      </dir> <!-- /test/Horde/Text -->
     </dir> <!-- /test/Horde -->
@@ -134,30 +132,55 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </dependencies>
  <phprelease>
   <filelist>
-   <install name="lib/Horde/Text/Filter/Base.php" as="Horde/Text/Filter/Base.php" />
-   <install name="lib/Horde/Text/Filter/Bbcode.php" as="Horde/Text/Filter/Bbcode.php" />
-   <install name="lib/Horde/Text/Filter/Cleanascii.php" as="Horde/Text/Filter/Cleanascii.php" />
-   <install name="lib/Horde/Text/Filter/Cleanhtml.php" as="Horde/Text/Filter/Cleanhtml.php" />
-   <install name="lib/Horde/Text/Filter/Dimsignature.php" as="Horde/Text/Filter/Dimsignature.php" />
-   <install name="lib/Horde/Text/Filter/Emails.php" as="Horde/Text/Filter/Emails.php" />
-   <install name="lib/Horde/Text/Filter/Emoticons.php" as="Horde/Text/Filter/Emoticons.php" />
-   <install name="lib/Horde/Text/Filter/Environment.php" as="Horde/Text/Filter/Environment.php" />
-   <install name="lib/Horde/Text/Filter/Highlightquotes.php" as="Horde/Text/Filter/Highlightquotes.php" />
-   <install name="lib/Horde/Text/Filter/Html2text.php" as="Horde/Text/Filter/Html2text.php" />
-   <install name="lib/Horde/Text/Filter/JavascriptMinify.php" as="Horde/Text/Filter/JavascriptMinify.php" />
-   <install name="lib/Horde/Text/Filter/JavascriptMinify/JsMin.php" as="Horde/Text/Filter/JavascriptMinify/JsMin.php" />
-   <install name="lib/Horde/Text/Filter/Linkurls.php" as="Horde/Text/Filter/Linkurls.php" />
-   <install name="lib/Horde/Text/Filter/Simplemarkup.php" as="Horde/Text/Filter/Simplemarkup.php" />
-   <install name="lib/Horde/Text/Filter/Space2html.php" as="Horde/Text/Filter/Space2html.php" />
-   <install name="lib/Horde/Text/Filter/Tabs2spaces.php" as="Horde/Text/Filter/Tabs2spaces.php" />
-   <install name="lib/Horde/Text/Filter/Text2html.php" as="Horde/Text/Filter/Text2html.php" />
-   <install name="lib/Horde/Text/Filter/Words.php" as="Horde/Text/Filter/Words.php" />
-   <install name="lib/Horde/Text/Filter/Xss.php" as="Horde/Text/Filter/Xss.php" />
-   <install name="lib/Horde/Text/Filter.php" as="Horde/Text/Filter.php" />
+   <install as="Horde/Text/Filter.php" name="lib/Horde/Text/Filter.php" />
+   <install as="Horde/Text/Filter/Base.php" name="lib/Horde/Text/Filter/Base.php" />
+   <install as="Horde/Text/Filter/Bbcode.php" name="lib/Horde/Text/Filter/Bbcode.php" />
+   <install as="Horde/Text/Filter/Cleanascii.php" name="lib/Horde/Text/Filter/Cleanascii.php" />
+   <install as="Horde/Text/Filter/Cleanhtml.php" name="lib/Horde/Text/Filter/Cleanhtml.php" />
+   <install as="Horde/Text/Filter/Dimsignature.php" name="lib/Horde/Text/Filter/Dimsignature.php" />
+   <install as="Horde/Text/Filter/Emails.php" name="lib/Horde/Text/Filter/Emails.php" />
+   <install as="Horde/Text/Filter/Emoticons.php" name="lib/Horde/Text/Filter/Emoticons.php" />
+   <install as="Horde/Text/Filter/Environment.php" name="lib/Horde/Text/Filter/Environment.php" />
+   <install as="Horde/Text/Filter/Exception.php" name="lib/Horde/Text/Filter/Exception.php" />
+   <install as="Horde/Text/Filter/Highlightquotes.php" name="lib/Horde/Text/Filter/Highlightquotes.php" />
+   <install as="Horde/Text/Filter/Html2text.php" name="lib/Horde/Text/Filter/Html2text.php" />
+   <install as="Horde/Text/Filter/JavascriptMinify.php" name="lib/Horde/Text/Filter/JavascriptMinify.php" />
+   <install as="Horde/Text/Filter/Linkurls.php" name="lib/Horde/Text/Filter/Linkurls.php" />
+   <install as="Horde/Text/Filter/Simplemarkup.php" name="lib/Horde/Text/Filter/Simplemarkup.php" />
+   <install as="Horde/Text/Filter/Space2html.php" name="lib/Horde/Text/Filter/Space2html.php" />
+   <install as="Horde/Text/Filter/Tabs2spaces.php" name="lib/Horde/Text/Filter/Tabs2spaces.php" />
+   <install as="Horde/Text/Filter/Text2html.php" name="lib/Horde/Text/Filter/Text2html.php" />
+   <install as="Horde/Text/Filter/Words.php" name="lib/Horde/Text/Filter/Words.php" />
+   <install as="Horde/Text/Filter/Xss.php" name="lib/Horde/Text/Filter/Xss.php" />
+   <install as="Horde/Text/Filter/JavascriptMinify/JsMin.php" name="lib/Horde/Text/Filter/JavascriptMinify/JsMin.php" />
+   <install as="Horde/Text/Filter/AllTests.php" name="test/Horde/Text/Filter/AllTests.php" />
+   <install as="Horde/Text/Filter/Autoload.php" name="test/Horde/Text/Filter/Autoload.php" />
+   <install as="Horde/Text/Filter/EmailsTest.php" name="test/Horde/Text/Filter/EmailsTest.php" />
+   <install as="Horde/Text/Filter/EnvironmentTest.php" name="test/Horde/Text/Filter/EnvironmentTest.php" />
+   <install as="Horde/Text/Filter/Html2textTest.php" name="test/Horde/Text/Filter/Html2textTest.php" />
+   <install as="Horde/Text/Filter/phpunit.xml" name="test/Horde/Text/Filter/phpunit.xml" />
+   <install as="Horde/Text/Filter/Space2htmlTest.php" name="test/Horde/Text/Filter/Space2htmlTest.php" />
+   <install as="Horde/Text/Filter/Text2htmlTest.php" name="test/Horde/Text/Filter/Text2htmlTest.php" />
+   <install as="Horde/Text/Filter/XssTest.php" name="test/Horde/Text/Filter/XssTest.php" />
   </filelist>
  </phprelease>
  <changelog>
   <release>
+   <version>
+    <release>0.0.1</release>
+    <api>0.0.1</api>
+   </version>
+   <stability>
+    <release>alpha</release>
+    <api>alpha</api>
+   </stability>
+   <date>2004-10-12</date>
+   <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
+   <notes>
+Initial release as a PEAR package
+   </notes>
+  </release>
+  <release>
    <date>2006-05-08</date>
    <time>23:39:08</time>
    <version>
@@ -169,26 +192,39 @@ http://pear.php.net/dtd/package-2.0.xsd">
     <api>alpha</api>
    </stability>
    <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
-   <notes>* Don't strip BASE tags when 'strip_styles' is false.
+   <notes>
+* Don&apos;t strip BASE tags when &apos;strip_styles&apos; is false.
    * Added ability to link &lt;test@example.com&gt; e-mail addresses in plain text.
    * Removed dependency on external javascript file when toggling quoted lines.
    * Converted to package.xml 2.0 for pear.horde.org
-   * Allow the bad words filter to leave the first character of a matching word and replace the rest with '*' (duck@obala.net).
+   * Allow the bad words filter to leave the first character of a matching word and replace the rest with &apos;*&apos; (duck@obala.net).
    * Improved efficiency of the linkurls filter when searching long lines
    </notes>
   </release>
   <release>
    <version>
-    <release>0.0.1</release>
-    <api>0.0.1</api>
+    <release>0.1.0</release>
+    <api>0.1.0</api>
    </version>
    <stability>
-    <release>alpha</release>
-    <api>alpha</api>
+    <release>beta</release>
+    <api>beta</api>
    </stability>
-   <date>2004-10-12</date>
+   <date>2010-08-15</date>
    <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
-   <notes>Initial release as a PEAR package
+   <notes>
+* XSS filter now uses PHP DOM parser to process incoming text.
+ * Remove Horde/Core dependency.
+ * Add Horde_Text_Filter_Exception::.
+ * Html2text converter now uses XML parser to generate output.
+ * Add ability to define filters to use with preg_replace_callback().
+ * Add &apos;noprefetch&apos; parameter to XSS filter (Ticket #8836).
+ * Add XSS filtering for data URLs in A HREF parameters (Bug #8715).
+ * Add support for Google Closure Compiler in javascript minfiy filter.
+ * Fix dimming signatures when mixed with quoted text (Bug #4299).
+ * Added javscript minify filter.
+ * Add support for using the tidy extension when filtering HTML data.
+ * Initial Horde 4 package.
    </notes>
   </release>
  </changelog>
index 3b2ff07..e56a3c7 100644 (file)
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<package packagerversion="1.4.9" 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">
+<package packagerversion="1.9.1" 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>Util</name>
  <channel>pear.horde.org</channel>
  <summary>Horde Utility Libraries</summary>
@@ -19,7 +16,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <email>jan@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2009-06-09</date>
+ <date>2010-08-15</date>
+ <time>15:27:45</time>
  <version>
   <release>0.2.0</release>
   <api>0.2.0</api>
@@ -29,7 +27,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <api>beta</api>
  </stability>
  <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
- <notes>* Removed Horde_Util::assertDriverConfig().
+ <notes>
+* Removed Horde_Util::assertDriverConfig().
  * Removed Horde_Util::bufferOutput().
  * Removed Horde_Util::uriB64Encode() and Horde_Util::uriB64Decode().
  * Removed Horde_Util::strftime2date() and Horde_Util::date2strftime().
@@ -40,7 +39,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
  * Initial Horde 4 package.
  </notes>
  <contents>
-  <dir name="/">
+  <dir baseinstalldir="/" name="/">
    <dir name="lib">
     <dir name="Horde">
      <dir name="Array">
@@ -57,15 +56,11 @@ http://pear.php.net/dtd/package-2.0.xsd">
    <dir name="test">
     <dir name="Horde">
      <dir name="Util">
-      <file name="Array_sort.phpt" role="test" />
-      <file name="Variables_remove.phpt" role="test" />
-      <file name="addParameter.phpt" role="test" />
-      <file name="case.phpt" role="test" />
-      <file name="case_php6.phpt" role="test" />
-      <file name="length.phpt" role="test" />
-      <file name="pad.phpt" role="test" />
-      <file name="removeParameter.phpt" role="test" />
-      <file name="utf-8.phpt" role="test" />
+      <file name="AllTests.php" role="test" />
+      <file name="ArrayTest.php" role="test" />
+      <file name="StringTest.php" role="test" />
+      <file name="UtilTest.php" role="test" />
+      <file name="VariablesTest.php" role="test" />
      </dir> <!-- /test/Horde/Util -->
     </dir> <!-- /test/Horde -->
    </dir> <!-- /test -->
@@ -85,6 +80,10 @@ http://pear.php.net/dtd/package-2.0.xsd">
    </package>
   </required>
   <optional>
+   <package>
+    <name>Imap_Client</name>
+    <channel>pear.horde.org</channel>
+   </package>
    <extension>
     <name>iconv</name>
    </extension>
@@ -94,24 +93,55 @@ http://pear.php.net/dtd/package-2.0.xsd">
    <extension>
     <name>xml</name>
    </extension>
-   <package>
-    <name>Imap_Client</name>
-    <channel>pear.horde.org</channel>
-   </package>
   </optional>
  </dependencies>
  <phprelease>
   <filelist>
-   <install name="lib/Horde/Array.php" as="Horde/Array.php" />
-   <install name="lib/Horde/Array/Sort/Helper.php" as="Horde/Array/Sort/Helper.php" />
-   <install name="lib/Horde/String.php" as="Horde/String.php" />
-   <install name="lib/Horde/Util.php" as="Horde/Util.php" />
-   <install name="lib/Horde/Variables.php" as="Horde/Variables.php" />
+   <install as="Horde/Array.php" name="lib/Horde/Array.php" />
+   <install as="Horde/String.php" name="lib/Horde/String.php" />
+   <install as="Horde/Util.php" name="lib/Horde/Util.php" />
+   <install as="Horde/Variables.php" name="lib/Horde/Variables.php" />
+   <install as="Horde/Array/Sort/Helper.php" name="lib/Horde/Array/Sort/Helper.php" />
+   <install as="Horde/Util/AllTests.php" name="test/Horde/Util/AllTests.php" />
+   <install as="Horde/Util/ArrayTest.php" name="test/Horde/Util/ArrayTest.php" />
+   <install as="Horde/Util/StringTest.php" name="test/Horde/Util/StringTest.php" />
+   <install as="Horde/Util/UtilTest.php" name="test/Horde/Util/UtilTest.php" />
+   <install as="Horde/Util/VariablesTest.php" name="test/Horde/Util/VariablesTest.php" />
   </filelist>
  </phprelease>
  <changelog>
   <release>
    <version>
+    <release>0.0.1</release>
+    <api>0.0.1</api>
+   </version>
+   <stability>
+    <release>alpha</release>
+    <api>alpha</api>
+   </stability>
+   <date>2003-10-28</date>
+   <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
+   <notes>
+Initial release as a PEAR package
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>0.0.2</release>
+    <api>0.0.2</api>
+   </version>
+   <stability>
+    <release>alpha</release>
+    <api>alpha</api>
+   </stability>
+   <date>2006-05-08</date>
+   <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
+   <notes>
+Converted to package.xml 2.0 for pear.horde.org
+   </notes>
+  </release>
+  <release>
+   <version>
     <release>0.1.0</release>
     <api>0.1.0</api>
    </version>
@@ -121,7 +151,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
     <api>beta</api>
    </stability>
    <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
-   <notes>* Added magic PHP5 methods to the Variables class.
+   <notes>
+* Added magic PHP5 methods to the Variables class.
 * Added array_merge_recursive_overwrite() to Horde_Array().
 * Fixed a bug in Horde_Array::arraySort where auto-detecting the first key failed.
 * Added sorter functions for array keys.
@@ -141,36 +172,31 @@ http://pear.php.net/dtd/package-2.0.xsd">
 * Added multibyte-safe String::wordwrap() method.
 * Added parameter to use wordwrap() for line folding.
 * Use C as the portable locale (Bug #6194).
-* Don't use utf8_encode/decode on very large strings if other options are available. (Bug #6660)
+* Don&apos;t use utf8_encode/decode on very large strings if other options are available. (Bug #6660)
 * Fixed order of checks in String::convertCharset (Bug #6794).
    </notes>
   </release>
   <release>
    <version>
-    <release>0.0.2</release>
-    <api>0.0.2</api>
+    <release>0.2.0</release>
+    <api>0.2.0</api>
    </version>
    <stability>
-    <release>alpha</release>
-    <api>alpha</api>
-   </stability>
-   <date>2006-05-08</date>
-   <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
-   <notes>Converted to package.xml 2.0 for pear.horde.org
-   </notes>
-  </release>
-  <release>
-   <version>
-    <release>0.0.1</release>
-    <api>0.0.1</api>
-   </version>
-   <stability>
-    <release>alpha</release>
-    <api>alpha</api>
+    <release>beta</release>
+    <api>beta</api>
    </stability>
-   <date>2003-10-28</date>
+   <date>2010-08-15</date>
    <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
-   <notes>Initial release as a PEAR package
+   <notes>
+* Removed Horde_Util::assertDriverConfig().
+ * Removed Horde_Util::bufferOutput().
+ * Removed Horde_Util::uriB64Encode() and Horde_Util::uriB64Decode().
+ * Removed Horde_Util::strftime2date() and Horde_Util::date2strftime().
+ * Removed Horde_Util::closeWindowJs() and Horde_Util::nocacheUrl().
+ * Added Horde_String::convertToUtf8().
+ * Added Horde_Util::abbreviate().
+ * Removed Horde_Array::combine() and Horde_Util::hmac().
+ * Initial Horde 4 package.
    </notes>
   </release>
  </changelog>