summaryrefslogtreecommitdiff
path: root/core
Side-by-side diff
Diffstat (limited to 'core') (more/less context) (show 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
@@ -3,3 +3,3 @@ Priority: optional
Section: opie/taskbar
-Maintainer: Warwick Allison <warwick@trolltech.com>
+Maintainer: Opie team <opie@handhelds.org>
Architecture: arm
@@ -7,2 +7,3 @@ Version: $QPE_VERSION-$SUB_VERSION
Depends: opie-base ($QPE_VERSION)
+Conflicts: opie-batteryapplet-ipaq
Description: Battery Monitor applet