Dependency fixes. s/opie-base/task-opie-minimal/; s/libqt2-emb-fonts/qte-fonts/; s/libqt2-emb/libqte2/;

169 files changed, 169 insertions, 169 deletions

diff --git a/core/applets/batteryapplet/opie-batteryapplet.control b/core/applets/batteryapplet/opie-batteryapplet.control
index fa96ece..10009c3 100644
--- a/core/applets/batteryapplet/opie-batteryapplet.control
+++ b/core/applets/batteryapplet/opie-batteryapplet.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Conflicts: opie-batteryapplet-ipaq
diff --git a/core/applets/cardmon/opie-cardmon.control b/core/applets/cardmon/opie-cardmon.control
index a456a1d..59f8bc6 100644
--- a/core/applets/cardmon/opie-cardmon.control
+++ b/core/applets/cardmon/opie-cardmon.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, libopie1
+Depends: task-opie-minimal, libopie1
 Description: CF/PCMCIA Card Monitor applet
diff --git a/core/applets/clipboardapplet/opie-clipboardapplet.control b/core/applets/clipboardapplet/opie-clipboardapplet.control
index d54ddc4..ca90bfa 100644
--- a/core/applets/clipboardapplet/opie-clipboardapplet.control
+++ b/core/applets/clipboardapplet/opie-clipboardapplet.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Clipboard applet
diff --git a/core/applets/clockapplet/opie-clockapplet.control b/core/applets/clockapplet/opie-clockapplet.control
index ed7b50c..fb9a034 100644
--- a/core/applets/clockapplet/opie-clockapplet.control
+++ b/core/applets/clockapplet/opie-clockapplet.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Clock applet
diff --git a/core/applets/irdaapplet/opie-irdaapplet.control b/core/applets/irdaapplet/opie-irdaapplet.control
index 2150384..c655f6d 100644
--- a/core/applets/irdaapplet/opie-irdaapplet.control
+++ b/core/applets/irdaapplet/opie-irdaapplet.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: opie-base, libopieobex1
+Depends: task-opie-minimal, libopieobex1
 Description: Irda Applet
diff --git a/core/applets/restartapplet/opie-restartapplet.control b/core/applets/restartapplet/opie-restartapplet.control
index 81021ed..a046b69 100644
--- a/core/applets/restartapplet/opie-restartapplet.control
+++ b/core/applets/restartapplet/opie-restartapplet.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Restart Applet
diff --git a/core/applets/restartapplet2/opie-restartapplet2.control b/core/applets/restartapplet2/opie-restartapplet2.control
index 7a4ee70..c471a66 100644
--- a/core/applets/restartapplet2/opie-restartapplet2.control
+++ b/core/applets/restartapplet2/opie-restartapplet2.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Restart Applet
diff --git a/core/applets/screenshotapplet/opie-screenshotapplet.control b/core/applets/screenshotapplet/opie-screenshotapplet.control
index e6a581b..12df532 100644
--- a/core/applets/screenshotapplet/opie-screenshotapplet.control
+++ b/core/applets/screenshotapplet/opie-screenshotapplet.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Screenshot Applet
diff --git a/core/applets/vmemo/opie-vmemo.control b/core/applets/vmemo/opie-vmemo.control
index 89bd819..1e7e2eb 100644
--- a/core/applets/vmemo/opie-vmemo.control
+++ b/core/applets/vmemo/opie-vmemo.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-vmemo-settings
+Depends: task-opie-minimal, opie-vmemo-settings
 Description: Voice Memo Recorder Applet
diff --git a/core/applets/volumeapplet/opie-volumeapplet.control b/core/applets/volumeapplet/opie-volumeapplet.control
index 96f3f73..caed211 100644
--- a/core/applets/volumeapplet/opie-volumeapplet.control
+++ b/core/applets/volumeapplet/opie-volumeapplet.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Volume applet
diff --git a/core/apps/embeddedkonsole/opie-embeddedkonsole.control b/core/apps/embeddedkonsole/opie-embeddedkonsole.control
index b150c7d..aefa8f2 100644
--- a/core/apps/embeddedkonsole/opie-embeddedkonsole.control
+++ b/core/apps/embeddedkonsole/opie-embeddedkonsole.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, libopie1, opie-keytabs
+Depends: task-opie-minimal, libopie1, opie-keytabs
 Description: KDE's konsole (shell terminal)
diff --git a/core/apps/helpbrowser/opie-helpbrowser.control b/core/apps/helpbrowser/opie-helpbrowser.control
index c407ce7..ed5b16f 100644
--- a/core/apps/helpbrowser/opie-helpbrowser.control
+++ b/core/apps/helpbrowser/opie-helpbrowser.control
@@ -7,3 +7,3 @@ Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Browse HTML help documents
diff --git a/core/apps/qcop/opie-qcop.control b/core/apps/qcop/opie-qcop.control
index 9781948..bd8dbcc 100644
--- a/core/apps/qcop/opie-qcop.control
+++ b/core/apps/qcop/opie-qcop.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: libqt2-emb
+Depends: libqte2
 Description: Interprocess communication client
diff --git a/core/apps/textedit/opie-textedit.control b/core/apps/textedit/opie-textedit.control
index f59b307..9535a75 100644
--- a/core/apps/textedit/opie-textedit.control
+++ b/core/apps/textedit/opie-textedit.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, libopie1
+Depends: task-opie-minimal, libopie1
 Description: Text Editor
diff --git a/core/launcher/opie-taskbar.control b/core/launcher/opie-taskbar.control
index c0430b7..17767c3 100644
--- a/core/launcher/opie-taskbar.control
+++ b/core/launcher/opie-taskbar.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.3
-Depends: opie-base
+Depends: task-opie-minimal
 Replaces: opie-rotation
diff --git a/core/multimedia/opieplayer/libmad/opie-libmadplugin.control b/core/multimedia/opieplayer/libmad/opie-libmadplugin.control
index a345a23..7bcc241 100644
--- a/core/multimedia/opieplayer/libmad/opie-libmadplugin.control
+++ b/core/multimedia/opieplayer/libmad/opie-libmadplugin.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: MP3 file plugin using libmad
diff --git a/core/multimedia/opieplayer/libmpeg3/opie-libmpeg3plugin.control b/core/multimedia/opieplayer/libmpeg3/opie-libmpeg3plugin.control
index bedafbd..6b5ccff 100644
--- a/core/multimedia/opieplayer/libmpeg3/opie-libmpeg3plugin.control
+++ b/core/multimedia/opieplayer/libmpeg3/opie-libmpeg3plugin.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Mpeg video file plugin using libmad
diff --git a/core/multimedia/opieplayer/modplug/opie-modplugin.control b/core/multimedia/opieplayer/modplug/opie-modplugin.control
index b1a98fc..ae3c3b3 100644
--- a/core/multimedia/opieplayer/modplug/opie-modplugin.control
+++ b/core/multimedia/opieplayer/modplug/opie-modplugin.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: 2.0.2
-Depends: opie-base
+Depends: task-opie-minimal
 Description: MOD/XM/S3M/IT plugin using libmodplug
diff --git a/core/multimedia/opieplayer/opie-mediaplayer.control b/core/multimedia/opieplayer/opie-mediaplayer.control
index 6e989a8..7c1f348 100644
--- a/core/multimedia/opieplayer/opie-mediaplayer.control
+++ b/core/multimedia/opieplayer/opie-mediaplayer.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, libopie1
+Depends: task-opie-minimal, libopie1
 Description: The Opie media player
diff --git a/core/multimedia/opieplayer/vorbis/opie-libtremorplugin.control b/core/multimedia/opieplayer/vorbis/opie-libtremorplugin.control
index d7714bd..60311cc 100644
--- a/core/multimedia/opieplayer/vorbis/opie-libtremorplugin.control
+++ b/core/multimedia/opieplayer/vorbis/opie-libtremorplugin.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Ogg file plugin using tremor
diff --git a/core/multimedia/opieplayer/vorbis/tremor/libtremor.control b/core/multimedia/opieplayer/vorbis/tremor/libtremor.control
index f9ce87b..c8e7ac0 100644
--- a/core/multimedia/opieplayer/vorbis/tremor/libtremor.control
+++ b/core/multimedia/opieplayer/vorbis/tremor/libtremor.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: vorbis (tremor) library
diff --git a/core/multimedia/opieplayer/wavplugin/opie-wavplugin.control b/core/multimedia/opieplayer/wavplugin/opie-wavplugin.control
index 82bc5ae..5f4ca71 100644
--- a/core/multimedia/opieplayer/wavplugin/opie-wavplugin.control
+++ b/core/multimedia/opieplayer/wavplugin/opie-wavplugin.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: WAV file plugin
diff --git a/core/obex/libopieobex0.control b/core/obex/libopieobex0.control
index 3fd0dd2..9f4ccb2 100644
--- a/core/obex/libopieobex0.control
+++ b/core/obex/libopieobex0.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: opie-base ($QPE_VERSION), openobex | libopenobex1
+Depends: task-opie-minimal ($QPE_VERSION), openobex | libopenobex1
 Provides: libopieobex1
diff --git a/core/opie-login/opie-login.control b/core/opie-login/opie-login.control
index aeb517d..ba9bad1 100644
--- a/core/opie-login/opie-login.control
+++ b/core/opie-login/opie-login.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, libopie1
+Depends: task-opie-minimal, libopie1
 Description: Multiuser login for OPIE
diff --git a/core/pim/addressbook/opie-addressbook.control b/core/pim/addressbook/opie-addressbook.control
index 5392892..e881c55 100644
--- a/core/pim/addressbook/opie-addressbook.control
+++ b/core/pim/addressbook/opie-addressbook.control
@@ -7,3 +7,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, libopie1
+Depends: task-opie-minimal, libopie1
 Description: Contacts
diff --git a/core/pim/datebook/opie-datebook.control b/core/pim/datebook/opie-datebook.control
index 54eb1ab..b43786b 100644
--- a/core/pim/datebook/opie-datebook.control
+++ b/core/pim/datebook/opie-datebook.control
@@ -7,3 +7,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, libopie1
+Depends: task-opie-minimal, libopie1
 Description: A datebook/appointment manager
diff --git a/core/pim/today/opie-today.control b/core/pim/today/opie-today.control
index f5c4c81..81659c0 100644
--- a/core/pim/today/opie-today.control
+++ b/core/pim/today/opie-today.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: 0.6.2-$SUB_VERSION
-Depends: opie-base, libopie1
+Depends: task-opie-minimal, libopie1
 License: GPL
diff --git a/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control b/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control
index 6d5e155..939a37a 100644
--- a/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control
+++ b/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: libqt2-emb, opie-today
+Depends: libqte2, opie-today
 Description: Addressbook plugin for today shows Birthdays and Anniversaries
diff --git a/core/pim/today/plugins/datebook/opie-today-datebookplugin.control b/core/pim/today/plugins/datebook/opie-today-datebookplugin.control
index 8f45534..161ab16 100644
--- a/core/pim/today/plugins/datebook/opie-today-datebookplugin.control
+++ b/core/pim/today/plugins/datebook/opie-today-datebookplugin.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: libqt2-emb, opie-today
+Depends: libqte2, opie-today
 Description: Datebook plugin for today
diff --git a/core/pim/today/plugins/mail/opie-today-mailplugin.control b/core/pim/today/plugins/mail/opie-today-mailplugin.control
index d7f9e98..d69a2f4 100644
--- a/core/pim/today/plugins/mail/opie-today-mailplugin.control
+++ b/core/pim/today/plugins/mail/opie-today-mailplugin.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: libqt2-emb, opie-today
+Depends: libqte2, opie-today
 Description: Mail plugin for today
diff --git a/core/pim/today/plugins/todolist/opie-today-todolistplugin.control b/core/pim/today/plugins/todolist/opie-today-todolistplugin.control
index 38af3b9..8d21859 100644
--- a/core/pim/today/plugins/todolist/opie-today-todolistplugin.control
+++ b/core/pim/today/plugins/todolist/opie-today-todolistplugin.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: libqt2-emb, opie-today
+Depends: libqte2, opie-today
 Description: Todolist plugin for today
diff --git a/core/pim/today/task-opie-today.control b/core/pim/today/task-opie-today.control
index 76b6828..2e07fee 100644
--- a/core/pim/today/task-opie-today.control
+++ b/core/pim/today/task-opie-today.control
@@ -5,3 +5,3 @@ Architecture: arm
 Version: 0.5-$SUB_VERSION
-Depends: opie-base, libopie1, opie-today, opie-today-datebookplugin, opie-today-todolistplugin, opie-today-mailplugin
+Depends: task-opie-minimal, libopie1, opie-today, opie-today-datebookplugin, opie-today-todolistplugin, opie-today-mailplugin
 License: GPL
diff --git a/core/pim/todo/opie-todo.control b/core/pim/todo/opie-todo.control
index 3da6b00..6f73925 100644
--- a/core/pim/todo/opie-todo.control
+++ b/core/pim/todo/opie-todo.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, libopie1
+Depends: task-opie-minimal, libopie1
 Description: TODO-list manager
diff --git a/core/settings/button/opie-button-settings.control b/core/settings/button/opie-button-settings.control
index bdbd850..7857d9c 100644
--- a/core/settings/button/opie-button-settings.control
+++ b/core/settings/button/opie-button-settings.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Device-buttons settings dialog
diff --git a/core/settings/citytime/opie-citytime.control b/core/settings/citytime/opie-citytime.control
index 07029c1..564e394 100644
--- a/core/settings/citytime/opie-citytime.control
+++ b/core/settings/citytime/opie-citytime.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, timezones
+Depends: task-opie-minimal, timezones
 Description: Time-zone / world clock settings
diff --git a/core/settings/launcher/opie-launcher-settings.control b/core/settings/launcher/opie-launcher-settings.control
index 43946dd..e930146 100644
--- a/core/settings/launcher/opie-launcher-settings.control
+++ b/core/settings/launcher/opie-launcher-settings.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Launcher settings dialog
diff --git a/core/settings/light-and-power/opie-light-and-power.control b/core/settings/light-and-power/opie-light-and-power.control
index 5b82633..fe73271 100644
--- a/core/settings/light-and-power/opie-light-and-power.control
+++ b/core/settings/light-and-power/opie-light-and-power.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Light and Power settings dialog
diff --git a/core/settings/security/opie-security.control b/core/settings/security/opie-security.control
index 852e12f..db98119 100644
--- a/core/settings/security/opie-security.control
+++ b/core/settings/security/opie-security.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Security settings dialog
diff --git a/freetype/opie-freetype.control b/freetype/opie-freetype.control
index 35175e2..7447acb 100644
--- a/freetype/opie-freetype.control
+++ b/freetype/opie-freetype.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, libfreetype6
+Depends: task-opie-minimal, libfreetype6
 Description: Freetype fontfactory plugin
diff --git a/i18n/opie-i18n-da.control b/i18n/opie-i18n-da.control
index 6d7e4d1..6059aa9 100644
--- a/i18n/opie-i18n-da.control
+++ b/i18n/opie-i18n-da.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-language
+Depends: task-opie-minimal, opie-language
 Description: i18n: Danish
diff --git a/i18n/opie-i18n-de.control b/i18n/opie-i18n-de.control
index dd4f1df..cf651d9 100644
--- a/i18n/opie-i18n-de.control
+++ b/i18n/opie-i18n-de.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-language
+Depends: task-opie-minimal, opie-language
 Description: i18n: Deutsch
diff --git a/i18n/opie-i18n-en.control b/i18n/opie-i18n-en.control
index f5f75e3..52ac3f3 100644
--- a/i18n/opie-i18n-en.control
+++ b/i18n/opie-i18n-en.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-language
+Depends: task-opie-minimal, opie-language
 Description: i18n: English
diff --git a/i18n/opie-i18n-es.control b/i18n/opie-i18n-es.control
index 8fdd351..22ad60d 100644
--- a/i18n/opie-i18n-es.control
+++ b/i18n/opie-i18n-es.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-language
+Depends: task-opie-minimal, opie-language
 Description: i18n: Spanish
