Fixed control file so ipkg will build and commented out an unused include (but did convert to libopie2)

2 files changed, 20 insertions, 20 deletions

diff --git a/noncore/apps/opie-bartender/bartender.cpp b/noncore/apps/opie-bartender/bartender.cpp
index cd0a364..740478f 100644
--- a/noncore/apps/opie-bartender/bartender.cpp
+++ b/noncore/apps/opie-bartender/bartender.cpp
@@ -21,3 +21,3 @@
 #include <qmenubar.h>
-#include <opie/colorpopupmenu.h>
+//#include <opie2/colorpopupmenu.h>
 #include <qpe/qpeapplication.h>
@@ -78,3 +78,3 @@ Bartender::Bartender( QWidget* parent,  const char* name, WFlags fl )
     fileMenu->insertItem(tr("Find by Alcohol"));
-    
+
     QPopupMenu *editMenu;
@@ -83,3 +83,3 @@ Bartender::Bartender( QWidget* parent,  const char* name, WFlags fl )
     editMenu->insertItem(tr("edit"));
-    
+
     connect( fileMenu, SIGNAL( activated(int) ), this, SLOT( fileMenuActivated(int) ));
@@ -107,6 +107,6 @@ Bartender::Bartender( QWidget* parent,  const char* name, WFlags fl )
     connect( t, SIGNAL( clicked() ), this, SLOT( doBac() ) );
-    
+
     DrinkView = new QListView( this, "DrinkView" );
     DrinkView->addColumn( tr( "Name of Drink" ) );
-//    DrinkView->setRootIsDecorated( TRUE ); 
+//    DrinkView->setRootIsDecorated( TRUE );
     DrinkView->header()->hide();
@@ -188,6 +188,6 @@ void Bartender::fileNew() {
         dbFile.close();
-        
+
         initDrinkDb();
     }
-    delete newDrinks;   
+    delete newDrinks;
 }
@@ -212,3 +212,3 @@ void Bartender::showDrink( QListViewItem *item) {
     QTextStream t( &dbFile);
-    
+
     QString s, s2;
@@ -277,3 +277,3 @@ void Bartender::doSearchByDrink() {
     QString searchForDrinkName, lastDrinkName, tempName;
-    
+
     InputDialog *fileDlg;
@@ -286,3 +286,3 @@ void Bartender::doSearchByDrink() {
         QTextStream t( &dbFile);
-    
+
         QString s, s2;
@@ -291,3 +291,3 @@ void Bartender::doSearchByDrink() {
             if(s.find("#",0,TRUE) != -1) {
-                lastDrinkName=s.right(s.length()-2);    
+                lastDrinkName=s.right(s.length()-2);
 //                qDebug("last drink name "+lastDrinkName);
@@ -315,3 +315,3 @@ void Bartender::showSearchResult(QStringList &searchList) {
     searchList.sort();
-        
+
     searchDlg = new Search_Results(this, "Search Results", TRUE);
@@ -377,3 +377,3 @@ void Bartender::doEdit() {
         lseek( fd, foundAt, SEEK_SET);
-        
+
 //        dbFile.at( foundAt);
@@ -386,5 +386,5 @@ void Bartender::doEdit() {
         clearList();
-        
+
         dbFile.flush();
-        
+
         initDrinkDb();
@@ -426,3 +426,3 @@ void Bartender::fileMenuActivated( int item) {
           break;
-          
+
     }
@@ -437,5 +437,5 @@ void Bartender::editMenuActivated(int item) {
       case -8:
-          doEdit() ;          
+          doEdit() ;
           break;
-          
+
     }
diff --git a/noncore/apps/opie-bartender/opie-bartender.control b/noncore/apps/opie-bartender/opie-bartender.control
index acd3304..a8bf860 100644
--- a/noncore/apps/opie-bartender/opie-bartender.control
+++ b/noncore/apps/opie-bartender/opie-bartender.control
@@ -7,4 +7,4 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: qpe-base ($QPE_VERSION)
+Depends: task-opie-minimal
 Description: Bartender drink receipe database lookup, and
-blood alcohol estimator.
+ blood alcohol estimator.