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
@@ -1,10 +1,10 @@
 Files: plugins/applets/libbatteryapplet.so*
 Priority: optional
 Section: opie/taskbar
 Maintainer: Opie team <opie@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Conflicts: opie-batteryapplet-ipaq
 Description: Battery Monitor applet
  Battery Monitor applet for the Opie environment taskbar.
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
@@ -1,9 +1,9 @@
 Files: plugins/applets/libcardmonapplet.so* pics/cardmon/*.png sounds/cardmon/*.wav
 Priority: optional
 Section: opie/taskbar
 Maintainer: Maximilian Reiß <max.reiss@gmx.de>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, libopie1
+Depends: task-opie-minimal, libopie1
 Description: CF/PCMCIA Card Monitor applet
  SD/MMC/CF/PCMCIA Card Monitor applet for the Opie environment taskbar.
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
@@ -1,9 +1,9 @@
 Files: plugins/applets/libclipboardapplet.so*
 Priority: optional
 Section: opie/taskbar
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Clipboard applet
  Clipboard applet for the Opie environment taskbar.
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
@@ -1,9 +1,9 @@
 Files: plugins/applets/libclockapplet.so*
 Priority: optional
 Section: opie/taskbar
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Clock applet
  Clock applet for the Opie environment taskbar.
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
@@ -1,9 +1,9 @@
 Files: plugins/applets/libirdaapplet.so* pics/irdaapplet/* sounds/irdaapplet/*.wav
 Priority: optional
 Section: opie/system
 Maintainer: David Woodhouse <dwmw2@infradead.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: opie-base, libopieobex1
+Depends: task-opie-minimal, libopieobex1
 Description: Irda Applet
  An IrDA taskbar applet for the Opie environment
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
@@ -1,9 +1,9 @@
 Files: plugins/applets/librestartapplet.so* 
 Priority: optional
 Section: opie/system
 Maintainer: L. J. Potter <ljp@llornkcor.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Restart Applet
  A simple taskbar applet to restart the  Opie environment
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
@@ -1,9 +1,9 @@
 Files: plugins/applets/librestartapplet.so* 
 Priority: optional
 Section: opie/system
 Maintainer: L. J. Potter <ljp@llornkcor.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Restart Applet
  A simple opie menu applet to restart the  Opie environment
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
@@ -1,9 +1,9 @@
 Files: plugins/applets/libscreenshotapplet.so* 
 Priority: optional
 Section: opie/system
 Maintainer: L. J. Potter <ljp@llornkcor.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Screenshot Applet
  A screenshot taskbar applet for the Opie environment
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
@@ -1,9 +1,9 @@
 Files: plugins/applets/libvmemoapplet.so*
 Priority: optional
 Section: opie/system
 Maintainer: L.J. Potter <ljp@llornkcor.com>
 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
  The voice memo recorder for the Opie environment
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
@@ -1,9 +1,9 @@
 Files: plugins/applets/libvolumeapplet.so*
 Priority: optional
 Section: opie/taskbar
 Maintainer: L.J. Potter <ljp@llornkcor.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Volume applet
  Volume applet for the Opie environment taskbar.
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
@@ -1,9 +1,9 @@
 Files: bin/embeddedkonsole apps/Applications/embeddedkonsole.desktop pics/konsole
 Priority: optional
 Section: opie/applications
 Maintainer: L.J. Potter <ljp@llornkcor.com>
 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)
  Ported to the Opie environment.
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
@@ -1,10 +1,10 @@
 Files: bin/helpbrowser apps/Applications/helpbrowser.desktop docs pics/helpbrowser
 Priority: optional
 Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Browse HTML help documents
  The HTML help browser for the Opie environment.
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
@@ -1,9 +1,9 @@
 Files: bin/qcop
 Priority: required
 Section: opie/system
 Maintainer: Martin Jones <mjones@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: libqt2-emb
+Depends: libqte2
 Description: Interprocess communication client
  Interprocess communication client for the Opie environment.
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
@@ -1,9 +1,9 @@
 Files: bin/textedit apps/1Pim/textedit.desktop pics/textedit
 Priority: optional
 Section: opie/applications
 Maintainer: L. J. Potter <llornkcor@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, libopie1
+Depends: task-opie-minimal, libopie1
 Description: Text Editor
  The text editor for the Opie environment.
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
@@ -1,9 +1,9 @@
 Files: bin/qpe apps/Settings/Calibrate.desktop pics/launcher pics/devicebuttons/*.png plugins/applets/libsuspendapplet.so* plugins/applets/libhomeapplet.so* plugins/applets/liblogoutapplet.so* plugins/applets/librotateapplet.so* root/etc/init.d/opie
 Priority: required
 Section: opie/system
 Maintainer: Project Opie <opie@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.3
-Depends: opie-base
+Depends: task-opie-minimal
 Replaces: opie-rotation
 Description: Launcher for Opie
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
@@ -1,10 +1,10 @@
 Files: plugins/codecs/libmadplugin.so.1.0.0 plugins/codecs/libmadplugin.so.1.0 plugins/codecs/libmadplugin.so.1 plugins/codecs/libmadplugin.so
 Priority: optional
 Section: opie/plugins
 Maintainer: Maximilian Reiss <max.reiss@gmx.de>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: MP3 file plugin using libmad
  Plugin to play MP3 files with the mediaplayer in the Opie environment.
  It also hast streaming support (Shoutcast/Icecast).
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
@@ -1,9 +1,9 @@
 Files: plugins/codecs/libmpeg3plugin.so.1.0.0 plugins/codecs/libmpeg3plugin.so.1.0 plugins/codecs/libmpeg3plugin.so.1 plugins/codecs/libmpeg3plugin.so
 Priority: optional
 Section: opie/plugins
 Maintainer: L.J.Potter <ljp@llornkcor.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Mpeg video file plugin using libmad
  Plugin to play MPeg3 video files with the mediaplayer in the Opie environment.
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
@@ -1,9 +1,9 @@
 Files: plugins/codecs/libmodplugin.so*
 Priority: optional
 Section: opie/plugins
 Maintainer: Simon Hausmann <hausmann@kde.org>, L.J. Potter <llornkcor@handhelds.org>
 Architecture: arm
 Version: 2.0.2
-Depends: opie-base
+Depends: task-opie-minimal
 Description: MOD/XM/S3M/IT plugin using libmodplug
  Plugin to play MOD/XM/S3M/IT amiga tracker modules with the mediaplayer in the Opie environment.
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
@@ -1,9 +1,9 @@
 Files: bin/opieplayer pics/opieplayer apps/Applications/opieplayer.desktop pics/opieplayer2/skins/default
 Priority: optional
 Section: opie/applications
 Maintainer: L.J.Potter <ljp@llornkcor.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, libopie1
+Depends: task-opie-minimal, libopie1
 Description: The Opie media player
  The mediaplayer for Opie. It plays mp3, mpeg, and wav.
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
@@ -1,9 +1,9 @@
 Files: plugins/codecs/libtremorplugin.so.1.0.0 plugins/codecs/libtremorplugin.so.1.0 plugins/codecs/libtremorplugin.so.1 plugins/codecs/libtremorplugin.so
 Priority: optional
 Section: opie/plugins
 Maintainer: L.J. Potter <llornkcor@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Ogg file plugin using tremor
  Plugin to play ogg files with the mediaplayer in the Opie environment.
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
@@ -1,9 +1,9 @@
 Files: root/usr/lib/libtremor.so root/usr/lib/libtremor.so.1 root/usr/lib/libtremor.so.1.0 root/usr/lib/libtremor.so.1.0.0
 Priority: optional
 Section: opie/plugins
 Maintainer: Lorn Potter <llornkcor@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: vorbis (tremor) library
  Library needed for playing OGG files with the mediaplayer in the Opie environment.
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
@@ -1,9 +1,9 @@
 Files: plugins/codecs/libwavplugin*
 Priority: optional
 Section: opie/plugins
 Maintainer: Lorn Potter <llornkcor@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: WAV file plugin
  Plugin to play WAV files with the mediaplayer in the Opie environment.
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
@@ -1,11 +1,11 @@
 Files: plugins/obex/libopieobex.so* pics/obex/*
 Priority: optional
 Section: opie/system
 Maintainer: holger Freyther <zecke@handhelds.org>
 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
 Replaces: libopieobex1
 Description: Irda obex lib
  
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
@@ -1,9 +1,9 @@
 Files: bin/opie-login share/opie-login/opie-session share/opie-login/pre-session share/opie-login/post-session
 Priority: optional
 Section: opie/system
 Maintainer: Project Opie <opie@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, libopie1
+Depends: task-opie-minimal, libopie1
 Description: Multiuser login for OPIE
  A xdm/kdm equivalent 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
@@ -1,10 +1,10 @@
 Files: bin/addressbook apps/1Pim/addressbook.desktop pics/addressbook/*.png
 Priority: optional
 Section: opie/applications
 Conflicts: qpe-tkcaddressbook
 Maintainer: Stefan Eilers <eilers.stefan@epost.de>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, libopie1
+Depends: task-opie-minimal, libopie1
 Description: Contacts
  A simple addressbook for the Opie environment.
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
@@ -1,10 +1,10 @@
 Files: bin/datebook apps/1Pim/datebook.desktop pics/datebook
 Priority: optional
 Section: opie/applications
 Conflicts: qpe-tkccalendar
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, libopie1
+Depends: task-opie-minimal, libopie1
 Description: A datebook/appointment manager
  A datebook/appointment manager for the Opie environment.
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
@@ -1,16 +1,16 @@
 Files: bin/today apps/1Pim/today.desktop pics/today/*
 Priority: optional
 Section: opie/applications
 Maintainer: Maximilian Reiß <harlekin@handhelds.org>
 Architecture: arm
 Version: 0.6.2-$SUB_VERSION
-Depends: opie-base, libopie1
+Depends: task-opie-minimal, libopie1
 License: GPL
 Description: today screen
  This today screen app gives an overview of appointments 
  and todos.
  It also shows incoming and outgoing mails from opiemail.
  When using Opie (opie.handhelds.org) today can be autostarted
  on resume.
  It is highly configurable.
 
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
@@ -1,8 +1,8 @@
 Files: plugins/today/libtodayaddressbookplugin.so*
 Priority: optional
 Section: opie/applications
 Maintainer: Stefan Eilers <eilers.stefan@epost.de>
 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
@@ -1,8 +1,8 @@
 Files: plugins/today/libtodaydatebookplugin.so*
 Priority: optional
 Section: opie/applications
 Maintainer: Maximilian Reiss <harlekin@handhelds.org>
 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
@@ -1,8 +1,8 @@
 Files: plugins/today/libtodaymailplugin.so*
 Priority: optional
 Section: opie/applications
 Maintainer: Maximilian Reiss <harlekin@handhelds.org>
 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
@@ -1,8 +1,8 @@
 Files: plugins/today/libtodaytodolistplugin.so*
 Priority: optional
 Section: opie/applications
 Maintainer: Maximilian Reiss <harlekin@handhelds.org>
 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
@@ -1,10 +1,10 @@
 Priority: optional
 Section: opie/applications
 Maintainer: Maximilian Reiß <harlekin@handhelds.org>
 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
 Description: Task for basic today setup
  includes datebook, todolist and mail plugin
 
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
@@ -1,9 +1,9 @@
 Files: bin/todolist apps/1Pim/todo.desktop pics/todo
 Priority: optional
 Section: opie/applications
 Maintainer: Holger 'zecke' Freyther <zecke@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, libopie1
+Depends: task-opie-minimal, libopie1
 Description: TODO-list manager
  A Todo-list manager for the Opie environment.
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
@@ -1,9 +1,9 @@
 Files: bin/buttonsettings apps/Settings/Button.desktop pics/buttonsettings/*.png
 Priority: optional
 Section: opie/settings
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Device-buttons settings dialog
  For the Opie environment.
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
@@ -1,9 +1,9 @@
 Files: bin/citytime apps/Settings/citytime.desktop pics/citytime
 Priority: optional
 Section: opie/settings
 Maintainer: Maximilian Reiss <harlekin@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, timezones
+Depends: task-opie-minimal, timezones
 Description: Time-zone / world clock settings
  The time-zone manager for the Opie environment.
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
@@ -1,9 +1,9 @@
 Files: bin/launchersettings apps/Settings/Launcher.desktop pics/launchersettings
 Priority: optional
 Section: opie/settings
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Launcher settings dialog
  For the Opie environment.
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
@@ -1,9 +1,9 @@
 Files: bin/light-and-power apps/Settings/Light.desktop pics/lightandpower
 Priority: optional
 Section: opie/settings
 Maintainer: Maximilian Reiss <harlekin@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Light and Power settings dialog
  For the Opie environment.
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
@@ -1,9 +1,9 @@
 Files: bin/security apps/Settings/Security.desktop pics/security
 Priority: optional
 Section: opie/settings
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Security settings dialog
  For the Opie environment.
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
@@ -1,8 +1,8 @@
 Files: plugins/fontfactories/libfreetypefactory*
 Priority: optional
 Section: opie/plugins
 Maintainer: Opie <opie@llornkcor.com> 
 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
@@ -1,9 +1,9 @@
 Files: i18n/da/.directory i18n/da/*.qm
 Priority: optional
 Section: opie/i18n
 Maintainer: Tais M. Hansen <mellen@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-language
+Depends: task-opie-minimal, opie-language
 Description: i18n: Danish
  Danish UI texts for OPIE environment.
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
@@ -1,9 +1,9 @@
 Files: i18n/de/.directory i18n/de/*.qm etc/dict/dawg.de
 Priority: optional
 Section: opie/i18n
 Maintainer: Carsten Niehaus <cniehaus@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-language
+Depends: task-opie-minimal, opie-language
 Description: i18n: Deutsch
  German UI texts and dictionary for OPIE environment.
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
@@ -1,9 +1,9 @@
 Files: i18n/en/.directory etc/dict/dawg
 Priority: optional
 Section: opie/i18n
 Maintainer: Carsten Niehaus <cniehaus@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-language
+Depends: task-opie-minimal, opie-language
 Description: i18n: English
  English dictionary for OPIE environment.
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
@@ -1,9 +1,9 @@
 Files: i18n/es/.directory i18n/es/*.qm etc/dict/dawg.es
 Priority: optional
 Section: opie/i18n
 Maintainer: Jose Luis Fernandez Barros <fbarros@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-language
+Depends: task-opie-minimal, opie-language
 Description: i18n: Spanish
  Spanish UI texts and dictionary for OPIE environment.
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
@@ -1,9 +1,9 @@
 Files: i18n/fr/.directory i18n/fr/*.qm etc/dict/dawg.fr
 Priority: optional
 Section: opie/i18n
 Maintainer: Eric Santonacci <Eric.Santonacci@talc.fr>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-language
+Depends: task-opie-minimal, opie-language
 Description: i18n: French
  French UI texts and dictionary for OPIE environment.
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
@@ -1,10 +1,10 @@
 Files: i18n/hu/.directory i18n/hu/*.qm
 Priority: optional
 Section: opie/i18n
 Maintainer: Carstem Niehaus <cniehaus@kde.org>
 Architecture: arm
 Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-language
+Depends: task-opie-minimal, opie-language
 Description: i18n: Magyar
  Hungarian UI texts and dictionary for OPIE environment.
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
@@ -1,9 +1,9 @@
 Files: i18n/it/.directory i18n/it/*.qm
 Priority: optional
 Section: opie/i18n
 Maintainer: Daniele Foci <sunscan@sunscan.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-language
+Depends: task-opie-minimal, opie-language
 Description: i18n: Italian
  Italian UI texts for OPIE environment.
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
@@ -1,9 +1,9 @@
 Files: i18n/nl/.directory i18n/nl/*.qm
 Priority: optional
 Section: opie/i18n
 Maintainer: Carsten Niehaus <cniehaus@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-language
+Depends: task-opie-minimal, opie-language
 Description: i18n: Dutch
  Dutch UI texts and dictionary for OPIE environment.
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
@@ -1,9 +1,9 @@
 Files: i18n/pl/.directory i18n/pl/*.qm
 Priority: optional
 Section: opie/i18n
 Maintainer: Rozanski Sergiusz <rozanski@sergiusz.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-language
+Depends: task-opie-minimal, opie-language
 Description: i18n: Polish
  Polish UI texts and dictionary for OPIE environment.
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
@@ -1,9 +1,9 @@
 Files: i18n/pt/.directory i18n/pt/*.qm
 Priority: optional
 Section: opie/i18n
 Maintainer: Carsten Niehaus <cniehaus@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-language
+Depends: task-opie-minimal, opie-language
 Description: i18n: Portuguese
  Portuguese UI texts and dictionary for OPIE environment.
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
@@ -1,10 +1,10 @@
 Files: i18n/sl/.directory i18n/sl/*.qm
 Priority: optional
 Section: opie/i18n
 Maintainer: Matej Dakol <matej.dakol@gvskupina.si>
 Architecture: arm
 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
  Slovenian UI texts for OPIE environment and dictionary.
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
@@ -1,10 +1,10 @@
 Files: i18n/zh_TW/.directory i18n/zh_TW/*.qm
 Priority: optional
 Section: opie/i18n
 Maintainer: Carstem Niehaus <cniehaus@kde.org>
 Architecture: arm
 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)
  Chinese UI texts for OPIE environment.
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
@@ -1,10 +1,10 @@
 Files: i18n/ja/.directory i18n/ja/*.qm
 Priority: optional
 Section: opie/i18n
 Maintainer: Carstem Niehaus <cniehaus@kde.org>
 Architecture: arm
 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
  Japanese UI texts for OPIE environment.
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
@@ -1,10 +1,10 @@
 Files: i18n/ko/.directory i18n/ko/*.qm
 Priority: optional
 Section: opie/i18n
 Maintainer: Carstem Niehaus <cniehaus@kde.org>
 Architecture: arm
 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
  Korean UI texts for OPIE environment.
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
@@ -1,10 +1,10 @@
 Files: i18n/no/.directory i18n/no/*.qm etc/dict/dawg.no
 Priority: optional
 Section: opie/i18n
 Maintainer: Carstem Niehaus <cniehaus@kde.org>
 Architecture: arm
 Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: i18n: Norsk
  Norwegian UI texts and dictionary for OPIE environment.
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
@@ -1,10 +1,10 @@
 Files: i18n/zh_CN/.directory i18n/zh_CN/*.qm
 Priority: optional
 Section: opie/i18n
 Maintainer: Carstem Niehaus <cniehaus@kde.org>
 Architecture: arm
 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
  Chinese UI texts for OPIE environment.
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
@@ -1,11 +1,11 @@
 Files: plugins/inputmethods/libqdvorak.so*
 Priority: optional
 Section: opie/inputmethods
 Maintainer: Jeremy Cowgar <jc@cowgar.com>
 Architecture: arm
 Version: $QPE_VERSION-4
-Depends: opie-base, opie-pickboard
+Depends: task-opie-minimal, opie-pickboard
 Description: Dvorak keyboard input method
  Dvorak keyboard input method for the Opie environment. This is
  based off of the original keyboard input method. Thanks be to
  Martin Jones <mjones@trolltech.com> for the original.
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
@@ -1,9 +1,9 @@
 Files: etc/qimpen/default.conf etc/qimpen/combining.qpt etc/qimpen/asciilower.qpt etc/qimpen/asciiupper.qpt etc/qimpen/numeric.qpt
 Priority: optional
 Section: opie/inputmethods
 Maintainer: Jake Richardson <jake@asdfnews.org>
 Architecture: none
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Classic character set for the Handwriting inputmethod.
  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
@@ -1,9 +1,9 @@
 Files: etc/qimpen/graffiti*
 Priority: optional
 Section: opie/inputmethods
 Maintainer: Jake Richardson <jake@asdfnews.org>
 Architecture: none
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Graffiti character set for the Handwriting inputmethod.
  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
@@ -1,9 +1,9 @@
 Files: plugins/inputmethods/libqhandwriting.so*
 Priority: optional
 Section: opie/inputmethods
 Maintainer: Martin Jones <mjones@trolltech.com>
 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
  Handwriting recognition input method for the Opie environment.
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
@@ -1,10 +1,10 @@
 Files: plugins/inputmethods/libqjumpx.so* pics/jumpx
 Priority: optional
 Section: opie/inputmethods
 Maintainer: Markus Gritsch <gritsch@iue.tuwien.ac.at>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 License: GPL
 Description: JumpX input method
  Keyboard-like input method for the Opie environment.
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
@@ -1,9 +1,9 @@
 Files: plugins/inputmethods/libqkeyboard.so*
 Priority: optional
 Section: opie/inputmethods
 Maintainer: Martin Jones <mjones@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-pickboard
+Depends: task-opie-minimal, opie-pickboard
 Description: Keyboard input method
  Keyboard input method for the Opie environment.
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
@@ -1,10 +1,10 @@
 Files: plugins/inputmethods/libqkjumpx.so* pics/kjumpx/*
 Priority: optional
 Section: opie/inputmethods
 Maintainer: Jake Richardson <jake@asdfnews.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 License: GPL
 Description: Koreanized JumpX input method
  Keyboard-like input method for the Opie environment.
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
@@ -1,9 +1,9 @@
 Files: plugins/inputmethods/libqmultikey.so* share/multikey/*
 Priority: optional
 Section: opie/inputmethods
 Maintainer: Jake Richardson (jake@asdfnews.org)
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-pickboard
+Depends: task-opie-minimal, opie-pickboard
 Description: Multiple language keyboard
  Keyboard for inputing multiple languages in the OPIE environment.
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
@@ -1,9 +1,9 @@
 Files: plugins/inputmethods/libqpickboard.so*
 Priority: optional
 Section: opie/inputmethods
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Pickboard input method
  Pickboard dictionary-based input method for the Opie environment.
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
@@ -1,9 +1,9 @@
 Files: plugins/inputmethods/libqunikeyboard.so*
 Priority: optional
 Section: opie/inputmethods
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Unicode input method
  Basic unicode input method for the Opie environment.
diff --git a/library/libqpe1.control b/library/libqpe1.control
index 9f9f58b..455d8e0 100644
--- a/library/libqpe1.control
+++ b/library/libqpe1.control
@@ -1,8 +1,8 @@
 Files: $OPIEDIR/lib/libqpe.so.1 $OPIEDIR/lib/libqpe.so.1.5 $OPIEDIR/lib/libqpe.so.1.5.0
 Priority: required
 Section: opie/system
 Maintainer:  Project Opie <opie@handhelds.org>
 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
@@ -1,9 +1,9 @@
 Files: plugins/applets/libnetworkapplet.so* pics/networkapplet
 Priority: optional
 Section: opie/system
 Maintainer: Michael 'Mickey' Lauer <mickeyl@handhelds.org>
 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
  A taskbar applet for controlling network interfaces
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
@@ -1,9 +1,9 @@
 Files: plugins/applets/libnotesapplet.so* 
 Priority: optional
 Section: opie/system
 Maintainer: L. J. Potter <ljp@llornkcor.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Screenshot Applet
  A simple taskbar applet for making quick notes.
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
@@ -1,9 +1,9 @@
 Files: plugins/applets/libwirelessapplet.so* 
 Priority: optional
 Section: opie/system
 Maintainer: Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Wireless Applet
  A wireless network card status taskbar applet for the Opie environment
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
@@ -1,9 +1,9 @@
 Files: bin/advancedfm apps/Applications/advancedfm.desktop pics/advancedfm
 Priority: optional
 Section: opie/applications
 Maintainer: L.J. Potter <ljp@llornkcor.com> 
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Advanced File Manager
  The advanced file manager for the Opie environment.
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
@@ -1,9 +1,9 @@
 Files: bin/checkbook apps/Applications/checkbook.desktop pics/checkbook
 Priority: optional
 Section: applications
 Maintainer: Dan Williams <drw@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, libopie1
+Depends: task-opie-minimal, libopie1
 Description: Checkbook keeping program.
  The checkbook accounting program for the Opie environment.
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
@@ -1,10 +1,10 @@
 Packagename: opie-confeditor
 Files: bin/confedit apps/Settings/confedit.desktop pics/confedit/confedit.png
 Priority: optional
 Section: opie/
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 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
@@ -1,9 +1,9 @@
 Files: bin/odict apps/Applications/odict.desktop pics/odict/odict.png
 Priority: optional
 Section: applications
 Maintainer: Carsten Niehaus <cniehaus@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Dictionarylookupprogram
  Look up words :)
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
@@ -1,9 +1,9 @@
 Files: bin/reader apps/Applications/opie-reader.desktop pics/opie-reader/*
 Priority: optional
 Section: applications
 Maintainer: Tim Wentford <timwentford@hotmail.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 License: GPL
 Description: E-Book reader
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
@@ -1,10 +1,10 @@
 Files: bin/sheetqt apps/Applications/opie-sheet.desktop help/en/html/sheetqt.html pics/opie-sheet/sheetqt.png
 Priority: optional
 Section: opie/applications
 Maintainer: Serdar Ozler <sozler@sitebest.com>
 Architecture: arm
 Version: 1.0.2
-Depends: opie-base
+Depends: task-opie-minimal
 License: Public Domain
 Description: Opie Sheet
  Spreadsheet software for Opie.
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
@@ -1,9 +1,9 @@
 Files: bin/opie-write apps/Applications/opie-write.desktop pics/opie-write
 Priority: optional
 Section: opie/applications
 Maintainer: L.J. Potter <ljp@llornkcor.com> 
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Rich Text Editor 
  The rich text editor for the Opie environment.
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
@@ -1,9 +1,9 @@
 Files: bin/oxygen apps/Applications/oxygen.desktop pics/oxygen/oxygen.png share/oxygen/*
 Priority: optional
 Section: applications
 Maintainer: Carsten Niehaus <cniehaus@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Periodic System of the Elements 
  The chemistry application for the Opie-environment
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
@@ -1,10 +1,10 @@
 Files: bin/tableviewer apps/Applications/tableviewer.desktop
 Priority: optional
 Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: XML database browsers
  A table/database viewer for the Opie environment.
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
@@ -1,8 +1,8 @@
 Files: share/tinykate/syntax/c.xml share/tinykate/syntax/cpp.xml share/tinykate/syntax/gnuassembler.xml share/tinykate/syntax/kbasic.xml share/tinykate/syntax/pascal.xml share/tinykate/syntax/perl.xml share/tinykate/syntax/php.xml share/tinykate/syntax/python.xml share/tinykate/syntax/ruby.xml share/tinykate/syntax/sql.xml share/tinykate/syntax/tcl.xml share/tinykate/syntax/xml.xml share/tinykate/syntax/xmldebug.xml share/tinykate/syntax/java.xml
 Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
 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
@@ -1,8 +1,8 @@
 Files: share/tinykate/syntax/latex.xml share/tinykate/syntax/postscript.xml share/tinykate/syntax/sgml.xml
 Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
 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
@@ -1,8 +1,8 @@
 Files: share/tinykate/syntax/idconsole.xml share/tinykate/syntax/matlab.xml share/tinykate/syntax/verilog.xml share/tinykate/syntax/vhdl.xml
 Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
 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
@@ -1,8 +1,8 @@
 Files: share/tinykate/syntax/ada.xml share/tinykate/syntax/eiffel.xml share/tinykate/syntax/ferite.xml share/tinykate/syntax/fortran.xml share/tinykate/syntax/haskell.xml share/tinykate/syntax/literate-haskell.xml share/tinykate/syntax/objectivec.xml share/tinykate/syntax/sather.xml share/tinykate/syntax/scheme.xml
 Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
 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
@@ -1,8 +1,8 @@
 Files: share/tinykate/syntax/cs.xml share/tinykate/syntax/bash.xml share/tinykate/syntax/changelog.xml share/tinykate/syntax/desktop.xml share/tinykate/syntax/diff.xml share/tinykate/syntax/mab.xml share/tinykate/syntax/makefile.xml share/tinykate/syntax/rpmspec.xml share/tinykate/syntax/sml.xml share/tinykate/syntax/winehq.xml 
 Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
 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
@@ -1,8 +1,8 @@
 Files: share/tinykate/syntax/css.xml share/tinykate/syntax/html.xml share/tinykate/syntax/javascript.xml
 Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
 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
@@ -1,7 +1,7 @@
 Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
 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
@@ -1,8 +1,8 @@
 Files: bin/tinykate apps/Applications/tinykate.desktop pics/tinykate $OPIEDIR/lib/libtinykate.so.1.0.0 $OPIEDIR/lib/libtinykate.so.1.0 $OPIEDIR/lib/libtinykate.so.1
 Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
 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
@@ -1,10 +1,10 @@
 Files: bin/keypebble apps/Applications/keypebble.desktop pics/vnc
 Priority: optional
 Section: opie/applications
 Maintainer: Martin Imobersteg <imm@gmx.ch>
 Architecture: arm
 Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: VNC Viewer
  Virtual Network Computing (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
@@ -1,9 +1,9 @@
 Files: bin/mobilemsg apps/Applications/mobilemsg.desktop pics/mobilemsg 
 Priority: optional
 Section: opie/comm
 Maintainer: Bruno Rodrigues <bruno.rodrigues@litux.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Mobile Messaging
  For the Opie environment.
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
@@ -1,9 +1,9 @@
 Files: plugins/decorations/libflat.so*
 Priority: optional
 Section: opie/decorations
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: opie-base
+Depends: task-opie-minimal
 Description: OPIE window decoration style
  Flat window decoration style for OPIE.
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
@@ -1,9 +1,9 @@
 Files: plugins/decorations/libliquid.so*
 Priority: optional
 Section: opie/decorations
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: opie-base
+Depends: task-opie-minimal
 Description: OPIE window decoration style
  Liquid (KDE3) window decoration style for OPIE.
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
@@ -1,9 +1,9 @@
 Files: plugins/decorations/libpolished.so*
 Priority: optional
 Section: opie/decorations
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: opie-base
+Depends: task-opie-minimal
 Description: OPIE window decoration style
  Blended window decoration style for OPIE.
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
@@ -1,9 +1,9 @@
 Files: bin/backgammon apps/Games/backgammon.desktop pics/backgammon help/en/html/backgammon.html
 Priority: optional
 Section: opie/games
 Maintainer: Ralf Waspe <rwaspe@web.de>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Backgammon Game
  A Backgammon game for the Opie environment.
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
@@ -1,10 +1,10 @@
 Files: bin/bounce apps/Games/bounce.desktop pics/bounce/*.png
 Version: 0.6-$SUB_VERSION 
-Depends: opie-base
+Depends: task-opie-minimal
 Priority: optional
 Section: opie/games
 Maintainer: Martin Imobersteg <imm@gmx.ch> 
 Architecture: arm
 License: GPL
 Description: bounce 
  A JezzGame like game for Qtopia.
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
@@ -1,10 +1,10 @@
 Files: bin/buzzword apps/Games/buzzword.desktop pics/buzzword/buzzword.png share/buzzword/buzzwords
 Version: 1.1-$SUB_VERSION 
-Depends: opie-base
+Depends: task-opie-minimal
 Priority: optional
 Section: opie/games
 Maintainer: Martin Imobersteg <imm@gmx.ch> 
 Architecture: arm
 License: GPL
 Description: BuzzWord 
  A BuzzWord Bingo for Qtopia.
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
@@ -1,10 +1,10 @@
 Files: bin/fifteen apps/Games/fifteen.desktop pics/fifteen
 Priority: optional
 Section: opie/games
 Maintainer: Martin Imobersteg <imm@gmx.ch> 
 Architecture: arm
 Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Fifteen pieces game
  A game for the Opie environment.
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
@@ -1,9 +1,9 @@
 Files: bin/go apps/Games/go.desktop pics/go
 Priority: optional
 Section: opie/games
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: The game of Go
  A game for the Opie environment.
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
@@ -1,12 +1,12 @@
 Files: bin/kbill apps/Games/kbill.desktop pics/kbill/*
 Priority: optional
 Section: opie/games
 Maintainer: Mark Westcott <mark@houseoffish.org>
 Architecture: arm
 Version: 0.8-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 License: GPL
 Description: the famous hit Bill game
  Hit Bill as hard as you can before he
  infects your network with a wannabe 
  OS.
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
@@ -1,9 +1,9 @@
 Files: bin/kcheckers apps/Games/kcheckers.desktop pics/kcheckers
 Priority: optional
 Section: opie/games
 Maintainer: leseb <prudhomme@laposte.net>
 Architecture: arm
 Version: 0.3-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: The game of Checkers
  A game for the Opie environment.
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
@@ -1,10 +1,10 @@
 Files: bin/kpacman apps/Games/kpacman.desktop pics/kpacman/kpacman.png share/kpacman
 Version: 0.3.1-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Priority: optional
 Section: opie/games
 Maintainer: Catalin Climov <catalin@climov.com>
 Architecture: arm
 License: GPL
 Description: Kpacman
  A Pacman clone for Qtopia.
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
@@ -1,9 +1,9 @@
 Files: bin/mindbreaker apps/Games/mindbreaker.desktop pics/mindbreaker
 Priority: optional
 Section: opie/games
 Maintainer: Martin Imobersteg <imm@gmx.ch> 
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Game: crack the coloured code
  A game for the Opie environment.
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
@@ -1,9 +1,9 @@
 Files: bin/minesweep apps/Games/minesweep.desktop pics/minesweep
 Priority: optional
 Section: opie/games
 Maintainer: Martin Imobersteg <imm@gmx.ch> 
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Game: find the mines
  A game for the Opie environment.
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
@@ -1,9 +1,9 @@
 Files: bin/parashoot apps/Games/parashoot.desktop pics/parashoot
 Priority: optional
 Section: opie/games
 Maintainer: Martin Imobersteg <imm@gmx.ch>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Game: shoot the parachutists
  A game for the Opie environment.
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
@@ -1,9 +1,9 @@
 Files: bin/qasteroids apps/Games/qasteroids.desktop pics/qasteroids/*
 Priority: optional
 Section: opie/games
 Maintainer: Martin Jones <mjones@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Game: shoot the asteroids
  A game for the Opie environment.
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
@@ -1,8 +1,8 @@
 Files: bin/sfcave apps/Games/sfcave.desktop pics/sfcave
 Priority: optional
 Section: opie/games
 Maintainer: Andy Qua <andy.qua@blueyonder.co.uk>
 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
@@ -1,9 +1,9 @@
 Files: bin/snake apps/Games/snake.desktop pics/snake
 Priority: optional
 Section: opie/games
 Maintainer: Martin Imobersteg <imm@gmx.ch>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Game: control the snake
  A game for the Opie environment.
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
@@ -1,9 +1,9 @@
 Files: bin/patience apps/Games/patience.desktop pics/cards
 Priority: optional
 Section: opie/games
 Maintainer: Martin Imobersteg <imm@gmx.ch>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Game: solitaire card games
  A solitaire game for the Opie environment.
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
@@ -1,10 +1,10 @@
 Files: bin/tetrix apps/Games/tetrix.desktop pics/tetrix/*
 Priority: optional
 Section: opie/games
 Maintainer: Martin Imobersteg <imm@gmx.ch>
 Architecture: arm
 Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Game: control falling blocks
  A game for the Opie environment.
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
@@ -1,8 +1,8 @@
 Files: bin/tictac apps/Games/tictac.desktop pics/tictac
 Priority: optional
 Section: opie/games
 Maintainer: ljp <ljp@llornkcor.com>
 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
@@ -1,10 +1,10 @@
 Files: bin/wordgame apps/Games/wordgame.desktop pics/wordgame
 Priority: optional
 Section: opie/games
 Maintainer: Martin Imobersteg <imm@gmx.ch> 
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Crossword game
  A crossword game for the Opie environment.
  Play against the computer or human opponents.
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
@@ -1,11 +1,11 @@
 Files: bin/drawpad apps/1Pim/drawpad.desktop pics/drawpad
 Priority: optional
 Section: opie/applications
 Maintainer: Sébastien Prud'homme <prudhomme@laposte.net>
 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
  DrawPad is an easy note taking program for Zaurus.  It can also
  be used to draw simple images. DrawPad was developed for the Opie
  project, an alternative to the standard Zaurus environment.
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
@@ -1,9 +1,9 @@
 Files: bin/opiecam pics/camera apps/Applications/camera.desktop
 Priority: optional
 Section: opie/applications
 Maintainer: Michael 'Mickey' Lauer <mickeyl@handhelds.org> 
 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
  A Camera Application to use with the Sharp CE-AG06.
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
@@ -1,8 +1,8 @@
 Files: pics/opieplayer2/skins/default_landscape
 Priority: optional
 Section: opie/playerskins
 Maintainer: L.J.Potter <ljp@llornkcor.com>
 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
@@ -1,10 +1,10 @@
 Files: bin/opieplayer2  apps/Applications/mediaplayer.desktop pics/opieplayer2/add_to_playlist.png pics/opieplayer2/cut.png pics/opieplayer2/delete.png  pics/opieplayer2/down.png  pics/opieplayer2/loop.png pics/opieplayer2/MPEGPlayer.png pics/opieplayer2/musicfile.png pics/opieplayer2/playlist2.png pics/opieplayer2/play.png pics/opieplayer2/remove_from_playlist.png pics/opieplayer2/shuffle.png  pics/opieplayer2/up.png pics/opieplayer2/videofile.png pics/opieplayer2/skins/default
 Priority: optional
 Section: opie/applications
 Maintainer: L.J.Potter <ljp@llornkcor.com>, Maximilian Reiss <harlekin@handhelds.org>
 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
  The mediaplayer for Opie. It plays mp3, mpeg, wav, ogg, quicktime, divx and
  more. Also it is streaming capable.
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
@@ -1,10 +1,10 @@
 Files: bin/showimg apps/Applications/showimg.desktop pics/imageviewer
 Priority: optional
 Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Image Viewer
  The image viewer for the Opie environment. Supports
  Whichever formats are compiled into Qt/Embedded (eg. PNG).
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
@@ -1,9 +1,9 @@
 Files: $OPIEDIR/lib/libftplib.*
 Priority: optional
 Section: Communications
 Maintainer: L.J. Potter <ljp@llornkcor.com> 
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Libftp
  The ftp library for the Opie environment.
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
@@ -1,10 +1,10 @@
 Files: bin/opieftp pics/opieftp apps/Applications/opieftp.desktop
 Priority: optional
 Section: Communications
 Maintainer: L.J. Potter <ljp@llornkcor.com> 
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, ftplib
+Depends: task-opie-minimal, ftplib
 Replaces: opieftp
 Description: Opie-Ftp
  The ftp client for the Opie environment.
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
@@ -1,8 +1,8 @@
 Files: bin/opieirc pics/opieirc apps/Applications/opieirc.desktop help/en/html/opieirc.html help/en/html/opieirc
 Priority: optional
 Section: Communications
 Maintainer: Wenzel Jakob <root@wazlaf.de>
 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
@@ -1,9 +1,9 @@
 Files: plugins/applets/libbluetoothapplet.so* pics/bluetoothapplet/*
 Priority: optional
 Section: opie/system
 Maintainer: Maximilian Reiss <max.reiss@gmx.de>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: opie-base, libopietooth1
+Depends: task-opie-minimal, libopietooth1
 Description: Bluetooth Applet
  An bluetooth taskbar applet for the Opie environment
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
@@ -1,10 +1,10 @@
 Files: bin/bluepin
 Priority: optional
 Section: opie/applications
 Maintainer: Holger Freyther <zecke@handhelds.org>
 Architecture: arm
 Version: 0.3.4-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 License: GPL
 Description: Bluetooth pin application
 
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
@@ -1,9 +1,9 @@
 Files: $OPIEDIR/lib/libopietooth.so.1.0.0 $OPIEDIR/lib/libopietooth.so.1.0 $OPIEDIR/lib/libopietooth.so.1 
 Priority: optional
 Section: opie/system
 Maintainer: Maximilian Reiß <max.reiss@gmx.de>
 Architecture: arm
 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
@@ -1,10 +1,10 @@
 Files: bin/bluetooth-manager apps/Settings/bluetooth-manager.desktop pics/opietooth/*
 Priority: optional
 Section: opie/applications
 Maintainer: Maximilian Reiß <max.reiss@gmx.de>
 Architecture: arm
 Version: 0.5.4-$SUB_VERSION
-Depends: opie-base, libopietooth1, opie-bluepin
+Depends: task-opie-minimal, libopietooth1, opie-bluepin
 License: GPL
 Description: Bluetooth Manager application
 
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
@@ -1,9 +1,9 @@
 Files: bin/ubrowser apps/Applications/ubrowser.desktop pics/ubrowser/*.png
 Priority: optional
 Section: opie/applications
 Maintainer: Thomas Stephens <spiralman@softhome.net>
 Architecture: arm
 Version: 0.1-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 License: GPL
 Description: a very small web browser
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
@@ -1,9 +1,9 @@
 Files: bin/wellenreiter share/wellenreiter pics/wellenreiter apps/Applications/wellenreiter.desktop
 Priority: optional
 Section: opie/applications
 Maintainer: Michael 'Mickey' Lauer <mickeyl@handhelds.org> 
 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
  A WaveLAN Network Monitor/Sniffer for the Opie Environment.
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
@@ -1,9 +1,9 @@
 Files: bin/appearance apps/Settings/Appearance.desktop pics/appearance
 Priority: optional
 Section: opie/settings
 Maintainer: Dan Williams <wiliamsdr@acm.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, libopie1
+Depends: task-opie-minimal, libopie1
 Description: Appearance settings dialog
  For the Opie environment.
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
@@ -1,10 +1,10 @@
 Files: bin/aqpkg pics/aqpkg apps/Settings/aqpkg.desktop 
 Priority: optional
 Section: Settings
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Replaces: aqpkg
 Architecture: arm
 Maintainer: Andy Qua (andy.qua@blueyonder.co.uk)
 Description: A Package Manager
 
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
@@ -1,8 +1,8 @@
 Files: bin/backup pics/backup apps/Settings/backup.desktop
 Priority: optional
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Architecture: arm
 Maintainer: Benjamin Meyer <meyerb@sharpsec.com>
 Section: opie/Settings
 Description: Backup and Restore utility.
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
@@ -1,9 +1,9 @@
 Files: bin/language apps/Settings/Language.desktop
 Priority: optional
 Section: opie/settings
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Language settings dialog
  For the Opie environment.
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
@@ -1,10 +1,10 @@
 Files: bin/mediummount apps/Settings/medium.desktop pics/mediummount/*
 Priority: optional
 Section: opie/settings
 Maintainer: Holger Freyther <zecke@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: opie-base
+Depends: task-opie-minimal
 License: GPL
 Description: Configure app for the medium mounter
  Configure app for the medium mounter
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
@@ -1,11 +1,11 @@
 Packagename: opie-systemtime
 Files: bin/systemtime apps/Settings/netsystemtime.desktop etc/ntpservers pics/netsystemtime 
 Priority: optional
 Section: opie/settings
 Provides: opie-netsystemtime
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, ntpdate, libopie1
+Depends: task-opie-minimal, ntpdate, libopie1
 Description: ntp (Network  Time  Protocol) gui
  This utility syncs system time with a atomic timerserver via internet
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
@@ -1,9 +1,9 @@
 Files: bin/networksettings apps/Settings/networksettings.desktop plugins/networksettings/* pics/networksettings/* pics/Network/PPPConnect.png $OPIEDIR/lib/libinterfaces.so.1.0.0 $OPIEDIR/lib/libinterfaces.so.1.0 $OPIEDIR/lib/libinterfaces.so.1 root/usr/bin/changedns bin/getprofile
 Priority: optional
 Section: opie/settings
 Maintainer: Ben Meyer <meyerb@sharpsec.com> 
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Network settings.
 Replaces: opie-networksetup
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
@@ -1,11 +1,11 @@
 Files: bin/sound apps/Settings/Sound.desktop
 Priority: optional
 Section: opie/settings
 Maintainer: L.J. Potter
 Architecture: arm
 Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
 Conflicts: opie-sound
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Sound settings dialog
  For the Opie environment.
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
@@ -1,8 +1,8 @@
 Files: bin/sshkeys apps/Settings/sshkeys.desktop pics/sshkeys/sshkeys.png
 Priority: optional
 Section: opie/settings
 Maintainer: David Woodhouse <dwmw2@infradead.org>
 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
@@ -1,9 +1,9 @@
 Files: bin/sysinfo apps/Settings/sysinfo.desktop pics/sysinfo
 Priority: optional
 Section: opie/applications
 Maintainer: Dan Williams <williamsdr@acm.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, libopie1
+Depends: task-opie-minimal, libopie1
 Description: System Information dialog
  For the Opie environment.
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
@@ -1,10 +1,10 @@
 Files: bin/tabmanager apps/Settings/tabmanager.desktop pics/tabmanager/tabmanager.png
 Priority: optional
 Section: opie/settings
 Version: $QPE_VERSION-$SUB_VERSION-1.2
-Depends: opie-base
+Depends: task-opie-minimal
 Architecture: arm
 Maintainer: Benjamin Meyer <meyerb@sharpsec.com>
 Description: Tab Manager
  Create new tabs, remove old tabs. Edit tab's name, comment and icon.
  Edit applications name, exec, comment and icon. Add/remove applications.
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
@@ -1,9 +1,9 @@
 Files: bin/usermanager apps/Settings/usermanager.desktop pics/usermanager/*
 Priority: optional
 Section: opie/settings
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Architecture: arm
 Maintainer: Ted Parnefors <zaurus@bredband.net>
 License: GPL
 Description: User/Group manager for Opie.
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
@@ -1,9 +1,9 @@
 Files: plugins/styles/libflatstyle.so*
 Priority: optional
 Section: opie/styles
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: OPIE widget style
  Simple, flat widget style for OPIE.
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
@@ -1,9 +1,9 @@
 Files: plugins/styles/libfreshstyle.so*
 Priority: optional
 Section: opie/styles
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: OPIE widget style
  Simple widget style for OPIE.
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
@@ -1,10 +1,10 @@
 Files: plugins/styles/libliquid.so*
 Priority: optional
 Section: opie/system
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Liquid style by Mosfet.
  Mosfet's well known Liquid GUI style from KDE,
  ported to OPIE.
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
@@ -1,9 +1,9 @@
 Files: plugins/styles/libmetal.so* 
 Priority: optional
 Section: opie/system
 Maintainer: L.J. Potter <ljp@llornkcor.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Metal style by Trolltech.
  Metal style ported to OPIE.
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
@@ -1,10 +1,10 @@
 Files: plugins/styles/libtheme.so*
 Priority: optional
 Section: opie/system
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Themed style.
  This style accepts all themes written
  for KDE 2.2
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
@@ -1,8 +1,8 @@
 Files: plugins/today/libtodaystocktickerplugin.so* bin/stockticker pics/stockticker/stockticker.png
 Priority: optional
 Section: opie/applications
 Maintainer: ljp <llornkcor@handhelds.org>
 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
@@ -1,8 +1,8 @@
 Files: plugins/today/libtodayweatherplugin.so* pics/todayweatherplugin
 Priority: optional
 Section: opie/applications
 Maintainer: Dan Williams <williamsdr@acm.org>
 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
@@ -1,10 +1,10 @@
 Files: bin/calculator apps/Applications/calculator.desktop etc/unit_conversion.dat pics/calc
 Priority: optional
 Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Calculator
  A multi-function calculator for the Opie environment.
  Includes units conversion.
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
@@ -1,9 +1,9 @@
 Files: bin/clock apps/Applications/clock.desktop
 Priority: optional
 Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Clock and stop-watch
  A simple clock and stop-watch for the Opie environment.
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
@@ -1,9 +1,9 @@
 Files: bin/euroconv pics/euroconv/* apps/Applications/euroconv.desktop
 Priority: optional
 Section: opie/applications
 Maintainer: Eric Santonacci <Eric.Santonacci@talc.fr>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Euroconv
  Converts currencies between different european formats
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
@@ -1,10 +1,10 @@
 Files: bin/formatter pics/formatter/devices.png apps/Settings/formatter.desktop
 Priority: optional
 Section: opie/applications
 Maintainer: L.J. Potter <ljp@llornkcor.com> 
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Formatter
  The filesystem formatting and mountpoint app for the Opie environment.
 ronment.

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
@@ -1,10 +1,10 @@
 Files: bin/opie-sh bin/opie-sh-howto.sh apps/Opie-SH/opie-sh.desktop pics/opie-sh/*.png help/opie-sh/*.html
 Priority: optional
 Section: opie/applications
 Maintainer: Thomas Stephens <spiralman@softhome.net>
 Architecture: arm
 Version: 0.5-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 License: GPL
 Description: a QDialog shell frontend
  A program to let you use various dialogs from the console (or a shell script)
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
@@ -1,10 +1,10 @@
 Files: bin/diskfree.sh apps/Opie-SH/diskfree.desktop pics/opie-sh-scripts/diskfree.png
 Installed-Size:  0
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-sh
+Depends: task-opie-minimal, opie-sh
 Priority: optional
 Section: opie/settings
 Maintainer: gonz <gonz@directbox.com>
 Architecture: arm
 License: GPL
 Description: frontend to df (show space left on mountpoints)
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
@@ -1,10 +1,10 @@
 Files: bin/filesystem_mounter.sh pics/opie-sh-scripts/fsmounter.png apps/Opie-SH/filesystem_mounter.desktop
 Installed-Size:  0 
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-sh
+Depends: task-opie-minimal, opie-sh
 Priority: optional
 Section: opie/settings
 Maintainer: gonz <gonz@directbox.com>
 Architecture: arm
 License: GPL
 Description: frontend to mount/unmount filesystems
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
@@ -1,10 +1,10 @@
 Files: bin/hostlist.sh pics/opie-sh-scripts/hostlist.png apps/Opie-SH/hostlist.desktop share/config/hostlist.cfg
 Installed-Size:  0 
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-sh
+Depends: task-opie-minimal, opie-sh
 Priority: optional
 Section: opie/settings
 Maintainer: gonz <gonz@directbox.com>
 Architecture: arm
 License: GPL
 Description: generate list of hosts which are up/down using ping
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
@@ -1,10 +1,10 @@
 Files: bin/killproc.sh apps/Opie-SH/killproc.desktop pics/opie-sh-scripts/killproc.png
 Installed-Size:  0 
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-sh
+Depends: task-opie-minimal, opie-sh
 Priority: optional
 Section: opie/settings
 Maintainer: gonz <gonz@directbox.com>
 Architecture: arm
 License: GPL
 Description: frontend to kill process
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
@@ -1,10 +1,10 @@
 Files: bin/launcher_refresh.sh pics/opie-sh-scripts/launcher_refresh.png apps/Opie-SH/launcher_refresh.desktop
 Installed-Size:  0
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-sh
+Depends: task-opie-minimal, opie-sh
 Priority: optional
 Section: opie/settings
 Maintainer: gonz <gonz@directbox.com>
 Architecture: arm
 License: GPL
 Description: refresh the launcher so that new installed applications appear
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
@@ -1,10 +1,10 @@
 Files: bin/logviewer.sh apps/Opie-SH/logviewer.desktop pics/opie-sh-scripts/logviewer.png
 Installed-Size:  0 
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-sh
+Depends: task-opie-minimal, opie-sh
 Priority: optional
 Section: opie/settings
 Maintainer: gonz <gonz@directbox.com>
 Architecture: arm
 License: GPL
 Description: frontend to viewing logfiles
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
@@ -1,10 +1,10 @@
 Files: bin/rsyncme.sh apps/Opie-SH/rsyncme.desktop pics/opie-sh-scripts/rsyncme.png share/config/rsyncme.cfg
 Installed-Size:  0 
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-sh
+Depends: task-opie-minimal, opie-sh
 Priority: optional
 Section: opie/settings
 Maintainer: gonz <gonz@directbox.com>
 Architecture: arm
 License: GPL
 Description: frontend to rsync
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
@@ -1,10 +1,10 @@
 Files: bin/service_manager.sh apps/Opie-SH/service_manager.desktop pics/opie-sh-scripts/service_manager.png
 Installed-Size:  0
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-sh
+Depends: task-opie-minimal, opie-sh
 Priority: optional
 Section: opie/settings
 Maintainer: gonz <gonz@directbox.com>
 Architecture: arm
 License: GPL
 Description: frontend to start/stop init scripts
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
@@ -1,10 +1,10 @@
 Files: bin/opie-sh-ssh-askpass.sh
 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
 Section: opie/system
 Maintainer: David Woodhouse <dwmw2@infradead.org>
 Architecture: arm
 License: GPL
 Description: Popup dialog box for OpenSSH to ask for user input
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
@@ -1,10 +1,10 @@
 Files: bin/stowctrl.sh apps/Opie-SH/stowctrl.desktop pics/opie-sh-scripts/stowctrl.png
 Installed-Size:  0 
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-sh
+Depends: task-opie-minimal, opie-sh
 Priority: optional
 Section: opie/settings
 Maintainer: spiralman <spiralman@softhome.net
 Architecture: arm
 License: GPL
 Description: frontend to start/stop Stowaway keyboard
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
@@ -1,10 +1,10 @@
 Files: bin/usbnetctrl.sh apps/Opie-SH/usbnetctrl.desktop pics/opie-sh-scripts/usbnetctrl.png
 Installed-Size:  0 
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base, opie-sh
+Depends: task-opie-minimal, opie-sh
 Priority: optional
 Section: opie/settings
 Maintainer: gonz <gonz@directbox.com>
 Architecture: arm
 License: GPL
 Description: frontend to start/stop usbnet
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
@@ -1,10 +1,10 @@
 Files: bin/opie-sh-wavelanchooser.sh apps/Opie-SH/opie-sh-wavelanchooser.desktop pics/opie-sh-scripts/qtwavelan.png
 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
 Section: opie/settings
 Maintainer: gonz <gonz@directbox.com>
 Architecture: arm
 License: GPL
 Description: frontend to choose wavelan config
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
@@ -1,10 +1,10 @@
 Files:
 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
 Section: opie/settings
 Maintainer: gonz <gonz@directbox.com>
 Architecture: arm
 License: GPL
 Description: Opie shell apps
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
@@ -1,10 +1,10 @@
 Files: bin/remote apps/Applications/remote.desktop pics/remote/*.png
 Priority: optional
 Section: opie/applications
 Maintainer: Thomas Stephens <spiralman@softhome.net>
 Architecture: arm
 Version: 0.3-$SUB_VERSION
-Depends: opie-base, lirc
+Depends: task-opie-minimal, lirc
 License: GPL
 Description: a remote control
  A remote control using irda. A frontend to lirc.
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
@@ -1,9 +1,9 @@
 Files: bin/filebrowser apps/Applications/filebrowser.desktop pics/filebrowser/
 Priority: optional
 Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Browse the file system
  The filebrowser for the Opie environment.
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
@@ -1,10 +1,10 @@
 Files: bin/gsmtool apps/Applications/gsmtool.desktop pics/gsmtool
 Priority: optional
 Section: opie/applications
 Maintainer: David Woodhouse <dwmw2@infradead.org>
 Architecture: arm
 Version: 1.0.0-2
-Depends: opie-base, gsmlib
+Depends: task-opie-minimal, gsmlib
 License: Public Domain
 Description: GSMTool program
  An GSM phone utility program for the Opie environment.
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
@@ -1,9 +1,9 @@
 Files: plugins/applets/libbend.so*
 Priority: optional
 Section: opie/applications
 Maintainer: Constantin Bergemann <cbergemann@lisa.de>
 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
 License: LGPL
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
@@ -1,9 +1,9 @@
 Files: bin/mail $OPIEDIR/lib/libmail.so* apps/1Pim/mail.desktop pics/mail/*.png sounds/mail/*.wav
 Priority: optional
 Section: opie/applications
 Maintainer: Constantin Bergemann <cbergemann@lisa.de>
 Architecture: arm
 Version: 0.0.9-$SUB_VERSION
-Depends: opie-base, libopie1
+Depends: task-opie-minimal, libopie1
 Description: An IMAP mail client
 License: LGPL
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
@@ -1,9 +1,9 @@
 Files: bin/oipkg apps/Settings/oipkg.desktop pics/oipkg/*
 Priority: optional
 Section: opie/settings
 Maintainer: Patrick S. Vogt <tille@almana.ch>
 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
  A GUI front-end to ipkg for the Opie environment.
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
@@ -1,8 +1,8 @@
 Files: bin/qpdf apps/Applications/qpdf.desktop pics/qpdf/qpdf_icon.png
 Priority: optional
 Section: opie/applications
 Maintainer: Robert Griebl <sandman@handhelds.org>
 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
@@ -1,10 +1,10 @@
 Files: $QTDIR/lib/fonts/helvetica_*_{50,50i,75,75i}.* $QTDIR/lib/fonts/helvetica_*_t*5* $QTDIR/lib/fonts/fixed_*_50.* $QTDIR/lib/fonts/fixed_*_t*5* $QTDIR/lib/fonts/micro_*{50,50_t15,50_t5}.* $QTDIR/lib/fonts/smallsmooth_*{50,50_t15,50_t5}.* $QTDIR/lib/fonts/smoothtimes_{170,100}_{50,50_t15,50_t5}.* $QTDIR/lib/fonts/fontdir $QTDIR/lib/fonts/helvetica_*t10* $QTDIR/lib/fonts/fixed_*t10* $QTDIR/lib/fonts/micro_*t10* $QTDIR/lib/fonts/smallsmooth_*t10* $QTDIR/lib/fonts/smoothtimes_{170,100}_50*t10* $QTDIR/bin/update-qtfontdir
 Priority: required
 Section: opie/system
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
-Depends: libqt2-emb
+Depends: libqte2
 Provides: libqt2-emb-fonts
 Replaces: qt-embedded-rotation, libqt2-emb-fonts
 Version: 1:$QTE_VERSION-$QTE_REVISION
 Description: Qt/Embedded fonts - 0,90,180,270 rotation
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
@@ -1,11 +1,11 @@
 Files: bin/quickexec
 Priority: required
 Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base
+Depends: task-opie-minimal
 Description: Calculator
  A multi-function calculator for the Opie environment.
  Includes units conversion.