diff --git a/i18n/opie-i18n-fr.control b/i18n/opie-i18n-fr.control
index 6942b09..c86e84a 100644
--- a/i18n/opie-i18n-fr.control
+++ b/i18n/opie-i18n-fr.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-language
+Depends: task-opie-minimal, opie-language
 Description: i18n: French
diff --git a/i18n/opie-i18n-hu.control b/i18n/opie-i18n-hu.control
index 43430d7..68a9b56 100644
--- a/i18n/opie-i18n-hu.control
+++ b/i18n/opie-i18n-hu.control
@@ -7,3 +7,3 @@ Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-language
+Depends: task-opie-minimal, opie-language
 Description: i18n: Magyar
diff --git a/i18n/opie-i18n-it.control b/i18n/opie-i18n-it.control
index cdf7c53..905d689 100644
--- a/i18n/opie-i18n-it.control
+++ b/i18n/opie-i18n-it.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-language
+Depends: task-opie-minimal, opie-language
 Description: i18n: Italian
diff --git a/i18n/opie-i18n-nl.control b/i18n/opie-i18n-nl.control
index b6e861d..6d4382a 100644
--- a/i18n/opie-i18n-nl.control
+++ b/i18n/opie-i18n-nl.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-language
+Depends: task-opie-minimal, opie-language
 Description: i18n: Dutch
diff --git a/i18n/opie-i18n-pl.control b/i18n/opie-i18n-pl.control
index ba675ef..f031a1f 100644
--- a/i18n/opie-i18n-pl.control
+++ b/i18n/opie-i18n-pl.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-language
+Depends: task-opie-minimal, opie-language
 Description: i18n: Polish
diff --git a/i18n/opie-i18n-pt.control b/i18n/opie-i18n-pt.control
index a1777d3..e584570 100644
--- a/i18n/opie-i18n-pt.control
+++ b/i18n/opie-i18n-pt.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-language
+Depends: task-opie-minimal, opie-language
 Description: i18n: Portuguese
diff --git a/i18n/opie-i18n-sl.control b/i18n/opie-i18n-sl.control
index 19a629b..49ec541 100644
--- a/i18n/opie-i18n-sl.control
+++ b/i18n/opie-i18n-sl.control
@@ -7,3 +7,3 @@ Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, qpf-cyberbit-120-50-t10, opie-language
+Depends: task-opie-minimal, qpf-cyberbit-120-50-t10, opie-language
 Description: i18n: Slovenian
diff --git a/i18n/opie-i18n-zh-tw.control b/i18n/opie-i18n-zh-tw.control
index b6e07d7..fc7fa02 100644
--- a/i18n/opie-i18n-zh-tw.control
+++ b/i18n/opie-i18n-zh-tw.control
@@ -7,3 +7,3 @@ Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, qpf-cyberbit-120-50-t10, opie-language
+Depends: task-opie-minimal, qpf-cyberbit-120-50-t10, opie-language
 Description: i18n: Chinese (TW)
diff --git a/i18n/unmaintained/opie-i18n-ja.control b/i18n/unmaintained/opie-i18n-ja.control
index 49f6af5..ee44674 100644
--- a/i18n/unmaintained/opie-i18n-ja.control
+++ b/i18n/unmaintained/opie-i18n-ja.control
@@ -7,3 +7,3 @@ Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, qpf-cyberbit-120-50-t10
+Depends: task-opie-minimal, qpf-cyberbit-120-50-t10
 Description: i18n: Japanese
diff --git a/i18n/unmaintained/opie-i18n-ko.control b/i18n/unmaintained/opie-i18n-ko.control
index 6abf825..257593b 100644
--- a/i18n/unmaintained/opie-i18n-ko.control
+++ b/i18n/unmaintained/opie-i18n-ko.control
@@ -7,3 +7,3 @@ Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, qpf-cyberbit-120-50-t10
+Depends: task-opie-minimal, qpf-cyberbit-120-50-t10
 Description: i18n: Korean
diff --git a/i18n/unmaintained/opie-i18n-no.control b/i18n/unmaintained/opie-i18n-no.control
index a98ca7c..410531a 100644
--- a/i18n/unmaintained/opie-i18n-no.control
+++ b/i18n/unmaintained/opie-i18n-no.control
@@ -7,3 +7,3 @@ Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: i18n: Norsk
diff --git a/i18n/unmaintained/opie-i18n-zh-cn.control b/i18n/unmaintained/opie-i18n-zh-cn.control
index 14ff933..74c7cbe 100644
--- a/i18n/unmaintained/opie-i18n-zh-cn.control
+++ b/i18n/unmaintained/opie-i18n-zh-cn.control
@@ -7,3 +7,3 @@ Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, qpf-cyberbit-120-50-t10
+Depends: task-opie-minimal, qpf-cyberbit-120-50-t10
 Description: i18n: Chinese
diff --git a/inputmethods/dvorak/opie-dvorak.control b/inputmethods/dvorak/opie-dvorak.control
index 3437794..8ecc1e7 100644
--- a/inputmethods/dvorak/opie-dvorak.control
+++ b/inputmethods/dvorak/opie-dvorak.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-4
-Depends: opie-base, opie-pickboard
+Depends: task-opie-minimal, opie-pickboard
 Description: Dvorak keyboard input method
diff --git a/inputmethods/handwriting/opie-handwriting-classicset.control b/inputmethods/handwriting/opie-handwriting-classicset.control
index 302100c..59f52cd 100644
--- a/inputmethods/handwriting/opie-handwriting-classicset.control
+++ b/inputmethods/handwriting/opie-handwriting-classicset.control
@@ -6,3 +6,3 @@ Architecture: none
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Classic character set for the Handwriting inputmethod.
diff --git a/inputmethods/handwriting/opie-handwriting-graffitiset.control b/inputmethods/handwriting/opie-handwriting-graffitiset.control
index ab6e11a..2424db8 100644
--- a/inputmethods/handwriting/opie-handwriting-graffitiset.control
+++ b/inputmethods/handwriting/opie-handwriting-graffitiset.control
@@ -6,3 +6,3 @@ Architecture: none
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Graffiti character set for the Handwriting inputmethod.
diff --git a/inputmethods/handwriting/opie-handwriting.control b/inputmethods/handwriting/opie-handwriting.control
index 0075037..ecf4249 100644
--- a/inputmethods/handwriting/opie-handwriting.control
+++ b/inputmethods/handwriting/opie-handwriting.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-handwriting-classicset | opie-handwriting-graffitiset
+Depends: task-opie-minimal, opie-handwriting-classicset | opie-handwriting-graffitiset
 Description: Handwriting input method
diff --git a/inputmethods/jumpx/opie-jumpx.control b/inputmethods/jumpx/opie-jumpx.control
index c73e5ed..75e715f 100644
--- a/inputmethods/jumpx/opie-jumpx.control
+++ b/inputmethods/jumpx/opie-jumpx.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 License: GPL
diff --git a/inputmethods/keyboard/opie-keyboard.control b/inputmethods/keyboard/opie-keyboard.control
index dfca61c..685a005 100644
--- a/inputmethods/keyboard/opie-keyboard.control
+++ b/inputmethods/keyboard/opie-keyboard.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-pickboard
+Depends: task-opie-minimal, opie-pickboard
 Description: Keyboard input method
diff --git a/inputmethods/kjumpx/opie-kjumpx.control b/inputmethods/kjumpx/opie-kjumpx.control
index 13fc402..da3d8ad 100644
--- a/inputmethods/kjumpx/opie-kjumpx.control
+++ b/inputmethods/kjumpx/opie-kjumpx.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 License: GPL
diff --git a/inputmethods/multikey/opie-multikey.control b/inputmethods/multikey/opie-multikey.control
index 6c9b6fb..21a1e26 100644
--- a/inputmethods/multikey/opie-multikey.control
+++ b/inputmethods/multikey/opie-multikey.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-pickboard
+Depends: task-opie-minimal, opie-pickboard
 Description: Multiple language keyboard
diff --git a/inputmethods/pickboard/opie-pickboard.control b/inputmethods/pickboard/opie-pickboard.control
index 460206b..8c88fe6 100644
--- a/inputmethods/pickboard/opie-pickboard.control
+++ b/inputmethods/pickboard/opie-pickboard.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Pickboard input method
diff --git a/inputmethods/unikeyboard/opie-unikeyboard.control b/inputmethods/unikeyboard/opie-unikeyboard.control
index 8676261..92e6362 100644
--- a/inputmethods/unikeyboard/opie-unikeyboard.control
+++ b/inputmethods/unikeyboard/opie-unikeyboard.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Unicode input method
diff --git a/library/libqpe1.control b/library/libqpe1.control
index 9f9f58b..455d8e0 100644
--- a/library/libqpe1.control
+++ b/library/libqpe1.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: libqte2 (>=2.3.4), qte-fonts (>=$QTE_VERSION)
+Depends: libqte2 (>=2.3.4-beta4), qte-fonts (>=$QTE_VERSION)
 Description: libqpe, base qtopia/opie library.
diff --git a/noncore/applets/networkapplet/opie-networkapplet.control b/noncore/applets/networkapplet/opie-networkapplet.control
index 4aa022f..1032064 100644
--- a/noncore/applets/networkapplet/opie-networkapplet.control
+++ b/noncore/applets/networkapplet/opie-networkapplet.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, libopie2 (1.8.1), opie-networksettings
+Depends: task-opie-minimal, libopie2 (1.8.1), opie-networksettings
 Description: Network Applet
diff --git a/noncore/applets/notesapplet/opie-notesapplet.control b/noncore/applets/notesapplet/opie-notesapplet.control
index a91b12b..ff05e89 100644
--- a/noncore/applets/notesapplet/opie-notesapplet.control
+++ b/noncore/applets/notesapplet/opie-notesapplet.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Screenshot Applet
diff --git a/noncore/applets/wirelessapplet/opie-wirelessapplet.control b/noncore/applets/wirelessapplet/opie-wirelessapplet.control
index 2abe4a5..f5daeb9 100644
--- a/noncore/applets/wirelessapplet/opie-wirelessapplet.control
+++ b/noncore/applets/wirelessapplet/opie-wirelessapplet.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Wireless Applet
diff --git a/noncore/apps/advancedfm/opie-advancedfm.control b/noncore/apps/advancedfm/opie-advancedfm.control
index 6cf2048..8c2eba4 100644
--- a/noncore/apps/advancedfm/opie-advancedfm.control
+++ b/noncore/apps/advancedfm/opie-advancedfm.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Advanced File Manager
diff --git a/noncore/apps/checkbook/opie-checkbook.control b/noncore/apps/checkbook/opie-checkbook.control
index 9aa3349..fe140b9 100644
--- a/noncore/apps/checkbook/opie-checkbook.control
+++ b/noncore/apps/checkbook/opie-checkbook.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, libopie1
+Depends: task-opie-minimal, libopie1
 Description: Checkbook keeping program.
