3 files changed, 5 insertions, 12 deletions

diff --git a/core/launcher/opie-taskbar.control b/core/launcher/opie-taskbar.control
index 92deed4..280853d 100644
--- a/core/launcher/opie-taskbar.control
+++ b/core/launcher/opie-taskbar.control
@@ -3,6 +3,6 @@ Priority: required
 Section: opie/system
 Maintainer: Project Opie <opie@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION.2
-Depends: qt-embedded (>=$QTE_VERSION), opie-common, libqpe1, libopie1
+Version: $QPE_VERSION-$SUB_VERSION.3
+Depends: libqt2-emb (>=$QTE_VERSION), opie-common, libqpe1, libopie1, opie-qcop, opie-sounds, apmd, opie-pics, timezones
 Description: Launcher for Opie
diff --git a/library/opie-base.control b/library/opie-base.control
deleted file mode 100644
index af1a390..0000000
--- a/library/opie-base.control
+++ b/dev/null
@@ -1,9 +0,0 @@
-Priority: required
-Section: opie/system
-Maintainer:  Project Opie <opie@handhelds.org>
-Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION.3
-Provides: qpe-base
-Conflicts: qpe-base
-Depends: qt-embedded (>=$QTE_VERSION), qt-embedded-rotation, opie-common, libqpe1, libopie1, opie-qcop, opie-taskbar, opie-sounds, apmd, opie-pics, timezones
-Description: opie-base virtual package
diff --git a/library/opie-common.control b/library/opie-common.control
index 01c3c19..f5f60b6 100644
--- a/library/opie-common.control
+++ b/library/opie-common.control
@@ -3,5 +3,7 @@ Priority: required
 Section: opie/system
 Maintainer:  Project Opie <opie@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION.1
+Version: $QPE_VERSION-$SUB_VERSION.2
+Provides: opie-base
+Replaces: opie-base
 Description: Core opie files