4 files changed, 4 insertions, 5 deletions

diff --git a/noncore/tools/calculator/calculator.pro b/noncore/tools/calculator/calculator.pro
index 8f631be..4526fad 100644
--- a/noncore/tools/calculator/calculator.pro
+++ b/noncore/tools/calculator/calculator.pro
@@ -1,11 +1,11 @@
         CONFIG  = qt warn_on release quick-app
         HEADERS         = calculatorimpl.h
         SOURCES         = calculatorimpl.cpp \
                   main.cpp
 INCLUDEPATH += $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
-LIBS            += -lqpe
+LIBS            += -lqpe -lopiecore2
         INTERFACES= calculator.ui
         TARGET  = calculator
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/tools/calculator/config.in b/noncore/tools/calculator/config.in
index b06df9b..e9c2588 100644
--- a/noncore/tools/calculator/config.in
+++ b/noncore/tools/calculator/config.in
@@ -1,4 +1,4 @@
   config CALCULATOR
     boolean "opie-calculator (A multi-function calculator with units conversion)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/tools/calculator/main.cpp b/noncore/tools/calculator/main.cpp
index c4d00b1..145ba38 100644
--- a/noncore/tools/calculator/main.cpp
+++ b/noncore/tools/calculator/main.cpp
@@ -1,26 +1,25 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** 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 "calculatorimpl.h"
 
-#include <qpe/qpeapplication.h>
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
 
 OPIE_EXPORT_APP( OApplicationFactory<CalculatorImpl> )
diff --git a/noncore/tools/calculator/opie-calculator.control b/noncore/tools/calculator/opie-calculator.control
index f5a03ad..bacf52c 100644
--- a/noncore/tools/calculator/opie-calculator.control
+++ b/noncore/tools/calculator/opie-calculator.control
@@ -1,11 +1,11 @@
 Package: opie-calculator
 Files: plugins/application/libcalculator.so* bin/calculator apps/Applications/calculator.desktop etc/unit_conversion.dat pics/calc
 Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2
 Description: Calculator
  A multi-function calculator for the Opie environment.
  Includes units conversion.
 Version: $QPE_VERSION$EXTRAVERSION