MFH

diff --git a/pear/package-PEAR.xml b/pear/package-PEAR.xml
index 2b81e10748478b44e525de74e8d2bedafb028ac7..7b38c177212e19d5de20a63e9d03cc64c0099d15 100644 (file)
--- a/pear/package-PEAR.xml
+++ b/pear/package-PEAR.xml
@@ -59,7 +59,7 @@ PEAR Installer:
 * Bug #293 [Patch] PEAR_Error not calling static method callbacks for error-handler
 * Bug #324 pear -G gives Fatal Error (PHP-GTK not installed, but error is at engine level)
 * Moved download code into its own class
-* Fully unit tested the installer and downloader, plus PEAR_Common
+* Fully unit tested the installer, packager, downloader, and PEAR_Common
 
     </notes>
     <provides type="class" name="OS_Guess" />
@@ -123,7 +123,7 @@ PEAR Installer:
     <deps>
       <dep type="php" rel="ge" version="4.1"/>
       <dep type="pkg" rel="ge" version="1.1">Archive_Tar</dep>
-      <dep type="pkg" rel="ge" version="2.0">Console_Getopt</dep>
+      <dep type="pkg" rel="ge" version="1.2">Console_Getopt</dep>
       <dep type="pkg" rel="ge" version="1.0.4">XML_RPC</dep>
       <dep type="ext" rel="has" optional="yes">xmlrpc</dep>
       <dep type="ext" rel="has">xml</dep>

diff --git a/pear/scripts/pearcmd.php b/pear/scripts/pearcmd.php
index 09b2e30af9a8cf4aafa68398aa70a015304fcb1d..338ed406c5cae0aaeefedcbbfc8d1bbe19dce88f 100644 (file)
--- a/pear/scripts/pearcmd.php
+++ b/pear/scripts/pearcmd.php
@@ -49,7 +49,7 @@ $all_commands = PEAR_Command::getCommands();
 $argv = Console_Getopt::readPHPArgv();
 $progname = basename($argv[0]);
 array_shift($argv);
-$options = Console_Getopt::getopt($argv, "c:C:d:D:Gh?sSqu:vV");
+$options = Console_Getopt::getopt2($argv, "c:C:d:D:Gh?sSqu:vV");
 if (PEAR::isError($options)) {
     usage($options);
 }
@@ -157,7 +157,7 @@ if ($fetype == 'Gtk') {
     $short_args = $long_args = null;
     PEAR_Command::getGetoptArgs($command, $short_args, $long_args);
     array_shift($options[1]);
-    if (PEAR::isError($tmp = Console_Getopt::getopt($options[1], $short_args, $long_args))) {
+    if (PEAR::isError($tmp = Console_Getopt::getopt2($options[1], $short_args, $long_args))) {
         break;
     }
     list($tmpopt, $params) = $tmp;