summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-01-24 19:28:14 (UTC)
committer kergoth <kergoth>2003-01-24 19:28:14 (UTC)
commit67699ef8fd807a99c08d6401a67e8000bca8f1ca (patch) (unidiff)
tree1b91097154a83b174e22d0ae74ab2588016dd88a
parent6ad2305a32674d3149bd5bb1dc6d90336283a60a (diff)
downloadopie-67699ef8fd807a99c08d6401a67e8000bca8f1ca.zip
opie-67699ef8fd807a99c08d6401a67e8000bca8f1ca.tar.gz
opie-67699ef8fd807a99c08d6401a67e8000bca8f1ca.tar.bz2
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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/opie-taskbar.control4
-rw-r--r--library/opie-base.control9
-rw-r--r--library/opie-common.control4
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 @@
1Files: 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 1Files: 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
2Priority: required 2Priority: required
3Section: opie/system 3Section: opie/system
4Maintainer: Project Opie <opie@handhelds.org> 4Maintainer: Project Opie <opie@handhelds.org>
5Architecture: arm 5Architecture: arm
6Version: $QPE_VERSION-$SUB_VERSION.2 6Version: $QPE_VERSION-$SUB_VERSION.3
7Depends: qt-embedded (>=$QTE_VERSION), opie-common, libqpe1, libopie1 7Depends: libqt2-emb (>=$QTE_VERSION), opie-common, libqpe1, libopie1, opie-qcop, opie-sounds, apmd, opie-pics, timezones
8Description: Launcher for Opie 8Description: 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 @@
1Priority: required
2Section: opie/system
3Maintainer: Project Opie <opie@handhelds.org>
4Architecture: arm
5Version: $QPE_VERSION-$SUB_VERSION.3
6Provides: qpe-base
7Conflicts: qpe-base
8Depends: qt-embedded (>=$QTE_VERSION), qt-embedded-rotation, opie-common, libqpe1, libopie1, opie-qcop, opie-taskbar, opie-sounds, apmd, opie-pics, timezones
9Description: 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 @@
1Files: etc/colors bin/opie-reorgfiles apps/*/.directory etc/mime.types apps/Settings/quit.desktop pics/logo/* 1Files: etc/colors bin/opie-reorgfiles apps/*/.directory etc/mime.types apps/Settings/quit.desktop pics/logo/*
2Priority: required 2Priority: required
3Section: opie/system 3Section: opie/system
4Maintainer: Project Opie <opie@handhelds.org> 4Maintainer: Project Opie <opie@handhelds.org>
5Architecture: arm 5Architecture: arm
6Version: $QPE_VERSION-$SUB_VERSION.1 6Version: $QPE_VERSION-$SUB_VERSION.2
7Provides: opie-base
8Replaces: opie-base
7Description: Core opie files 9Description: Core opie files