diff --git a/noncore/apps/confedit/opie-confedit.control b/noncore/apps/confedit/opie-confedit.control
index a772e81..0bf1f05 100644
--- a/noncore/apps/confedit/opie-confedit.control
+++ b/noncore/apps/confedit/opie-confedit.control
@@ -7,3 +7,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: An enditor for the ~/Settings/*.conf files
diff --git a/noncore/apps/odict/opie-odict.control b/noncore/apps/odict/opie-odict.control
index 1206ec7..a6fa675 100644
--- a/noncore/apps/odict/opie-odict.control
+++ b/noncore/apps/odict/opie-odict.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Dictionarylookupprogram
diff --git a/noncore/apps/opie-reader/opie-reader.control b/noncore/apps/opie-reader/opie-reader.control
index aebd2f1..1ede9e9 100644
--- a/noncore/apps/opie-reader/opie-reader.control
+++ b/noncore/apps/opie-reader/opie-reader.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 License: GPL
diff --git a/noncore/apps/opie-sheet/opie-sheet.control b/noncore/apps/opie-sheet/opie-sheet.control
index 3e9e062..f0daa33 100644
--- a/noncore/apps/opie-sheet/opie-sheet.control
+++ b/noncore/apps/opie-sheet/opie-sheet.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: 1.0.2
-Depends: opie-base
+Depends: task-opie-minimal
 License: Public Domain
diff --git a/noncore/apps/opie-write/opie-write.control b/noncore/apps/opie-write/opie-write.control
index 86b0d52..c9177a6 100644
--- a/noncore/apps/opie-write/opie-write.control
+++ b/noncore/apps/opie-write/opie-write.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Rich Text Editor 
diff --git a/noncore/apps/oxygen/opie-oxygen.control b/noncore/apps/oxygen/opie-oxygen.control
index 427463b..db82d88 100644
--- a/noncore/apps/oxygen/opie-oxygen.control
+++ b/noncore/apps/oxygen/opie-oxygen.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Periodic System of the Elements 
diff --git a/noncore/apps/tableviewer/opie-tableviewer.control b/noncore/apps/tableviewer/opie-tableviewer.control
index c02472e..0e1db16 100644
--- a/noncore/apps/tableviewer/opie-tableviewer.control
+++ b/noncore/apps/tableviewer/opie-tableviewer.control
@@ -7,3 +7,3 @@ Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: XML database browsers
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-commondev.control b/noncore/apps/tinykate/opie-tinykate-syntax-commondev.control
index 2adb693..3f6feab 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax-commondev.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax-commondev.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-tinykate
+Depends: task-opie-minimal, opie-tinykate
 Description: Syntax Highlighting Patterns for for common programming languages for TinyKate
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-documentation.control b/noncore/apps/tinykate/opie-tinykate-syntax-documentation.control
index a1a2889..6acf895 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax-documentation.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax-documentation.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-tinykate
+Depends: task-opie-minimal, opie-tinykate
 Description: Syntax Highlighting Patterns for document oriented languages for TinyKate
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-misc.control b/noncore/apps/tinykate/opie-tinykate-syntax-misc.control
index 5c2bc63..e6802d0 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax-misc.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax-misc.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-tinykate
+Depends: task-opie-minimal, opie-tinykate
 Description: Syntax Highlighting Patterns for  misc languages for TinyKate
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-miscdev.control b/noncore/apps/tinykate/opie-tinykate-syntax-miscdev.control
index d8e40a1..e91d7df 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax-miscdev.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax-miscdev.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-tinykate
+Depends: task-opie-minimal, opie-tinykate
 Description: Syntax Highlighting Patterns for for uncommon programming languages for TinyKate
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-unix.control b/noncore/apps/tinykate/opie-tinykate-syntax-unix.control
index 3359526..923c0d5 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax-unix.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax-unix.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-tinykate
+Depends: task-opie-minimal, opie-tinykate
 Description: Syntax Highlighting Patterns for UNIX/Linux specific files for TinyKate
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-web.control b/noncore/apps/tinykate/opie-tinykate-syntax-web.control
index 787425c..bf931c5 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax-web.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax-web.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-tinykate
+Depends: task-opie-minimal, opie-tinykate
 Description: Syntax Highlighting Patterns for for common programming languages for TinyKate
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax.control b/noncore/apps/tinykate/opie-tinykate-syntax.control
index 62a0a5d..c5257ea 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax.control
@@ -5,3 +5,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-tinykate, opie-tinykate-syntax-commondev, opie-tinykate-syntax-documentation, opie-tinykate-syntax-misc, opie-tinykate-syntax-miscdev, opie-tinykate-syntax-unix, opie-tinykate-syntax-web
+Depends: task-opie-minimal, opie-tinykate, opie-tinykate-syntax-commondev, opie-tinykate-syntax-documentation, opie-tinykate-syntax-misc, opie-tinykate-syntax-miscdev, opie-tinykate-syntax-unix, opie-tinykate-syntax-web
 Description: Syntax Highlighting Patterns virtual package, which installs all available syntax patterns.
diff --git a/noncore/apps/tinykate/opie-tinykate.control b/noncore/apps/tinykate/opie-tinykate.control
index 918d365..504289a 100644
--- a/noncore/apps/tinykate/opie-tinykate.control
+++ b/noncore/apps/tinykate/opie-tinykate.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Kate for opie
diff --git a/noncore/comm/keypebble/opie-keypebble.control b/noncore/comm/keypebble/opie-keypebble.control
index 106a75b..2701a1c 100644
--- a/noncore/comm/keypebble/opie-keypebble.control
+++ b/noncore/comm/keypebble/opie-keypebble.control
@@ -7,3 +7,3 @@ Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: VNC Viewer
diff --git a/noncore/comm/mobilemsg/opie-mobilemsg.control b/noncore/comm/mobilemsg/opie-mobilemsg.control
index 737134c..e1c79a5 100644
--- a/noncore/comm/mobilemsg/opie-mobilemsg.control
+++ b/noncore/comm/mobilemsg/opie-mobilemsg.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Mobile Messaging
diff --git a/noncore/decorations/flat/opie-deco-flat.control b/noncore/decorations/flat/opie-deco-flat.control
index 8923de5..a678366 100644
--- a/noncore/decorations/flat/opie-deco-flat.control
+++ b/noncore/decorations/flat/opie-deco-flat.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: opie-base
+Depends: task-opie-minimal
 Description: OPIE window decoration style
diff --git a/noncore/decorations/liquid/opie-deco-liquid.control b/noncore/decorations/liquid/opie-deco-liquid.control
index be23b1c..74dfcc5 100644
--- a/noncore/decorations/liquid/opie-deco-liquid.control
+++ b/noncore/decorations/liquid/opie-deco-liquid.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: opie-base
+Depends: task-opie-minimal
 Description: OPIE window decoration style
diff --git a/noncore/decorations/polished/opie-deco-polished.control b/noncore/decorations/polished/opie-deco-polished.control
index 3640f58..13d04ad 100644
--- a/noncore/decorations/polished/opie-deco-polished.control
+++ b/noncore/decorations/polished/opie-deco-polished.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: opie-base
+Depends: task-opie-minimal
 Description: OPIE window decoration style
diff --git a/noncore/games/backgammon/backgammon.control b/noncore/games/backgammon/backgammon.control
index 528a8c3..32a53f0 100644
--- a/noncore/games/backgammon/backgammon.control
+++ b/noncore/games/backgammon/backgammon.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Backgammon Game
diff --git a/noncore/games/bounce/opie-bounce.control b/noncore/games/bounce/opie-bounce.control
index c4b80bb..2ff4472 100644
--- a/noncore/games/bounce/opie-bounce.control
+++ b/noncore/games/bounce/opie-bounce.control
@@ -2,3 +2,3 @@ Files: bin/bounce apps/Games/bounce.desktop pics/bounce/*.png
 Version: 0.6-$SUB_VERSION 
-Depends: opie-base
+Depends: task-opie-minimal
 Priority: optional
diff --git a/noncore/games/buzzword/opie-buzzword.control b/noncore/games/buzzword/opie-buzzword.control
index bbc0136..fd33336 100644
--- a/noncore/games/buzzword/opie-buzzword.control
+++ b/noncore/games/buzzword/opie-buzzword.control
@@ -2,3 +2,3 @@ Files: bin/buzzword apps/Games/buzzword.desktop pics/buzzword/buzzword.png share
 Version: 1.1-$SUB_VERSION 
-Depends: opie-base
+Depends: task-opie-minimal
 Priority: optional
diff --git a/noncore/games/fifteen/opie-fifteen.control b/noncore/games/fifteen/opie-fifteen.control
index a88890d..c540cd5 100644
--- a/noncore/games/fifteen/opie-fifteen.control
+++ b/noncore/games/fifteen/opie-fifteen.control
@@ -7,3 +7,3 @@ Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Fifteen pieces game
diff --git a/noncore/games/go/opie-go.control b/noncore/games/go/opie-go.control
index 41f2ecd..cdd4779 100644
--- a/noncore/games/go/opie-go.control
+++ b/noncore/games/go/opie-go.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: The game of Go
diff --git a/noncore/games/kbill/opie-kbill.control b/noncore/games/kbill/opie-kbill.control
index 0542c9a..0fe6f4e 100644
--- a/noncore/games/kbill/opie-kbill.control
+++ b/noncore/games/kbill/opie-kbill.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: 0.8-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 License: GPL
diff --git a/noncore/games/kcheckers/opie-kcheckers.control b/noncore/games/kcheckers/opie-kcheckers.control
index e8455e9..3821e07 100644
--- a/noncore/games/kcheckers/opie-kcheckers.control
+++ b/noncore/games/kcheckers/opie-kcheckers.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: 0.3-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: The game of Checkers
diff --git a/noncore/games/kpacman/opie-kpacman.control b/noncore/games/kpacman/opie-kpacman.control
index fb2f889..417d0e9 100644
--- a/noncore/games/kpacman/opie-kpacman.control
+++ b/noncore/games/kpacman/opie-kpacman.control
@@ -2,3 +2,3 @@ Files: bin/kpacman apps/Games/kpacman.desktop pics/kpacman/kpacman.png share/kpa
 Version: 0.3.1-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Priority: optional
diff --git a/noncore/games/mindbreaker/opie-mindbreaker.control b/noncore/games/mindbreaker/opie-mindbreaker.control
index c1ac324..445a2c2 100644
--- a/noncore/games/mindbreaker/opie-mindbreaker.control
+++ b/noncore/games/mindbreaker/opie-mindbreaker.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Game: crack the coloured code
diff --git a/noncore/games/minesweep/opie-minesweep.control b/noncore/games/minesweep/opie-minesweep.control
index c19c574..9f22469 100644
--- a/noncore/games/minesweep/opie-minesweep.control
+++ b/noncore/games/minesweep/opie-minesweep.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Game: find the mines
diff --git a/noncore/games/parashoot/opie-parashoot.control b/noncore/games/parashoot/opie-parashoot.control
index 89b28e1..997ad99 100644
--- a/noncore/games/parashoot/opie-parashoot.control
+++ b/noncore/games/parashoot/opie-parashoot.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Game: shoot the parachutists
diff --git a/noncore/games/qasteroids/opie-qasteroids.control b/noncore/games/qasteroids/opie-qasteroids.control
index ea42de5..6269e78 100644
--- a/noncore/games/qasteroids/opie-qasteroids.control
+++ b/noncore/games/qasteroids/opie-qasteroids.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Game: shoot the asteroids
diff --git a/noncore/games/sfcave/opie-sfcave.control b/noncore/games/sfcave/opie-sfcave.control
index 1f5e8f7..d4a891c 100644
--- a/noncore/games/sfcave/opie-sfcave.control
+++ b/noncore/games/sfcave/opie-sfcave.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: SFCave for the Zaurus. Fly the dot though the cave avoiding the walls.
diff --git a/noncore/games/snake/opie-snake.control b/noncore/games/snake/opie-snake.control
index a28f236..17e535a 100644
--- a/noncore/games/snake/opie-snake.control
+++ b/noncore/games/snake/opie-snake.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Game: control the snake
diff --git a/noncore/games/solitaire/opie-solitaire.control b/noncore/games/solitaire/opie-solitaire.control
index 35abb6d..d530c53 100644
--- a/noncore/games/solitaire/opie-solitaire.control
+++ b/noncore/games/solitaire/opie-solitaire.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Game: solitaire card games
diff --git a/noncore/games/tetrix/opie-tetrix.control b/noncore/games/tetrix/opie-tetrix.control
index b5dca53..2432b96 100644
--- a/noncore/games/tetrix/opie-tetrix.control
+++ b/noncore/games/tetrix/opie-tetrix.control
@@ -7,3 +7,3 @@ Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Game: control falling blocks
diff --git a/noncore/games/tictac/opie-tictac.control b/noncore/games/tictac/opie-tictac.control
index 0c7e3f7..e8af22b 100644
--- a/noncore/games/tictac/opie-tictac.control
+++ b/noncore/games/tictac/opie-tictac.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Tic Tac Toe game.
diff --git a/noncore/games/wordgame/opie-wordgame.control b/noncore/games/wordgame/opie-wordgame.control
index 4121317..2c8a3f9 100644
--- a/noncore/games/wordgame/opie-wordgame.control
+++ b/noncore/games/wordgame/opie-wordgame.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Crossword game
diff --git a/noncore/graphics/drawpad/opie-drawpad.control b/noncore/graphics/drawpad/opie-drawpad.control
index cdee34a..7b7b346 100644
--- a/noncore/graphics/drawpad/opie-drawpad.control
+++ b/noncore/graphics/drawpad/opie-drawpad.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION-0.9.5
-Depends: opie-base, libopie1
+Depends: task-opie-minimal, libopie1
 Description: A note taking program with basic draw tools
diff --git a/noncore/multimedia/camera/opie-camera.control b/noncore/multimedia/camera/opie-camera.control
index a3ecb55..49f0bc9 100644
--- a/noncore/multimedia/camera/opie-camera.control
+++ b/noncore/multimedia/camera/opie-camera.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, libopie2 (1.8.1)
+Depends: task-opie-minimal, libopie2 (1.8.1)
 Description: A Camera Application
diff --git a/noncore/multimedia/opieplayer2/opie-mediaplayer2-skin-default-landscape.control b/noncore/multimedia/opieplayer2/opie-mediaplayer2-skin-default-landscape.control
index 105ca2a..6185fb0 100644
--- a/noncore/multimedia/opieplayer2/opie-mediaplayer2-skin-default-landscape.control
+++ b/noncore/multimedia/opieplayer2/opie-mediaplayer2-skin-default-landscape.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-mediaplayer2
+Depends: task-opie-minimal, opie-mediaplayer2
 Description: Landscape skin for opie mediaplayer 2
diff --git a/noncore/multimedia/opieplayer2/opie-mediaplayer2.control b/noncore/multimedia/opieplayer2/opie-mediaplayer2.control
index 27f613e..29c798d 100644
--- a/noncore/multimedia/opieplayer2/opie-mediaplayer2.control
+++ b/noncore/multimedia/opieplayer2/opie-mediaplayer2.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, libopie1, zlib1g, libxine1 | opie-mediaplayer-codecs
+Depends: task-opie-minimal, libopie1, zlib1g, libxine1 | opie-mediaplayer-codecs
 Description: The Opie media player
diff --git a/noncore/multimedia/showimg/opie-showimg.control b/noncore/multimedia/showimg/opie-showimg.control
index 1ce655a..669d92e 100644
--- a/noncore/multimedia/showimg/opie-showimg.control
+++ b/noncore/multimedia/showimg/opie-showimg.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Image Viewer
diff --git a/noncore/net/ftplib/ftplib.control b/noncore/net/ftplib/ftplib.control
index 00064b5..be3aa95 100644
--- a/noncore/net/ftplib/ftplib.control
+++ b/noncore/net/ftplib/ftplib.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Libftp
diff --git a/noncore/net/opieftp/opie-ftp.control b/noncore/net/opieftp/opie-ftp.control
index 4b16dbf..61eafcc 100644
--- a/noncore/net/opieftp/opie-ftp.control
+++ b/noncore/net/opieftp/opie-ftp.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, ftplib
+Depends: task-opie-minimal, ftplib
 Replaces: opieftp
diff --git a/noncore/net/opieirc/opie-irc.control b/noncore/net/opieirc/opie-irc.control
index b804442..07ceab8 100644
--- a/noncore/net/opieirc/opie-irc.control
+++ b/noncore/net/opieirc/opie-irc.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, libopie1
+Depends: task-opie-minimal, libopie1
 Description: The Opie IRC client lets you chat on your favorite IRC server using your handheld computer
diff --git a/noncore/net/opietooth/applet/opie-bluetoothapplet.control b/noncore/net/opietooth/applet/opie-bluetoothapplet.control
index 0cb3b3c..aff84a9 100644
--- a/noncore/net/opietooth/applet/opie-bluetoothapplet.control
+++ b/noncore/net/opietooth/applet/opie-bluetoothapplet.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: opie-base, libopietooth1
+Depends: task-opie-minimal, libopietooth1
 Description: Bluetooth Applet
diff --git a/noncore/net/opietooth/blue-pin/opie-bluepin.control b/noncore/net/opietooth/blue-pin/opie-bluepin.control
index 70169b9..6674171 100644
--- a/noncore/net/opietooth/blue-pin/opie-bluepin.control
+++ b/noncore/net/opietooth/blue-pin/opie-bluepin.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: 0.3.4-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 License: GPL
diff --git a/noncore/net/opietooth/lib/libopietooth1.control b/noncore/net/opietooth/lib/libopietooth1.control
index 22af489..a04dda8 100644
--- a/noncore/net/opietooth/lib/libopietooth1.control
+++ b/noncore/net/opietooth/lib/libopietooth1.control
@@ -7,3 +7,3 @@ Version: $QPE_VERSION-$SUB_VERSION
 Replaces: libopietooth
-Depends: libqt2-emb (>=2.3.4), libopie, task-bluez, bluez-rfcomm
+Depends: libqte2 (>=2.3.4), libopie, task-bluez, bluez-rfcomm
 Description: Opie bluetooth library
diff --git a/noncore/net/opietooth/manager/opie-bluetoothmanager.control b/noncore/net/opietooth/manager/opie-bluetoothmanager.control
index e1a8766..f48a1e5 100644
--- a/noncore/net/opietooth/manager/opie-bluetoothmanager.control
+++ b/noncore/net/opietooth/manager/opie-bluetoothmanager.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: 0.5.4-$SUB_VERSION
-Depends: opie-base, libopietooth1, opie-bluepin
+Depends: task-opie-minimal, libopietooth1, opie-bluepin
 License: GPL
diff --git a/noncore/net/ubrowser/opie-ubrowser.control b/noncore/net/ubrowser/opie-ubrowser.control
index 17c716e..bf66ca5 100644
--- a/noncore/net/ubrowser/opie-ubrowser.control
+++ b/noncore/net/ubrowser/opie-ubrowser.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: 0.1-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 License: GPL
diff --git a/noncore/net/wellenreiter/opie-wellenreiter.control b/noncore/net/wellenreiter/opie-wellenreiter.control
index ca50207..c635ace 100644
--- a/noncore/net/wellenreiter/opie-wellenreiter.control
+++ b/noncore/net/wellenreiter/opie-wellenreiter.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, libpcap0, libopie2 (1.8.1)
+Depends: task-opie-minimal, libpcap0, libopie2 (1.8.1)
 Description: A WaveLAN Network Monitor
diff --git a/noncore/settings/appearance2/opie-appearance.control b/noncore/settings/appearance2/opie-appearance.control
index d5e1d64..cc3082d 100644
--- a/noncore/settings/appearance2/opie-appearance.control
+++ b/noncore/settings/appearance2/opie-appearance.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, libopie1
+Depends: task-opie-minimal, libopie1
 Description: Appearance settings dialog
diff --git a/noncore/settings/aqpkg/opie-aqpkg.control b/noncore/settings/aqpkg/opie-aqpkg.control
index 5d0d9cb..accc497 100644
--- a/noncore/settings/aqpkg/opie-aqpkg.control
+++ b/noncore/settings/aqpkg/opie-aqpkg.control
@@ -4,3 +4,3 @@ Section: Settings
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Replaces: aqpkg
diff --git a/noncore/settings/backup/opie-backup.control b/noncore/settings/backup/opie-backup.control
index cf0a4ac..385ccbc 100644
--- a/noncore/settings/backup/opie-backup.control
+++ b/noncore/settings/backup/opie-backup.control
@@ -3,3 +3,3 @@ Priority: optional
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Architecture: arm
diff --git a/noncore/settings/language/opie-language.control b/noncore/settings/language/opie-language.control
index 9aefa92..06542a9 100644
--- a/noncore/settings/language/opie-language.control
+++ b/noncore/settings/language/opie-language.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Language settings dialog
diff --git a/noncore/settings/mediummount/opie-mediummount.control b/noncore/settings/mediummount/opie-mediummount.control
index 8c83ef9..8a7cc46 100644
--- a/noncore/settings/mediummount/opie-mediummount.control
+++ b/noncore/settings/mediummount/opie-mediummount.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: opie-base
+Depends: task-opie-minimal
 License: GPL
diff --git a/noncore/settings/netsystemtime/opie-systemtime.control b/noncore/settings/netsystemtime/opie-systemtime.control
index d5cba07..4c93586 100644
--- a/noncore/settings/netsystemtime/opie-systemtime.control
+++ b/noncore/settings/netsystemtime/opie-systemtime.control
@@ -8,3 +8,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, ntpdate, libopie1
+Depends: task-opie-minimal, ntpdate, libopie1
 Description: ntp (Network  Time  Protocol) gui
diff --git a/noncore/settings/networksettings/opie-networksettings.control b/noncore/settings/networksettings/opie-networksettings.control
index 6931b26..5bb1dce 100644
--- a/noncore/settings/networksettings/opie-networksettings.control
+++ b/noncore/settings/networksettings/opie-networksettings.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Network settings.
diff --git a/noncore/settings/sound/opie-vmemo-settings.control b/noncore/settings/sound/opie-vmemo-settings.control
index 9cc0b16..8ceccde 100644
--- a/noncore/settings/sound/opie-vmemo-settings.control
+++ b/noncore/settings/sound/opie-vmemo-settings.control
@@ -8,3 +8,3 @@ Version: $QPE_VERSION-$SUB_VERSION
 Conflicts: opie-sound
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Sound settings dialog
diff --git a/noncore/settings/sshkeys/opie-sshkeys.control b/noncore/settings/sshkeys/opie-sshkeys.control
index 9dd2936..952d632 100644
--- a/noncore/settings/sshkeys/opie-sshkeys.control
+++ b/noncore/settings/sshkeys/opie-sshkeys.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, ssh, opie-sh-ssh-askpass
+Depends: task-opie-minimal, ssh, opie-sh-ssh-askpass
 Description: Utility for managing ssh-agent keys.
diff --git a/noncore/settings/sysinfo/opie-sysinfo.control b/noncore/settings/sysinfo/opie-sysinfo.control
index d893a3b..e0b9257 100644
--- a/noncore/settings/sysinfo/opie-sysinfo.control
+++ b/noncore/settings/sysinfo/opie-sysinfo.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, libopie1
+Depends: task-opie-minimal, libopie1
 Description: System Information dialog
diff --git a/noncore/settings/tabmanager/opie-tabmanager.control b/noncore/settings/tabmanager/opie-tabmanager.control
index d9e7ef8..af12539 100644
--- a/noncore/settings/tabmanager/opie-tabmanager.control
+++ b/noncore/settings/tabmanager/opie-tabmanager.control
@@ -4,3 +4,3 @@ Section: opie/settings
 Version: $QPE_VERSION-$SUB_VERSION-1.2
-Depends: opie-base
+Depends: task-opie-minimal
 Architecture: arm
diff --git a/noncore/settings/usermanager/opie-usermanager.control b/noncore/settings/usermanager/opie-usermanager.control
index e1c7762..93ed9c3 100644
--- a/noncore/settings/usermanager/opie-usermanager.control
+++ b/noncore/settings/usermanager/opie-usermanager.control
@@ -4,3 +4,3 @@ Section: opie/settings
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Architecture: arm
diff --git a/noncore/styles/flat/opie-style-flat.control b/noncore/styles/flat/opie-style-flat.control
index 9523058..ef13d9c 100644
--- a/noncore/styles/flat/opie-style-flat.control
+++ b/noncore/styles/flat/opie-style-flat.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: OPIE widget style
diff --git a/noncore/styles/fresh/opie-style-fresh.control b/noncore/styles/fresh/opie-style-fresh.control
index c55e99e..c6f9bde 100644
--- a/noncore/styles/fresh/opie-style-fresh.control
+++ b/noncore/styles/fresh/opie-style-fresh.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: OPIE widget style
diff --git a/noncore/styles/liquid/opie-liquid.control b/noncore/styles/liquid/opie-liquid.control
index 161adba..89885d2 100644
--- a/noncore/styles/liquid/opie-liquid.control
+++ b/noncore/styles/liquid/opie-liquid.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Liquid style by Mosfet.
diff --git a/noncore/styles/metal/opie-metal.control b/noncore/styles/metal/opie-metal.control
index 78b0457..640e5ac 100644
--- a/noncore/styles/metal/opie-metal.control
+++ b/noncore/styles/metal/opie-metal.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Metal style by Trolltech.
diff --git a/noncore/styles/theme/opie-theme.control b/noncore/styles/theme/opie-theme.control
index a2cd453..0f8f234 100644
--- a/noncore/styles/theme/opie-theme.control
+++ b/noncore/styles/theme/opie-theme.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Themed style.
diff --git a/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control b/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control
index 3f37a26..8ecd98b 100644
--- a/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control
+++ b/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: libqt2-emb, opie-today
+Depends: libqte2, opie-today
 Description: stockticker plugin for today
diff --git a/noncore/todayplugins/weather/opie-today-weatherplugin.control b/noncore/todayplugins/weather/opie-today-weatherplugin.control
index e87872d..6e6a828 100644
--- a/noncore/todayplugins/weather/opie-today-weatherplugin.control
+++ b/noncore/todayplugins/weather/opie-today-weatherplugin.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: libqt2-emb, opie-today
+Depends: libqte2, opie-today
 Description: Current weather plugin for today.
diff --git a/noncore/tools/calculator/opie-calculator.control b/noncore/tools/calculator/opie-calculator.control
index f8c640f..8add9a9 100644
--- a/noncore/tools/calculator/opie-calculator.control
+++ b/noncore/tools/calculator/opie-calculator.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Calculator
diff --git a/noncore/tools/clock/opie-clock.control b/noncore/tools/clock/opie-clock.control
index f06aa5c..e534fa8 100644
--- a/noncore/tools/clock/opie-clock.control
+++ b/noncore/tools/clock/opie-clock.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Clock and stop-watch
diff --git a/noncore/tools/euroconv/opie-euroconv.control b/noncore/tools/euroconv/opie-euroconv.control
index 643637e..4ceb89a 100644
--- a/noncore/tools/euroconv/opie-euroconv.control
+++ b/noncore/tools/euroconv/opie-euroconv.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Euroconv
diff --git a/noncore/tools/formatter/opie-formatter.control b/noncore/tools/formatter/opie-formatter.control
index 8b24598..7ee146c 100644
--- a/noncore/tools/formatter/opie-formatter.control
+++ b/noncore/tools/formatter/opie-formatter.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Formatter
diff --git a/noncore/tools/opie-sh/opie-sh.control b/noncore/tools/opie-sh/opie-sh.control
index a86a1e1..cb0b948 100644
--- a/noncore/tools/opie-sh/opie-sh.control
+++ b/noncore/tools/opie-sh/opie-sh.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: 0.5-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 License: GPL
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-diskfree.control b/noncore/tools/opie-sh/scripts/opie-sh-diskfree.control
index 7af1920..9c3480f 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-diskfree.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-diskfree.control
@@ -3,3 +3,3 @@ Installed-Size:  0
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-sh
+Depends: task-opie-minimal, opie-sh
 Priority: optional
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-fsmounter.control b/noncore/tools/opie-sh/scripts/opie-sh-fsmounter.control
index 5a8038c..dd5a07a 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-fsmounter.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-fsmounter.control
@@ -3,3 +3,3 @@ Installed-Size:  0
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-sh
+Depends: task-opie-minimal, opie-sh
 Priority: optional
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-hostlist.control b/noncore/tools/opie-sh/scripts/opie-sh-hostlist.control
index d4b7c6c..67a4784 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-hostlist.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-hostlist.control
@@ -3,3 +3,3 @@ Installed-Size:  0
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-sh
+Depends: task-opie-minimal, opie-sh
 Priority: optional
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-killproc.control b/noncore/tools/opie-sh/scripts/opie-sh-killproc.control
index 25c908f..836d7c7 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-killproc.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-killproc.control
@@ -3,3 +3,3 @@ Installed-Size:  0
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-sh
+Depends: task-opie-minimal, opie-sh
 Priority: optional
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-launcher-refresh.control b/noncore/tools/opie-sh/scripts/opie-sh-launcher-refresh.control
index 36c826b..51d1618 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-launcher-refresh.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-launcher-refresh.control
@@ -3,3 +3,3 @@ Installed-Size:  0
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-sh
+Depends: task-opie-minimal, opie-sh
 Priority: optional
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-logviewer.control b/noncore/tools/opie-sh/scripts/opie-sh-logviewer.control
index e9e3431..ea14c5a 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-logviewer.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-logviewer.control
@@ -3,3 +3,3 @@ Installed-Size:  0
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-sh
+Depends: task-opie-minimal, opie-sh
 Priority: optional
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-rsynchelper.control b/noncore/tools/opie-sh/scripts/opie-sh-rsynchelper.control
index ba72e31..dd5c394 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-rsynchelper.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-rsynchelper.control
@@ -3,3 +3,3 @@ Installed-Size:  0
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-sh
+Depends: task-opie-minimal, opie-sh
 Priority: optional
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-servicemanager.control b/noncore/tools/opie-sh/scripts/opie-sh-servicemanager.control
index e43cea2..952cbb2 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-servicemanager.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-servicemanager.control
@@ -3,3 +3,3 @@ Installed-Size:  0
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-sh
+Depends: task-opie-minimal, opie-sh
 Priority: optional
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-ssh-askpass.control b/noncore/tools/opie-sh/scripts/opie-sh-ssh-askpass.control
index d67e79d..755d46c 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-ssh-askpass.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-ssh-askpass.control
@@ -3,3 +3,3 @@ Installed-Size:  0
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base (1.5.0+), opie-sh (0.5-20020919+)
+Depends: task-opie-minimal (1.5.0+), opie-sh (0.5-20020919+)
 Priority: optional
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-stowawayctrl.control b/noncore/tools/opie-sh/scripts/opie-sh-stowawayctrl.control
index 17dcf11..95fb17a 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-stowawayctrl.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-stowawayctrl.control
@@ -3,3 +3,3 @@ Installed-Size:  0
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-sh
+Depends: task-opie-minimal, opie-sh
 Priority: optional
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-usbnetctrl.control b/noncore/tools/opie-sh/scripts/opie-sh-usbnetctrl.control
index 3d75603..eb7cd6f 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-usbnetctrl.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-usbnetctrl.control
@@ -3,3 +3,3 @@ Installed-Size:  0
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-sh
+Depends: task-opie-minimal, opie-sh
 Priority: optional
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-wavelanchooser.control b/noncore/tools/opie-sh/scripts/opie-sh-wavelanchooser.control
index 0253d98..0597253 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-wavelanchooser.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-wavelanchooser.control
@@ -3,3 +3,3 @@ Installed-Size:  0
 Version: 0.1-20020527-1
-Depends: opie-base (1.5.0+), opie-sh
+Depends: task-opie-minimal (1.5.0+), opie-sh
 Priority: optional
diff --git a/noncore/tools/opie-sh/scripts/task-opie-sh-apps.control b/noncore/tools/opie-sh/scripts/task-opie-sh-apps.control
index 4482f8e..5a4a471 100644
--- a/noncore/tools/opie-sh/scripts/task-opie-sh-apps.control
+++ b/noncore/tools/opie-sh/scripts/task-opie-sh-apps.control
@@ -3,3 +3,3 @@ Installed-Size:  0
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base (1.5.0+), opie-sh, opie-sh-fsmounter, opie-sh-killproc, opie-sh-rsynchelper, opie-sh-servicemanager, opie-sh-usbnetctrl, opie-sh-hostlist, opie-sh-wavelanchooser, opie-sh-diskfree, opie-sh-launcher-refresh, opie-sh-logviewer, opie-sh-stowawayctrl
+Depends: task-opie-minimal (1.5.0+), opie-sh, opie-sh-fsmounter, opie-sh-killproc, opie-sh-rsynchelper, opie-sh-servicemanager, opie-sh-usbnetctrl, opie-sh-hostlist, opie-sh-wavelanchooser, opie-sh-diskfree, opie-sh-launcher-refresh, opie-sh-logviewer, opie-sh-stowawayctrl
 Priority: optional
diff --git a/noncore/tools/remote/opie-remote.control b/noncore/tools/remote/opie-remote.control
index 1c70012..07614a5 100644
--- a/noncore/tools/remote/opie-remote.control
+++ b/noncore/tools/remote/opie-remote.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: 0.3-$SUB_VERSION
-Depends: opie-base, lirc
+Depends: task-opie-minimal, lirc
 License: GPL
diff --git a/noncore/unsupported/filebrowser/opie-filebrowser.control b/noncore/unsupported/filebrowser/opie-filebrowser.control
index 487c0fa..37a98c1 100644
--- a/noncore/unsupported/filebrowser/opie-filebrowser.control
+++ b/noncore/unsupported/filebrowser/opie-filebrowser.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Browse the file system
diff --git a/noncore/unsupported/gsmtool/opie-gsmtool.control b/noncore/unsupported/gsmtool/opie-gsmtool.control
index 4e04ed1..e2008a9 100644
--- a/noncore/unsupported/gsmtool/opie-gsmtool.control
+++ b/noncore/unsupported/gsmtool/opie-gsmtool.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: 1.0.0-2
-Depends: opie-base, gsmlib
+Depends: task-opie-minimal, gsmlib
 License: Public Domain
diff --git a/noncore/unsupported/mail2/bend/opie-mailapplet.control b/noncore/unsupported/mail2/bend/opie-mailapplet.control
index ec6a6f3..974ea80 100644
--- a/noncore/unsupported/mail2/bend/opie-mailapplet.control
+++ b/noncore/unsupported/mail2/bend/opie-mailapplet.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: 0.0.9-$SUB_VERSION
-Depends: opie-base libopie1 opie-mail2
+Depends: task-opie-minimal libopie1 opie-mail2
 Description: A Biff-Like mailchecker
diff --git a/noncore/unsupported/mail2/opie-mail2.control b/noncore/unsupported/mail2/opie-mail2.control
index 2a6529f..db3a082 100644
--- a/noncore/unsupported/mail2/opie-mail2.control
+++ b/noncore/unsupported/mail2/opie-mail2.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: 0.0.9-$SUB_VERSION
-Depends: opie-base, libopie1
+Depends: task-opie-minimal, libopie1
 Description: An IMAP mail client
diff --git a/noncore/unsupported/oipkg/opie-oipkg.control b/noncore/unsupported/oipkg/opie-oipkg.control
index 95a7ba7..7616754 100644
--- a/noncore/unsupported/oipkg/opie-oipkg.control
+++ b/noncore/unsupported/oipkg/opie-oipkg.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, ipkg (>0.99.20), ar
+Depends: task-opie-minimal, ipkg (>0.99.20), ar
 Description: Opie Projects advanced gui ipkg installer
diff --git a/noncore/unsupported/qpdf/opie-qpdf.control b/noncore/unsupported/qpdf/opie-qpdf.control
index 0e6ce07..83a677b 100644
--- a/noncore/unsupported/qpdf/opie-qpdf.control
+++ b/noncore/unsupported/qpdf/opie-qpdf.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, gzip
+Depends: task-opie-minimal, gzip
 Description: A PDF viewer for OPIE.
diff --git a/qt/control/qte-fonts.control b/qt/control/qte-fonts.control
index 0f7164a..2786a2d 100644
--- a/qt/control/qte-fonts.control
+++ b/qt/control/qte-fonts.control
@@ -5,3 +5,3 @@ Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
-Depends: libqt2-emb
+Depends: libqte2
 Provides: libqt2-emb-fonts
diff --git a/quickexec/opie-quickexec.control b/quickexec/opie-quickexec.control
index 92b534b..13f185d 100644
--- a/quickexec/opie-quickexec.control
+++ b/quickexec/opie-quickexec.control
@@ -7,3 +7,3 @@ Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Calculator