4 files changed, 4 insertions, 5 deletions

diff --git a/noncore/tools/formatter/config.in b/noncore/tools/formatter/config.in
index 0748213..5758180 100644
--- a/noncore/tools/formatter/config.in
+++ b/noncore/tools/formatter/config.in
@@ -2,3 +2,3 @@
     boolean "opie-formatter (filesystem formatting and mount app)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/tools/formatter/formatter.pro b/noncore/tools/formatter/formatter.pro
index 6450954..daedad9 100644
--- a/noncore/tools/formatter/formatter.pro
+++ b/noncore/tools/formatter/formatter.pro
@@ -5,5 +5,5 @@ TARGET    = formatter
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS            += -lqpe
+LIBS            += -lqpe -lopiecore2
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/tools/formatter/main.cpp b/noncore/tools/formatter/main.cpp
index 6228e55..bdd4a2c 100644
--- a/noncore/tools/formatter/main.cpp
+++ b/noncore/tools/formatter/main.cpp
@@ -11,9 +11,8 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
-#include <qpe/qpeapplication.h>
 
 #include "formatter.h"
 
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
 
 OPIE_EXPORT_APP( OApplicationFactory<FormatterApp> )
diff --git a/noncore/tools/formatter/opie-formatter.control b/noncore/tools/formatter/opie-formatter.control
index 11fe57a..19ba7c8 100644
--- a/noncore/tools/formatter/opie-formatter.control
+++ b/noncore/tools/formatter/opie-formatter.control
@@ -5,5 +5,5 @@ Section: opie/settings
 Maintainer: L.J. Potter <lpotter@trolltech.com>
 Architecture: arm
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2
 Description: The filesystem formatting and mountpoint app for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION