More control file clean-up...mostly done, except for task-opie-*

19 files changed, 28 insertions, 30 deletions

diff --git a/core/applets/batteryapplet/opie-batteryapplet.control b/core/applets/batteryapplet/opie-batteryapplet.control
index b599ed0..64f250b 100644
--- a/core/applets/batteryapplet/opie-batteryapplet.control
+++ b/core/applets/batteryapplet/opie-batteryapplet.control
@@ -2,7 +2,7 @@ Package: opie-batteryapplet
 Files: plugins/applets/libbatteryapplet.so*
 Priority: optional
 Section: opie/applets
-Maintainer: Opie team <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 Conflicts: opie-batteryapplet-ipaq
diff --git a/core/applets/clockapplet/opie-clockapplet.control b/core/applets/clockapplet/opie-clockapplet.control
index 92b01e7..79d9fdd 100644
--- a/core/applets/clockapplet/opie-clockapplet.control
+++ b/core/applets/clockapplet/opie-clockapplet.control
@@ -2,7 +2,7 @@ Package: opie-clockapplet
 Files: plugins/applets/libclockapplet.so*
 Priority: optional
 Section: opie/applets
-Maintainer: Opie Project <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Clock applet
diff --git a/core/applets/irdaapplet/opie-irdaapplet.control b/core/applets/irdaapplet/opie-irdaapplet.control
index 509ca66..bcc6603 100644
--- a/core/applets/irdaapplet/opie-irdaapplet.control
+++ b/core/applets/irdaapplet/opie-irdaapplet.control
@@ -5,6 +5,6 @@ Section: opie/applets
 Maintainer: David Woodhouse <dwmw2@infradead.org>
 Architecture: arm
 Depends: task-opie-minimal, libopieobex1
-Description: Irda Applet
+Description: IrDA Applet
  An IrDA taskbar applet for the Opie environment
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/applets/restartapplet/opie-restartapplet.control b/core/applets/restartapplet/opie-restartapplet.control
index 1c18a92..eba61ac 100644
--- a/core/applets/restartapplet/opie-restartapplet.control
+++ b/core/applets/restartapplet/opie-restartapplet.control
@@ -7,4 +7,4 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
 Depends: task-opie-minimal
 Description: Restart Applet
- A simple taskbar applet to restart the  Opie environment
+ A simple taskbar applet to restart the Opie environment
diff --git a/core/applets/restartapplet2/opie-restartapplet2.control b/core/applets/restartapplet2/opie-restartapplet2.control
index 1d8bc34..d9dcb78 100644
--- a/core/applets/restartapplet2/opie-restartapplet2.control
+++ b/core/applets/restartapplet2/opie-restartapplet2.control
@@ -6,5 +6,5 @@ Maintainer: L.J. Potter <lpotter@trolltech.com>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Restart Applet
- A simple opie menu applet to restart the  Opie environment
+ A simple opie menu applet to restart the Opie environment
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/apps/calibrate/opie-calibrate.control b/core/apps/calibrate/opie-calibrate.control
index b902ce3..3bd6884 100644
--- a/core/apps/calibrate/opie-calibrate.control
+++ b/core/apps/calibrate/opie-calibrate.control
@@ -3,7 +3,7 @@ Files: bin/calibrate
 Priority: optional
 Section: opie/applications
 Architecture: arm
-Maintainer: ?
+Maintainer: Opie Team <opie@handhelds.org>
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, libopie1
 Description: Standalone calibration utility
diff --git a/core/apps/helpbrowser/opie-helpbrowser.control b/core/apps/helpbrowser/opie-helpbrowser.control
index bada284..9d96de2 100644
--- a/core/apps/helpbrowser/opie-helpbrowser.control
+++ b/core/apps/helpbrowser/opie-helpbrowser.control
@@ -2,7 +2,7 @@ Package: opie-helpbrowser
 Files: plugins/application/libhelpbrowser.so* bin/helpbrowser apps/Applications/helpbrowser.desktop docs pics/helpbrowser
 Priority: optional
 Section: opie/applications
-Maintainer: Opie Project <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Arch: iPAQ
 Depends: task-opie-minimal
diff --git a/core/multimedia/opieplayer/libmad/opie-libmadplugin.control b/core/multimedia/opieplayer/libmad/opie-libmadplugin.control
index 4dfda85..8de5976 100644
--- a/core/multimedia/opieplayer/libmad/opie-libmadplugin.control
+++ b/core/multimedia/opieplayer/libmad/opie-libmadplugin.control
@@ -7,5 +7,5 @@ Architecture: arm
 Depends: task-opie-minimal
 Description: MP3 file plugin using libmad
  Plugin to play MP3 files with the mediaplayer in the Opie environment.
- It also hast streaming support (Shoutcast/Icecast).
+ It also has streaming support (Shoutcast/Icecast).
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/obex/libopieobex0.control b/core/obex/libopieobex0.control
index 2b59ceb..91f7366 100644
--- a/core/obex/libopieobex0.control
+++ b/core/obex/libopieobex0.control
@@ -8,5 +8,4 @@ Depends: task-opie-minimal ($QPE_VERSION), openobex | libopenobex1
 Provides: libopieobex1
 Replaces: libopieobex1
 Description: Irda obex lib
