8 files changed, 7 insertions, 14 deletions

diff --git a/noncore/settings/packagemanager/installdlg.cpp b/noncore/settings/packagemanager/installdlg.cpp
index 0c2ea78..aedd972 100644
--- a/noncore/settings/packagemanager/installdlg.cpp
+++ b/noncore/settings/packagemanager/installdlg.cpp
@@ -45,7 +45,7 @@
 #include <qpe/resource.h>
 #include <qpe/storage.h>
 
-#include <opie/ofiledialog.h>
+#include <opie2/ofiledialog.h>
 
 #include "opackagemanager.h"
 
@@ -275,7 +275,7 @@ void InstallDlg::slotBtnOptions()
     text << "*";
     map.insert( tr( "All" ), text );
 
-    QString filename = OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map );
+    QString filename = Opie::OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map );
     if( !filename.isEmpty() )
     {
         QString currentFileName = QFileInfo( filename ).fileName();
diff --git a/noncore/settings/packagemanager/installdlg.h b/noncore/settings/packagemanager/installdlg.h
index 7efe721..4da9cf6 100644
--- a/noncore/settings/packagemanager/installdlg.h
+++ b/noncore/settings/packagemanager/installdlg.h
@@ -32,8 +32,6 @@
 
 #include <qwidget.h>
 
-#include <opie/oprocess.h>
-
 #include "opackage.h"
 
 class QComboBox;
diff --git a/noncore/settings/packagemanager/main.cpp b/noncore/settings/packagemanager/main.cpp
index b731695..18ed644 100644
--- a/noncore/settings/packagemanager/main.cpp
+++ b/noncore/settings/packagemanager/main.cpp
@@ -29,6 +29,6 @@
 
 #include "mainwindow.h"
 
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
 
 OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.h b/noncore/settings/packagemanager/oipkgconfigdlg.h
index ef8c596..88e020a 100644
--- a/noncore/settings/packagemanager/oipkgconfigdlg.h
+++ b/noncore/settings/packagemanager/oipkgconfigdlg.h
@@ -36,7 +36,7 @@
 #include <qdialog.h>
 #include <qlayout.h>
 
-#include <opie/otabwidget.h>
+#include <opie2/otabwidget.h>
 
 #include "oipkg.h"
 
diff --git a/noncore/settings/packagemanager/opie-packagemanager.control b/noncore/settings/packagemanager/opie-packagemanager.control
index cad2cdd..3794748 100644
--- a/noncore/settings/packagemanager/opie-packagemanager.control
+++ b/noncore/settings/packagemanager/opie-packagemanager.control
@@ -2,7 +2,7 @@ Package: opie-packagemanager
 Files: plugins/application/libpackagemanager.so* bin/packagemanager pics/packagemanager apps/Settings/packagemanager.desktop
 Priority: optional
 Section: opie/settings
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2, libopieui2
 Replaces: packagemanager
 Architecture: arm
 Maintainer: Dan Williams (drw@handhelds.org)
diff --git a/noncore/settings/packagemanager/packageinfodlg.cpp b/noncore/settings/packagemanager/packageinfodlg.cpp
index 7daf336..7abd17e 100644
--- a/noncore/settings/packagemanager/packageinfodlg.cpp
+++ b/noncore/settings/packagemanager/packageinfodlg.cpp
@@ -36,7 +36,7 @@
 
 #include <qpe/resource.h>
 
-#include <opie/otabwidget.h>
+#include <opie2/otabwidget.h>
 
 PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QString &package )
     : QWidget( 0x0 )
diff --git a/noncore/settings/packagemanager/packageinfodlg.h b/noncore/settings/packagemanager/packageinfodlg.h
index 13a15e2..7ed9f0a 100644
--- a/noncore/settings/packagemanager/packageinfodlg.h
+++ b/noncore/settings/packagemanager/packageinfodlg.h
@@ -33,8 +33,6 @@
 #include <qmultilineedit.h>
 #include <qwidget.h>
 
-#include <opie/oprocess.h>
-
 #include "opackage.h"
 
 class QPushButton;
diff --git a/noncore/settings/packagemanager/packagemanager.pro b/noncore/settings/packagemanager/packagemanager.pro
index 9a64322..e05db76 100644
--- a/noncore/settings/packagemanager/packagemanager.pro
+++ b/noncore/settings/packagemanager/packagemanager.pro
@@ -1,7 +1,4 @@
 CONFIG       = qt warn_on release quick-app
-//TEMPLATE     = app
-//CONFIG      += qte warn_on debug
-//DESTDIR      = $(OPIEDIR)/bin
 
 SOURCES      = opackage.cpp        \
                oconfitem.cpp       \
@@ -32,7 +29,7 @@ DEFINES     += HAVE_MKDTEMP
 TARGET       = packagemanager
 INCLUDEPATH += $(OPIEDIR)/include $(IPKGDIR)
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS        += -lqpe -lopie -lipkg
+LIBS        += -lqpe -lopiecore2 -lopieui2 -lipkg
 
 include ( $(OPIEDIR)/include.pro )