summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-08-16 17:11:44 (UTC)
committer harlekin <harlekin>2002-08-16 17:11:44 (UTC)
commit6418144fafc5ffbae499bd66dfe809686484843e (patch) (unidiff)
tree500be04283c7acdffa54d98a031ff649ba7936ea
parentbc53cd5b0218ca10b6e88bb03a558230b7781cf7 (diff)
downloadopie-6418144fafc5ffbae499bd66dfe809686484843e.zip
opie-6418144fafc5ffbae499bd66dfe809686484843e.tar.gz
opie-6418144fafc5ffbae499bd66dfe809686484843e.tar.bz2
made the 2 bat applets conflict on each other
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/batteryapplet/opie-batteryapplet.control3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/applets/batteryapplet/opie-batteryapplet.control b/core/applets/batteryapplet/opie-batteryapplet.control
index c6ea2c6..150f47e 100644
--- a/core/applets/batteryapplet/opie-batteryapplet.control
+++ b/core/applets/batteryapplet/opie-batteryapplet.control
@@ -1,9 +1,10 @@
1Files: plugins/applets/libbatteryapplet.so* 1Files: plugins/applets/libbatteryapplet.so*
2Priority: optional 2Priority: optional
3Section: opie/taskbar 3Section: opie/taskbar
4Maintainer: Warwick Allison <warwick@trolltech.com> 4Maintainer: Opie team <opie@handhelds.org>
5Architecture: arm 5Architecture: arm
6Version: $QPE_VERSION-$SUB_VERSION 6Version: $QPE_VERSION-$SUB_VERSION
7Depends: opie-base ($QPE_VERSION) 7Depends: opie-base ($QPE_VERSION)
8Conflicts: opie-batteryapplet-ipaq
8Description: Battery Monitor applet 9Description: Battery Monitor applet
9 Battery Monitor applet for the Opie environment taskbar. 10 Battery Monitor applet for the Opie environment taskbar.