1 files changed, 18 insertions, 3 deletions

diff --git a/noncore/unsupported/oipkg/packagelist.cpp b/noncore/unsupported/oipkg/packagelist.cpp
index be20c71..2fc4c41 100644
--- a/noncore/unsupported/oipkg/packagelist.cpp
+++ b/noncore/unsupported/oipkg/packagelist.cpp
@@ -4,16 +4,19 @@
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qtextstream.h>
 
 #include "debug.h"
 
+static QDict<Package>  *packageListAll;
+
 PackageList::PackageList()
   : packageIter( packageList )
 {
   empty=true;
+  if (!packageListAll) packageListAll = new QDict<Package>();
   sections << "All";
   subSections.insert("All", new QStringList() );
   QStringList *ss = subSections["All"];
   *ss << "All";
   aktSection = "All";
   aktSubSection = "All";
@@ -31,27 +34,39 @@ PackageList::~PackageList()
 }
 
 /** Inserts a package into the list */
 void PackageList::insertPackage( Package* pack )
 {
         if (!pack) return;
-  Package* p = packageList.find( pack->name() );
+  Package* p = packageListAll->find( pack->name() );
   if ( p )
     {
-      if ( p->version() == pack->version() )
+      if ( (p->version() == pack->version())
+                && (p->dest() == pack->dest()) )
       {
               p->copyValues( pack );
               delete pack;
               pack = p;
       } else {
-               p->setName( pack->name()+"["+p->version()+"]" );
+              QDict<Package> *packver = p->getOtherVersions();
+        //       p->setName( pack->name()+"["+p->version()+"]" );
+                                if (!packver)
+                {
+                                        packver = new QDict<Package>;    
+                               packver->insert( pack->name(), p );
+                  p->setOtherVersions( packver );
+        }
                pack->setName( pack->name()+"["+pack->version()+"]" );
+               pack->setOtherVersions( packver );
+               packver->insert( pack->name(), pack );
+                                packageListAll->insert( pack->name(), pack );
                                 packageList.insert( pack->name(), pack );
               origPackageList.insert( pack->name(), pack );
       }
     }else{
+      packageListAll->insert( pack->name(), pack );
       packageList.insert( pack->name(), pack );
       origPackageList.insert( pack->name(), pack );
     };
   empty=false;
   updateSections( pack );
 }