-
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/opie-login/opie-login.control b/core/opie-login/opie-login.control
index 7b13ece..3d6bdff 100644
--- a/core/opie-login/opie-login.control
+++ b/core/opie-login/opie-login.control
@@ -5,6 +5,6 @@ Section: opie/system
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal, libopie1, opie-security
-Description: Multiuser login for OPIE
- A xdm/kdm equivalent for OPIE.
+Description: Multiuser login for Opie
+ A xdm/kdm equivalent for Opie.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/opiealarm/opie-opiealarm.control b/core/opiealarm/opie-opiealarm.control
index 3718a42..5182623 100644
--- a/core/opiealarm/opie-opiealarm.control
+++ b/core/opiealarm/opie-opiealarm.control
@@ -6,7 +6,7 @@ Conflicts: ipaqalarm, atd
 Section: opie/system
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
-Description: A wakeup system for OPIE events.
- Tiny, OPIE specific replacement for ipaqalarm,
+Description: A wakeup system for Opie events.
+ Tiny, Opie specific replacement for ipaqalarm,
  uschedule and qpe2uschedule
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/pim/today/opie-today.control b/core/pim/today/opie-today.control
index f456b66..ac0bdfe 100644
--- a/core/pim/today/opie-today.control
+++ b/core/pim/today/opie-today.control
@@ -7,11 +7,8 @@ Architecture: arm
 Version: $QPE_VERSION$EXTRAVERSION
 Depends: task-opie-minimal, libopie1
 License: GPL
-Description: today screen
- This today screen app gives an overview of appointments
- and todos.
+Description: Today screen application
+ This app gives an overview of appointments and todos.
  It also shows incoming and outgoing mails from opiemail.
  When using Opie (opie.handhelds.org) today can be autostarted
- on resume.
- It is highly configurable.
-
+ on resume.  It is highly configurable.
diff --git a/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control b/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control
index 56eeba4..d40691a 100644
--- a/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control
+++ b/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control
@@ -5,5 +5,6 @@ Section: opie/plugins
 Maintainer: Stefan Eilers <eilers.stefan@epost.de>
 Architecture: arm
 Depends: libqte2, opie-today
-Description: Addressbook plugin for today shows Birthdays and Anniversaries
+Description: Addressbook plugin for Today
+ Displays upcoming Birthdays and Anniversaries
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/pim/today/plugins/datebook/opie-today-datebookplugin.control b/core/pim/today/plugins/datebook/opie-today-datebookplugin.control
index 4b288cc..3921b11 100644
--- a/core/pim/today/plugins/datebook/opie-today-datebookplugin.control
+++ b/core/pim/today/plugins/datebook/opie-today-datebookplugin.control
@@ -5,5 +5,6 @@ Section: opie/plugins
 Maintainer: Maximilian Reiss <harlekin@handhelds.org>
 Architecture: arm
 Depends: libqte2, opie-today
-Description: Datebook plugin for today
+Description: Datebook plugin for Today
+ Displays today's appointments
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/pim/today/plugins/mail/opie-today-mailplugin.control b/core/pim/today/plugins/mail/opie-today-mailplugin.control
index cef3b8e..20652fa 100644
--- a/core/pim/today/plugins/mail/opie-today-mailplugin.control
+++ b/core/pim/today/plugins/mail/opie-today-mailplugin.control
@@ -6,4 +6,4 @@ Maintainer: Maximilian Reiss <harlekin@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: libqte2, opie-today, opie-mailapplet
-Description: Mail plugin for today
\ No newline at end of file
+Description: Mail plugin for Today
\ No newline at end of file
diff --git a/core/pim/today/plugins/todolist/opie-today-todolistplugin.control b/core/pim/today/plugins/todolist/opie-today-todolistplugin.control
index 63727e0..001e91c 100644
--- a/core/pim/today/plugins/todolist/opie-today-todolistplugin.control
+++ b/core/pim/today/plugins/todolist/opie-today-todolistplugin.control
@@ -5,5 +5,6 @@ Section: opie/plugins
 Maintainer: Maximilian Reiss <harlekin@handhelds.org>
 Architecture: arm
 Depends: libqte2, opie-today
-Description: Todolist plugin for today
+Description: Todo list plugin for Today
+ Displays todo list items.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/pim/today/task-opie-today.control b/core/pim/today/task-opie-today.control
index c142e97..1df02bd 100644
--- a/core/pim/today/task-opie-today.control
+++ b/core/pim/today/task-opie-today.control
@@ -6,7 +6,7 @@ Architecture: arm
 Version: 0.5-$SUB_VERSION
 Depends: task-opie-minimal, libopie1, opie-today, opie-today-datebookplugin, opie-today-todolistplugin
 License: GPL
-Description: Task for basic today setup
- includes datebook, todolist and mail plugin
+Description: Task for basic Today app setup
+ Includes datebook and todolist plugins.
 
 Files:
diff --git a/core/pim/todo/opie-todo.control b/core/pim/todo/opie-todo.control
index a2ca4a6..8ad50b2 100644
--- a/core/pim/todo/opie-todo.control
+++ b/core/pim/todo/opie-todo.control
@@ -5,6 +5,6 @@ Section: opie/pim
 Maintainer: Holger 'zecke' Freyther <zecke@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal, libopie1, opie-pics
-Description: TODO-list manager
- A Todo-list manager for the Opie environment.
+Description: Todo list manager
+ A Todo list manager for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/settings/security/opie-security.control b/core/settings/security/opie-security.control
index d0ded32..625f7be 100644
--- a/core/settings/security/opie-security.control
+++ b/core/settings/security/opie-security.control
@@ -2,9 +2,8 @@ Package: opie-security
 Files: plugins/application/libsecurity.so* bin/security apps/Settings/Security.desktop pics/security
 Priority: optional
 Section: opie/settings
-Maintainer: Opie Project <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
-Description: Security settings dialog
- For the Opie environment.
+Description: Security settings dialog for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION