fixed: remove only from std dest

3 files changed, 4 insertions, 3 deletions

diff --git a/noncore/unsupported/oipkg/TODO b/noncore/unsupported/oipkg/TODO
index 9d9a650..1aa9e6b 100644
--- a/noncore/unsupported/oipkg/TODO
+++ b/noncore/unsupported/oipkg/TODO
@@ -1,13 +1,14 @@
 * Settings Class
 * tr() ;)
 * Dialog to display ipkg output live
 * parse "to install" and "to remove" from status
 * install local file dialog
 * qcop
 * error handling
 * manage links
 * dependency checking
 * create dest if it does not exist
 * allow reinstalling
 * different types of filters and searches
-	i.e. name, desc, files etc
\ No newline at end of file
+	i.e. name, desc, files etc
+* get packages from doclnk
\ No newline at end of file
diff --git a/noncore/unsupported/oipkg/opie-oipkg.control b/noncore/unsupported/oipkg/opie-oipkg.control
index 2d2b63c..1cff44e 100644
--- a/noncore/unsupported/oipkg/opie-oipkg.control
+++ b/noncore/unsupported/oipkg/opie-oipkg.control
@@ -1,9 +1,9 @@
-Files: bin/oipkg apps/Settings/oipkg.desktop pics/oipkg/
+Files: bin/oipkg apps/Settings/oipkg.desktop pics/oipkg/*
 Priority: optional
 Section: opie/settings
 Maintainer: Patrick S. Vogt <tille@almana.ch>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION), ipkg (>0.9)
 Description: Opie Projects advanced gui ipkg installer
  A GUI front-end to ipkg for the Opie environment.
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index 1798c80..2559a51 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -289,49 +289,49 @@ void PmIpkg::startDialog()
   installDialog->showMaximized();
   if ( installDialog->exec() ) doIt();
  	installDialog->close();
   out(tr("<b>All done.</b>"));
 }
 
 void PmIpkg::doIt()
 {
 	show( true );
  	remove();
   install();
 }
 
 
 void PmIpkg::remove()
 {
  	if ( to_remove.count() == 0 ) return;
 
 	out("<b>"+tr("Removing")+"<br>"+tr("please wait")+"</b><br><hr>");
 
 	QStringList *fileList;
   for (Package *it=to_remove.first(); it != 0; it=to_remove.next() )
   {
 			if ( it->link() )fileList = getList( it->name(), it->dest() );     	
-      if ( runIpkg("remove " + it->name()) == 0)
+      if ( runIpkg("remove " + it->name(), it->dest() ) == 0)
       {
         runwindow->progress->setProgress( 1 + runwindow->progress->progress() );
        	linkOpp = removeLink;
 	    	if ( it->link() )
       	{
 					out( "<br>removing links<br>" );
   				out( "for package "+it->name()+" in "+it->dest()+"<br>" );
       		processFileList( fileList, it->dest() );
         }
      		it->processed();
        	
         out("<br><hr>");
   		}else{
       	out("<b>"+tr("Error while removing")+"</b><hr>"+it->name());
       }
 	  if ( it->link() )delete fileList;
     }
     out("<br>");
 }
 
 
 void PmIpkg::install()
 {
  	if ( to_install.count() == 0 ) return;