8 files changed, 17 insertions, 18 deletions
diff --git a/noncore/todayplugins/weather/config.in b/noncore/todayplugins/weather/config.in
index 7202983..ae35a59 100644
--- a/noncore/todayplugins/weather/config.in
+++ b/noncore/todayplugins/weather/config.in
@@ -3,2 +3,2 @@
     default "y"
-    depends (LIBQPE || LIBQPE-X11) && LIBOPIE
+    depends (LIBQPE || LIBQPE-X11) && LIBOPIE2CORE && LIBOPIE2PIM
diff --git a/noncore/todayplugins/weather/opie-today-weatherplugin.control b/noncore/todayplugins/weather/opie-today-weatherplugin.control
index 80b7d2b..7dbd315 100644
--- a/noncore/todayplugins/weather/opie-today-weatherplugin.control
+++ b/noncore/todayplugins/weather/opie-today-weatherplugin.control
@@ -6,3 +6,3 @@ Maintainer: Dan Williams <drw@handhelds.org>
 Architecture: arm
-Depends: libqte2, opie-today
+Depends: libqte2, libopiecore2, libopiepim2, opie-today
 Description: Weather plugin for Today
diff --git a/noncore/todayplugins/weather/weather.pro b/noncore/todayplugins/weather/weather.pro
index 5ad14e1..d1f8edd 100644
--- a/noncore/todayplugins/weather/weather.pro
+++ b/noncore/todayplugins/weather/weather.pro
@@ -19,3 +19,3 @@ DEPENDPATH      += $(OPIEDIR)/include \
 
-LIBS+= -lqpe -lopie
+LIBS+= -lqpe -lopiecore2 -lopiepim2
 
diff --git a/noncore/todayplugins/weather/weatherconfig.cpp b/noncore/todayplugins/weather/weatherconfig.cpp
index 99ee2a0..4663549 100644
--- a/noncore/todayplugins/weather/weatherconfig.cpp
+++ b/noncore/todayplugins/weather/weatherconfig.cpp
@@ -28,3 +28,7 @@
 
-#include <stdlib.h>
+#include "weatherconfig.h"
+
+#include <qpe/config.h>
+#include <qpe/qpeapplication.h>
+#include <qpe/resource.h>
 
@@ -41,8 +45,3 @@
 
-#include <qpe/config.h>
-#include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
-#include <opie/todayconfigwidget.h>
-
-#include "weatherconfig.h"
+#include <stdlib.h>
 
diff --git a/noncore/todayplugins/weather/weatherconfig.h b/noncore/todayplugins/weather/weatherconfig.h
index d9ffec2..1780c7f 100644
--- a/noncore/todayplugins/weather/weatherconfig.h
+++ b/noncore/todayplugins/weather/weatherconfig.h
@@ -34,3 +34,3 @@
 
-#include <opie/todayconfigwidget.h>
+#include <opie2/todayconfigwidget.h>
 
diff --git a/noncore/todayplugins/weather/weatherplugin.h b/noncore/todayplugins/weather/weatherplugin.h
index 480d220..73e7104 100644
--- a/noncore/todayplugins/weather/weatherplugin.h
+++ b/noncore/todayplugins/weather/weatherplugin.h
@@ -31,2 +31,5 @@
 
+#include <opie2/todayplugininterface.h>
+#include <opie2/todayconfigwidget.h>
+
 #include <qstring.h>
@@ -34,5 +37,2 @@
 
-#include <opie/todayplugininterface.h>
-#include <opie/todayconfigwidget.h>
-
 class WeatherPlugin : public TodayPluginObject
diff --git a/noncore/todayplugins/weather/weatherpluginimpl.h b/noncore/todayplugins/weather/weatherpluginimpl.h
index eaaae1d..d1a7400 100644
--- a/noncore/todayplugins/weather/weatherpluginimpl.h
+++ b/noncore/todayplugins/weather/weatherpluginimpl.h
@@ -31,3 +31,3 @@
 
-#include <opie/todayplugininterface.h>
+#include <opie2/todayplugininterface.h>
 
diff --git a/noncore/todayplugins/weather/weatherpluginwidget.cpp b/noncore/todayplugins/weather/weatherpluginwidget.cpp
index 15d1c6e..ad99a43 100644
--- a/noncore/todayplugins/weather/weatherpluginwidget.cpp
+++ b/noncore/todayplugins/weather/weatherpluginwidget.cpp
@@ -35,3 +35,3 @@
 
-#include <opie/oprocess.h>
+#include <opie2/oprocess.h>
 
@@ -87,3 +87,3 @@ void WeatherPluginWidget::retreiveData()
 	frequency = config.readNumEntry( "Frequency", 5 );
-	
+
 	startTimer( frequency * 60000 );
@@ -116,3 +116,3 @@ void WeatherPluginWidget::displayWeather()
 	QFile file( localFile );
-	
+
 	if ( file.size() > 0 && file.open( IO_ReadOnly ) )