5 files changed, 6 insertions, 6 deletions
diff --git a/noncore/settings/sysinfo/main.cpp b/noncore/settings/sysinfo/main.cpp
index d071f71..3a7b1b1 100644
--- a/noncore/settings/sysinfo/main.cpp
+++ b/noncore/settings/sysinfo/main.cpp
@@ -11,16 +11,16 @@
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "sysinfo.h"
 
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
 
 
 OPIE_EXPORT_APP( OApplicationFactory<SystemInfo> )
diff --git a/noncore/settings/sysinfo/opie-sysinfo.control b/noncore/settings/sysinfo/opie-sysinfo.control
index 9b56b36..6c9f82a 100644
--- a/noncore/settings/sysinfo/opie-sysinfo.control
+++ b/noncore/settings/sysinfo/opie-sysinfo.control
@@ -1,9 +1,9 @@
 Package: opie-sysinfo
 Files: plugins/application/libsysinfo.so* bin/sysinfo apps/Settings/sysinfo.desktop pics/sysinfo
 Priority: optional
 Section: opie/settings
 Maintainer: Dan Williams <drw@handhelds.org>
 Architecture: arm
-Depends: task-opie-minimal, libopie1
+Depends: task-opie-minimal, libopiecore2, libopieui2
 Description: System Information dialog for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/sysinfo/sysinfo.cpp b/noncore/settings/sysinfo/sysinfo.cpp
index 0c5a969..5f7b527 100644
--- a/noncore/settings/sysinfo/sysinfo.cpp
+++ b/noncore/settings/sysinfo/sysinfo.cpp
@@ -21,25 +21,25 @@
 **  Enhancements by: Dan Williams, <williamsdr@acm.org>
 **
 **********************************************************************/
 
 #include "memory.h"
 #include "load.h"
 #include "storage.h"
 #include "processinfo.h"
 #include "modulesinfo.h"
 #include "versioninfo.h"
 #include "sysinfo.h"
 
-#include <opie/otabwidget.h>
+#include <opie2/otabwidget.h>
 
 #include <qpe/config.h>
 #include <qpe/resource.h>
 
 #include <qlayout.h>
 
 SystemInfo::SystemInfo( QWidget *parent, const char *name, WFlags )
     : QWidget( parent, name, WStyle_ContextHelp )
 {
     setIcon( Resource::loadPixmap( "system_icon" ) );
     setCaption( tr("System Info") );
 
diff --git a/noncore/settings/sysinfo/sysinfo.pro b/noncore/settings/sysinfo/sysinfo.pro
index 30da7a8..3ba4266 100644
--- a/noncore/settings/sysinfo/sysinfo.pro
+++ b/noncore/settings/sysinfo/sysinfo.pro
@@ -12,17 +12,17 @@ SOURCES   = main.cpp \
       memory.cpp \
       graph.cpp \
       load.cpp \
       storage.cpp \
       processinfo.cpp \
       modulesinfo.cpp \
       detail.cpp \
       versioninfo.cpp \
       sysinfo.cpp
 
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS            += -lqpe -lopie
+LIBS            += -lqpe -lopiecore2 -lopieui2
 
-TARGET	= sysinfo
+TARGET    = sysinfo
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/sysinfo/versioninfo.cpp b/noncore/settings/sysinfo/versioninfo.cpp
index c44a05a..0ebcebe 100644
--- a/noncore/settings/sysinfo/versioninfo.cpp
+++ b/noncore/settings/sysinfo/versioninfo.cpp
@@ -21,25 +21,25 @@
 #include <qpe/resource.h>
 #include <qpe/version.h>
 
 #include <qfile.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qscrollview.h>
 #include <qtextstream.h>
 #include <qwhatsthis.h>
 
 #include "versioninfo.h"
 
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
 
 using namespace Opie;
 
 VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f )
     : QWidget( parent, name, f )
 {
     setMinimumSize( 200, 150 );
 
     QVBoxLayout *tmpvb = new QVBoxLayout( this );
     QScrollView *sv = new QScrollView( this );
     tmpvb->addWidget( sv, 0, 0 );
     sv->setResizePolicy( QScrollView::AutoOneFit );