32 files changed, 37 insertions, 37 deletions

diff --git a/core/applets/batteryapplet/opie-batteryapplet.control b/core/applets/batteryapplet/opie-batteryapplet.control
index 0bf5507..b599ed0 100644
--- a/core/applets/batteryapplet/opie-batteryapplet.control
+++ b/core/applets/batteryapplet/opie-batteryapplet.control
@@ -3,3 +3,3 @@ Files: plugins/applets/libbatteryapplet.so*
 Priority: optional
-Section: opie/taskbar
+Section: opie/applets
 Maintainer: Opie team <opie@handhelds.org>
diff --git a/core/applets/cardmon/opie-cardmon.control b/core/applets/cardmon/opie-cardmon.control
index 954faac..70eab75 100644
--- a/core/applets/cardmon/opie-cardmon.control
+++ b/core/applets/cardmon/opie-cardmon.control
@@ -3,3 +3,3 @@ Files: plugins/applets/libcardmonapplet.so* pics/cardmon/*.png sounds/cardmon/*.
 Priority: optional
-Section: opie/taskbar
+Section: opie/applets
 Maintainer: Maximilian Reiß <max.reiss@gmx.de>
diff --git a/core/applets/clipboardapplet/opie-clipboardapplet.control b/core/applets/clipboardapplet/opie-clipboardapplet.control
index 3768f3f..e0e2d82 100644
--- a/core/applets/clipboardapplet/opie-clipboardapplet.control
+++ b/core/applets/clipboardapplet/opie-clipboardapplet.control
@@ -3,3 +3,3 @@ Files: plugins/applets/libclipboardapplet.so*
 Priority: optional
-Section: opie/taskbar
+Section: opie/applets
 Maintainer: Robert Griebl <sandman@handhelds.org>
diff --git a/core/applets/clockapplet/opie-clockapplet.control b/core/applets/clockapplet/opie-clockapplet.control
index 47e936d..92b01e7 100644
--- a/core/applets/clockapplet/opie-clockapplet.control
+++ b/core/applets/clockapplet/opie-clockapplet.control
@@ -3,3 +3,3 @@ Files: plugins/applets/libclockapplet.so*
 Priority: optional
-Section: opie/taskbar
+Section: opie/applets
 Maintainer: Opie Project <opie@handhelds.org>
diff --git a/core/applets/irdaapplet/opie-irdaapplet.control b/core/applets/irdaapplet/opie-irdaapplet.control
index f3bfe81..509ca66 100644
--- a/core/applets/irdaapplet/opie-irdaapplet.control
+++ b/core/applets/irdaapplet/opie-irdaapplet.control
@@ -3,3 +3,3 @@ Files: plugins/applets/libirdaapplet.so* pics/irdaapplet/* sounds/irdaapplet/*.w
 Priority: optional
-Section: opie/system
+Section: opie/applets
 Maintainer: David Woodhouse <dwmw2@infradead.org>
diff --git a/core/applets/multikeyapplet/opie-multikeyapplet.control b/core/applets/multikeyapplet/opie-multikeyapplet.control
index 2c27cc7..6cfcf67 100644
--- a/core/applets/multikeyapplet/opie-multikeyapplet.control
+++ b/core/applets/multikeyapplet/opie-multikeyapplet.control
@@ -3,3 +3,3 @@ Files: plugins/applets/libmultikeyapplet.so*
 Priority: optional
-Section: opie/taskbar
+Section: opie/applets
 Maintainer: Anton Kachalov <mouse@altlinux.ru>
diff --git a/core/applets/restartapplet/opie-restartapplet.control b/core/applets/restartapplet/opie-restartapplet.control
index 8ec9c60..1c18a92 100644
--- a/core/applets/restartapplet/opie-restartapplet.control
+++ b/core/applets/restartapplet/opie-restartapplet.control
@@ -1,5 +1,5 @@
 Package: opie-restartapplet
-Files: plugins/applets/librestartapplet.so* 
+Files: plugins/applets/librestartapplet.so*
 Priority: optional
-Section: opie/system
+Section: opie/applets
 Maintainer: L.J. Potter <lpotter@trolltech.com>
diff --git a/core/applets/restartapplet2/opie-restartapplet2.control b/core/applets/restartapplet2/opie-restartapplet2.control
index 630f313..1d8bc34 100644
--- a/core/applets/restartapplet2/opie-restartapplet2.control
+++ b/core/applets/restartapplet2/opie-restartapplet2.control
@@ -1,5 +1,5 @@
 Package: opie-restartapplet2
-Files: plugins/applets/librestartapplet.so* 
+Files: plugins/applets/librestartapplet.so*
 Priority: optional
-Section: opie/system
+Section: opie/applets
 Maintainer: L.J. Potter <lpotter@trolltech.com>
diff --git a/core/applets/screenshotapplet/opie-screenshotapplet.control b/core/applets/screenshotapplet/opie-screenshotapplet.control
index 49507c7..5c0b64d 100644
--- a/core/applets/screenshotapplet/opie-screenshotapplet.control
+++ b/core/applets/screenshotapplet/opie-screenshotapplet.control
@@ -1,5 +1,5 @@
 Package: opie-screenshotapplet
-Files: plugins/applets/libscreenshotapplet.so* 
+Files: plugins/applets/libscreenshotapplet.so*
 Priority: optional
-Section: opie/system
+Section: opie/applets
 Maintainer: L. J. Potter <lpotter@trolltech.com>
diff --git a/core/applets/vmemo/opie-vmemo.control b/core/applets/vmemo/opie-vmemo.control
index 74fc904..9a5b98b 100644
--- a/core/applets/vmemo/opie-vmemo.control
+++ b/core/applets/vmemo/opie-vmemo.control
@@ -3,3 +3,3 @@ Files: plugins/applets/libvmemoapplet.so*
 Priority: optional
-Section: opie/system
+Section: opie/applets
 Maintainer: L.J. Potter <lpotter@trolltech.com>
diff --git a/core/applets/volumeapplet/opie-volumeapplet.control b/core/applets/volumeapplet/opie-volumeapplet.control
index d59597b..3056520 100644
--- a/core/applets/volumeapplet/opie-volumeapplet.control
+++ b/core/applets/volumeapplet/opie-volumeapplet.control
@@ -3,3 +3,3 @@ Files: plugins/applets/libvolumeapplet.so*
 Priority: optional
-Section: opie/taskbar
+Section: opie/applets
 Maintainer: L.J. Potter <lpotter@trolltech.com>
diff --git a/core/apps/textedit/opie-textedit.control b/core/apps/textedit/opie-textedit.control
index 6c64861..44af66c 100644
--- a/core/apps/textedit/opie-textedit.control
+++ b/core/apps/textedit/opie-textedit.control
@@ -3,3 +3,3 @@ Files: plugins/application/libtextedit.so* bin/textedit apps/1Pim/textedit.deskt
 Priority: optional
-Section: opie/applications
+Section: opie/pim
 Maintainer: L.J. Potter <lpotter@trolltech.com>
diff --git a/core/launcher/opie-taskbar.control b/core/launcher/opie-taskbar.control
index f6dcfc2..778aff3 100644
--- a/core/launcher/opie-taskbar.control
+++ b/core/launcher/opie-taskbar.control
@@ -4,3 +4,3 @@ Priority: required
 Section: opie/system
-Maintainer: Project Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
diff --git a/core/multimedia/opieplayer/libmad/opie-libmadplugin.control b/core/multimedia/opieplayer/libmad/opie-libmadplugin.control
index c3413d7..4dfda85 100644
--- a/core/multimedia/opieplayer/libmad/opie-libmadplugin.control
+++ b/core/multimedia/opieplayer/libmad/opie-libmadplugin.control
@@ -3,3 +3,3 @@ Files: plugins/codecs/libmadplugin.so.1.0.0 plugins/codecs/libmadplugin.so.1.0 p
 Priority: optional
-Section: opie/plugins
+Section: libs
 Maintainer: Maximilian Reiss <max.reiss@gmx.de>, L.J. Potter <lpotter@trolltech.com>
diff --git a/core/multimedia/opieplayer/libmpeg3/opie-libmpeg3plugin.control b/core/multimedia/opieplayer/libmpeg3/opie-libmpeg3plugin.control
index 5d2cb2e..7c43458 100644
--- a/core/multimedia/opieplayer/libmpeg3/opie-libmpeg3plugin.control
+++ b/core/multimedia/opieplayer/libmpeg3/opie-libmpeg3plugin.control
@@ -3,3 +3,3 @@ Files: plugins/codecs/libmpeg3plugin.so.1.0.0 plugins/codecs/libmpeg3plugin.so.1
 Priority: optional
-Section: opie/plugins
+Section: libs
 Maintainer: L.J. Potter <lpotter@trolltech.com>
diff --git a/core/multimedia/opieplayer/modplug/opie-modplugin.control b/core/multimedia/opieplayer/modplug/opie-modplugin.control
index 01e3bcc..1f86c47 100644
--- a/core/multimedia/opieplayer/modplug/opie-modplugin.control
+++ b/core/multimedia/opieplayer/modplug/opie-modplugin.control
@@ -3,3 +3,3 @@ Files: plugins/codecs/libmodplugin.so*
 Priority: optional
-Section: opie/plugins
+Section: libs
 Maintainer: Simon Hausmann <hausmann@kde.org>, L.J. Potter <lpotter@trolltech.com>
diff --git a/core/multimedia/opieplayer/vorbis/opie-libtremorplugin.control b/core/multimedia/opieplayer/vorbis/opie-libtremorplugin.control
index 3036af6..474dfcc 100644
--- a/core/multimedia/opieplayer/vorbis/opie-libtremorplugin.control
+++ b/core/multimedia/opieplayer/vorbis/opie-libtremorplugin.control
@@ -3,3 +3,3 @@ Files: plugins/codecs/libtremorplugin.so.1.0.0 plugins/codecs/libtremorplugin.so
 Priority: optional
-Section: opie/plugins
+Section: libs
 Maintainer: L.J. Potter <lpotter@trolltech.com>
diff --git a/core/multimedia/opieplayer/wavplugin/opie-wavplugin.control b/core/multimedia/opieplayer/wavplugin/opie-wavplugin.control
index 524d27c..92973fd 100644
--- a/core/multimedia/opieplayer/wavplugin/opie-wavplugin.control
+++ b/core/multimedia/opieplayer/wavplugin/opie-wavplugin.control
@@ -3,3 +3,3 @@ Files: plugins/codecs/libwavplugin*
 Priority: optional
-Section: opie/plugins
+Section: libs
 Maintainer: L.J. Potter <lpotter@trolltech.com>
diff --git a/core/obex/libopieobex0.control b/core/obex/libopieobex0.control
index d43aa89..2b59ceb 100644
--- a/core/obex/libopieobex0.control
+++ b/core/obex/libopieobex0.control
@@ -3,3 +3,3 @@ Files: plugins/obex/libopieobex.so* pics/obex/*
 Priority: optional
-Section: opie/system
+Section: libs
 Maintainer: holger Freyther <zecke@handhelds.org>
@@ -10,3 +10,3 @@ 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 4d2ebf4..7b13ece 100644
--- a/core/opie-login/opie-login.control
+++ b/core/opie-login/opie-login.control
@@ -4,3 +4,3 @@ Priority: optional
 Section: opie/system
-Maintainer: Project Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
diff --git a/core/opiealarm/opie-opiealarm.control b/core/opiealarm/opie-opiealarm.control
index 7a8a188..3718a42 100644
--- a/core/opiealarm/opie-opiealarm.control
+++ b/core/opiealarm/opie-opiealarm.control
@@ -9,3 +9,3 @@ Architecture: arm
 Description: A wakeup system for OPIE events.
- Tiny, OPIE specific  replacement for ipaqalarm,
+ Tiny, OPIE specific replacement for ipaqalarm,
  uschedule and qpe2uschedule
diff --git a/core/pim/addressbook/opie-addressbook.control b/core/pim/addressbook/opie-addressbook.control
index 29740e4..2d30dc5 100644
--- a/core/pim/addressbook/opie-addressbook.control
+++ b/core/pim/addressbook/opie-addressbook.control
@@ -3,3 +3,3 @@ Files: plugins/application/libaddressbook.so* bin/addressbook apps/1Pim/addressb
 Priority: optional
-Section: opie/applications
+Section: opie/pim
 Conflicts: qpe-tkcaddressbook
diff --git a/core/pim/datebook/opie-datebook.control b/core/pim/datebook/opie-datebook.control
index 4fe9abf..2881ddb 100644
--- a/core/pim/datebook/opie-datebook.control
+++ b/core/pim/datebook/opie-datebook.control
@@ -3,3 +3,3 @@ Files: plugins/application/libdatebook.so* bin/datebook apps/1Pim/datebook.deskt
 Priority: optional
-Section: opie/applications
+Section: opie/pim
 Conflicts: qpe-tkccalendar
diff --git a/core/pim/osearch/opie-osearch.control b/core/pim/osearch/opie-osearch.control
index 738a9b7..9bf0607 100644
--- a/core/pim/osearch/opie-osearch.control
+++ b/core/pim/osearch/opie-osearch.control
@@ -3,3 +3,3 @@ Files: plugins/application/libosearch.so* bin/osearch apps/1Pim/osearch.desktop
 Priority: optional
-Section: opie/applications
+Section: opie/pim
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
diff --git a/core/pim/today/opie-today.control b/core/pim/today/opie-today.control
index aab4db9..f456b66 100644
--- a/core/pim/today/opie-today.control
+++ b/core/pim/today/opie-today.control
@@ -3,3 +3,3 @@ Files: plugins/application/libtoday.so* bin/today apps/1Pim/today.desktop pics/t
 Priority: optional
-Section: opie/applications
+Section: opie/pim
 Maintainer: Maximilian Reiß <harlekin@handhelds.org>
@@ -10,3 +10,3 @@ License: GPL
 Description: today screen
- This today screen app gives an overview of appointments 
+ This today screen app gives an overview of appointments
  and todos.
diff --git a/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control b/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control
index 1876eb8..56eeba4 100644
--- a/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control
+++ b/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control
@@ -3,3 +3,3 @@ Files: plugins/today/libtodayaddressbookplugin.so*
 Priority: optional
-Section: opie/applications
+Section: opie/plugins
 Maintainer: Stefan Eilers <eilers.stefan@epost.de>
diff --git a/core/pim/today/plugins/datebook/opie-today-datebookplugin.control b/core/pim/today/plugins/datebook/opie-today-datebookplugin.control
index e07d770..4b288cc 100644
--- a/core/pim/today/plugins/datebook/opie-today-datebookplugin.control
+++ b/core/pim/today/plugins/datebook/opie-today-datebookplugin.control
@@ -3,3 +3,3 @@ Files: plugins/today/libtodaydatebookplugin.so*
 Priority: optional
-Section: opie/applications
+Section: opie/plugins
 Maintainer: Maximilian Reiss <harlekin@handhelds.org>
diff --git a/core/pim/today/plugins/mail/opie-today-mailplugin.control b/core/pim/today/plugins/mail/opie-today-mailplugin.control
index ac4bb64..cef3b8e 100644
--- a/core/pim/today/plugins/mail/opie-today-mailplugin.control
+++ b/core/pim/today/plugins/mail/opie-today-mailplugin.control
@@ -3,3 +3,3 @@ Files: plugins/today/libtodaymailplugin.so*
 Priority: optional
-Section: opie/applications
+Section: opie/plugins
 Maintainer: Maximilian Reiss <harlekin@handhelds.org>
diff --git a/core/pim/today/plugins/todolist/opie-today-todolistplugin.control b/core/pim/today/plugins/todolist/opie-today-todolistplugin.control
index 0f05e47..63727e0 100644
--- a/core/pim/today/plugins/todolist/opie-today-todolistplugin.control
+++ b/core/pim/today/plugins/todolist/opie-today-todolistplugin.control
@@ -3,3 +3,3 @@ Files: plugins/today/libtodaytodolistplugin.so*
 Priority: optional
-Section: opie/applications
+Section: opie/plugins
 Maintainer: Maximilian Reiss <harlekin@handhelds.org>
diff --git a/core/pim/today/task-opie-today.control b/core/pim/today/task-opie-today.control
index b4bddbf..c142e97 100644
--- a/core/pim/today/task-opie-today.control
+++ b/core/pim/today/task-opie-today.control
@@ -2,3 +2,3 @@ Package: task-opie-today
 Priority: optional
-Section: opie/applications
+Section: opie/pim
 Maintainer: Maximilian Reiß <harlekin@handhelds.org>
diff --git a/core/pim/todo/opie-todo.control b/core/pim/todo/opie-todo.control
index 86f9b7a..a2ca4a6 100644
--- a/core/pim/todo/opie-todo.control
+++ b/core/pim/todo/opie-todo.control
@@ -3,3 +3,3 @@ Files: plugins/application/libtodolist.so* bin/todolist apps/1Pim/todo.desktop
 Priority: optional
-Section: opie/applications
+Section: opie/pim
 Maintainer: Holger 'zecke' Freyther <zecke@handhelds.org>
diff --git a/core/qws/opie-qws.control b/core/qws/opie-qws.control
index fe5f4e0..236f165 100644
--- a/core/qws/opie-qws.control
+++ b/core/qws/opie-qws.control
@@ -4,3 +4,3 @@ Priority: required
 Section: opie/system
-Maintainer: Project Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm