--- ../../cvs_ro/pear-core/PEAR/Command/Remote.php	2006-09-24 05:08:57.000000000 +0200
+++ PEAR/PEAR/Command/Remote.php	2007-03-25 19:15:54.000000000 +0200
@@ -335,11 +335,11 @@
             $this->config->set('default_channel', $savechannel);
             return $this->raiseError('The package list could not be fetched from the remote server. Please try again. (Debug info: "' . $available->getMessage() . '")');
         }
         $data = array(
-            'caption' => 'All packages:',
+            'caption' => 'Channel ' . $channel . ' All packages:',
             'border' => true,
-            'headline' => array('Package', 'Latest', 'Local'),
+            'headline' => array('Channel', 'Package', 'Latest', 'Local', 'Description', 'Dependencies'),
             );
         $local_pkgs = $reg->listPackages($channel);
 
         foreach ($available as $name => $info) {
@@ -372,12 +372,25 @@
 
             if (isset($info['stable']) && !$info['stable']) {
                 $info['stable'] = null;
             }
+            if ($info['stable'] === $info['unstable']) {
+                $state = $info['state'];
+            } else {
+                $state = 'stable';
+            }
+            $latest = $info['stable'].' ('.$state.')';
+            $local = '';
+            if (isset($installed['version'])) {
+                $inst_state = $reg->packageInfo($name, 'release_state', $channel);
+                $local = $installed['version'].' ('.$inst_state.')';
+            }
+
             $data['data'][$info['category']][] = array(
+                $channel,
                 $reg->channelAlias($channel) . '/' . $name,
-                isset($info['stable']) ? $info['stable'] : null,
-                isset($installed['version']) ? $installed['version'] : null,
+                $latest,
+                $local,
                 isset($desc) ? $desc : null,
                 isset($info['deps']) ? $info['deps'] : null,
                 );
         }