From 6418144fafc5ffbae499bd66dfe809686484843e Mon Sep 17 00:00:00 2001
From: harlekin <harlekin>
Date: Fri, 16 Aug 2002 17:11:44 +0000
Subject: made the 2 bat applets conflict on each other

---
(limited to 'core/applets/batteryapplet')

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 @@
 Files: plugins/applets/libbatteryapplet.so*
 Priority: optional
 Section: opie/taskbar
-Maintainer: Warwick Allison <warwick@trolltech.com>
+Maintainer: Opie team <opie@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
+Conflicts: opie-batteryapplet-ipaq
 Description: Battery Monitor applet
  Battery Monitor applet for the Opie environment taskbar.
--
cgit v0.9.0.2