Okay, better solution guys.. opie-base virtual package is gone. opie-common now Provides and Replaces opie-base, and the qcop, sounds, pics, etc explicit dependencies are in the launcher itself. If you have a better way to handle it, let me know. This should fix the opie-common being installed before opie-base broken upgrade path noted by Oliver on the list.

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
@@ -1,8 +1,8 @@
 Files: bin/qpe apps/Settings/Calibrate.desktop pics/launcher pics/devicebuttons/*.png plugins/applets/libsuspendapplet.so* plugins/applets/libhomeapplet.so* plugins/applets/liblogoutapplet.so* root/etc/init.d/opie
 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
@@ -1,7 +1,9 @@
 Files: etc/colors bin/opie-reorgfiles apps/*/.directory etc/mime.types apps/Settings/quit.desktop pics/logo/*
 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