summaryrefslogtreecommitdiff
path: root/core
authorkergoth <kergoth>2002-10-31 16:41:17 (UTC)
committer kergoth <kergoth>2002-10-31 16:41:17 (UTC)
commitba60ce32edbad5e743494c0de33534258ee5d80c (patch) (side-by-side diff)
treebd7ef94edc4b793dd0b455f9cc6a86e07ff3f246 /core
parentd2a79869efe8b18849e45b8e1beedb5108eba6ac (diff)
downloadopie-ba60ce32edbad5e743494c0de33534258ee5d80c.zip
opie-ba60ce32edbad5e743494c0de33534258ee5d80c.tar.gz
opie-ba60ce32edbad5e743494c0de33534258ee5d80c.tar.bz2
Added Conflicts with qpe-tkcaddressbook and qpe-tkccalendar, because tkc unfortunately tries to replace the existing versions, including desktop icons, rather than creating their own.
Diffstat (limited to 'core') (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/opie-addressbook.control1
-rw-r--r--core/pim/datebook/opie-datebook.control1
2 files changed, 2 insertions, 0 deletions
diff --git a/core/pim/addressbook/opie-addressbook.control b/core/pim/addressbook/opie-addressbook.control
index 0a04ee6..f73ea4a 100644
--- a/core/pim/addressbook/opie-addressbook.control
+++ b/core/pim/addressbook/opie-addressbook.control
@@ -1,6 +1,7 @@
Files: bin/addressbook apps/1Pim/addressbook.desktop
Priority: optional
Section: opie/applications
+Conflicts: qpe-tkcaddressbook
Maintainer: Stefan Eilers <eilers.stefan@epost.de>
Architecture: arm
Version: $QPE_VERSION-$SUB_VERSION
diff --git a/core/pim/datebook/opie-datebook.control b/core/pim/datebook/opie-datebook.control
index 2ffbc0d..cb2dd6a 100644
--- a/core/pim/datebook/opie-datebook.control
+++ b/core/pim/datebook/opie-datebook.control
@@ -1,6 +1,7 @@
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