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
@@ -47,3 +47,3 @@
 
-#include <opie/ofiledialog.h>
+#include <opie2/ofiledialog.h>
 
@@ -277,3 +277,3 @@ void InstallDlg::slotBtnOptions()
 
-    QString filename = OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map );
+    QString filename = Opie::OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map );
     if( !filename.isEmpty() )
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
@@ -34,4 +34,2 @@
 
-#include <opie/oprocess.h>
-
 #include "opackage.h"
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
@@ -31,3 +31,3 @@
 
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
 
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
@@ -38,3 +38,3 @@
 
-#include <opie/otabwidget.h>
+#include <opie2/otabwidget.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
@@ -4,3 +4,3 @@ Priority: optional
 Section: opie/settings
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2, libopieui2
 Replaces: packagemanager
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
@@ -38,3 +38,3 @@
 
-#include <opie/otabwidget.h>
+#include <opie2/otabwidget.h>
 
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
@@ -35,4 +35,2 @@
 
-#include <opie/oprocess.h>
-
 #include "opackage.h"
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,5 +1,2 @@
 CONFIG       = qt warn_on release quick-app
-//TEMPLATE     = app
-//CONFIG      += qte warn_on debug
-//DESTDIR      = $(OPIEDIR)/bin
 
@@ -34,3 +31,3 @@ INCLUDEPATH += $(OPIEDIR)/include $(IPKGDIR)
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS        += -lqpe -lopie -lipkg
+LIBS        += -lqpe -lopiecore2 -lopieui2 -lipkg