Make info in *.control files a little more consistent (mostly modified Maintainer, Files and Section fields)

author: drw <drw> 2004-02-14 00:40:29 (UTC)
committer: drw <drw> 2004-02-14 00:40:29 (UTC)
commit: c7cf5faa7f1512fa48fb298a75902d4557bc9cfa (patch) (unidiff)
tree: c6a994c6df28a3367dabd1bd2b578ada990f70f4
parent: 0ca4076c89ad8bb02e0102ee7142b4f3e75add7d (diff)
download: opie-c7cf5faa7f1512fa48fb298a75902d4557bc9cfa.zip
opie-c7cf5faa7f1512fa48fb298a75902d4557bc9cfa.tar.gz
opie-c7cf5faa7f1512fa48fb298a75902d4557bc9cfa.tar.bz2
186 files changed, 225 insertions, 225 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
@@ -1,11 +1,11 @@
 Package: opie-batteryapplet
 Files: plugins/applets/libbatteryapplet.so*
 Priority: optional
-Section: opie/taskbar
+Section: opie/applets
 Maintainer: Opie team <opie@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 Conflicts: opie-batteryapplet-ipaq
 Description: Battery Monitor applet
 Battery Monitor applet for the Opie environment taskbar.
 Version: $QPE_VERSION$EXTRAVERSION
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
@@ -1,10 +1,10 @@
 Package: opie-cardmon
 Files: plugins/applets/libcardmonapplet.so* pics/cardmon/*.png sounds/cardmon/*.wav
 Priority: optional
-Section: opie/taskbar
+Section: opie/applets
 Maintainer: Maximilian Rei� <max.reiss@gmx.de>
 Architecture: arm
 Depends: task-opie-minimal, libopie1
 Description: CF/PCMCIA Card Monitor applet
 SD/MMC/CF/PCMCIA Card Monitor applet for the Opie environment taskbar.
 Version: $QPE_VERSION$EXTRAVERSION
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
@@ -1,10 +1,10 @@
 Package: opie-clipboardapplet
 Files: plugins/applets/libclipboardapplet.so*
 Priority: optional
-Section: opie/taskbar
+Section: opie/applets
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Clipboard applet
 Clipboard applet for the Opie environment taskbar.
 Version: $QPE_VERSION$EXTRAVERSION
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
@@ -1,10 +1,10 @@
 Package: opie-clockapplet
 Files: plugins/applets/libclockapplet.so*
 Priority: optional
-Section: opie/taskbar
+Section: opie/applets
 Maintainer: Opie Project <opie@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Clock applet
 Clock applet for the Opie environment taskbar.
 Version: $QPE_VERSION$EXTRAVERSION
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
@@ -1,10 +1,10 @@
 Package: opie-irdaapplet
 Files: plugins/applets/libirdaapplet.so* pics/irdaapplet/* sounds/irdaapplet/*.wav
 Priority: optional
-Section: opie/system
+Section: opie/applets
 Maintainer: David Woodhouse <dwmw2@infradead.org>
 Architecture: arm
 Depends: task-opie-minimal, libopieobex1
 Description: Irda Applet
 An IrDA taskbar applet for the Opie environment
 Version: $QPE_VERSION$EXTRAVERSION
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
@@ -1,9 +1,9 @@
 Package: opie-multikeyapplet
 Files: plugins/applets/libmultikeyapplet.so*
 Priority: optional
-Section: opie/taskbar
+Section: opie/applets
 Maintainer: Anton Kachalov <mouse@altlinux.ru>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Multikey Keyboard Layout Switcher Applet
 Version: $QPE_VERSION$EXTRAVERSION
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,10 +1,10 @@
 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>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
 Depends: task-opie-minimal
 Description: Restart Applet
 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 630f313..1d8bc34 100644
--- a/core/applets/restartapplet2/opie-restartapplet2.control
+++ b/core/applets/restartapplet2/opie-restartapplet2.control
@@ -1,10 +1,10 @@
 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>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Restart Applet
 A simple opie menu applet to restart the  Opie environment
 Version: $QPE_VERSION$EXTRAVERSION
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,10 +1,10 @@
 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>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Screenshot Applet
 A screenshot taskbar applet for the Opie environment
 Version: $QPE_VERSION$EXTRAVERSION
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
@@ -1,10 +1,10 @@
 Package: opie-vmemo
 Files: plugins/applets/libvmemoapplet.so*
 Priority: optional
-Section: opie/system
+Section: opie/applets
 Maintainer: L.J. Potter <lpotter@trolltech.com>
 Architecture: arm
 Depends: task-opie-minimal, opie-vmemo-settings
 Description: Voice Memo Recorder Applet
 The voice memo recorder for the Opie environment
 Version: $QPE_VERSION$EXTRAVERSION
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
@@ -1,10 +1,10 @@
 Package: opie-volumeapplet
 Files: plugins/applets/libvolumeapplet.so*
 Priority: optional
-Section: opie/taskbar
+Section: opie/applets
 Maintainer: L.J. Potter <lpotter@trolltech.com>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Volume applet
 Volume applet for the Opie environment taskbar.
 Version: $QPE_VERSION$EXTRAVERSION
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
@@ -1,10 +1,10 @@
 Package: opie-textedit
 Files: plugins/application/libtextedit.so* bin/textedit apps/1Pim/textedit.desktop pics/textedit
 Priority: optional
-Section: opie/applications
+Section: opie/pim
 Maintainer: L.J. Potter <lpotter@trolltech.com>
 Architecture: arm
 Depends: task-opie-minimal, libopie1
 Description: Text Editor
 The text editor for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
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
@@ -1,10 +1,10 @@
 Package: opie-taskbar
 Files: bin/qpe apps/Settings/Calibrate.desktop pics/launcher pics/devicebuttons/*.png plugins/applets/libsuspendapplet.so* plugins/applets/libhomeapplet.so* plugins/applets/liblogoutapplet.so* plugins/applets/librotateapplet.so* root/etc/init.d/opie
 Priority: required
 Section: opie/system
-Maintainer: Project Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 Replaces: opie-rotation
 Description: Launcher for Opie
 Version: $QPE_VERSION$EXTRAVERSION
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
@@ -1,11 +1,11 @@
 Package: opie-libmadplugin
 Files: plugins/codecs/libmadplugin.so.1.0.0 plugins/codecs/libmadplugin.so.1.0 plugins/codecs/libmadplugin.so.1 plugins/codecs/libmadplugin.so
 Priority: optional
-Section: opie/plugins
+Section: libs
 Maintainer: Maximilian Reiss <max.reiss@gmx.de>, L.J. Potter <lpotter@trolltech.com>
 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).
 Version: $QPE_VERSION$EXTRAVERSION
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
@@ -1,10 +1,10 @@
 Package: opie-libmpeg3plugin
 Files: plugins/codecs/libmpeg3plugin.so.1.0.0 plugins/codecs/libmpeg3plugin.so.1.0 plugins/codecs/libmpeg3plugin.so.1 plugins/codecs/libmpeg3plugin.so
 Priority: optional
-Section: opie/plugins
+Section: libs
 Maintainer: L.J. Potter <lpotter@trolltech.com>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Mpeg video file plugin using libmad
 Plugin to play MPeg3 video files with the mediaplayer in the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
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
@@ -1,10 +1,10 @@
 Package: opie-modplugin
 Files: plugins/codecs/libmodplugin.so*
 Priority: optional
-Section: opie/plugins
+Section: libs
 Maintainer: Simon Hausmann <hausmann@kde.org>, L.J. Potter <lpotter@trolltech.com>
 Architecture: arm
 Version: 2.0.2
 Depends: task-opie-minimal
 Description: MOD/XM/S3M/IT plugin using libmodplug
 Plugin to play MOD/XM/S3M/IT amiga tracker modules with the mediaplayer in the Opie environment.
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
@@ -1,10 +1,10 @@
 Package: opie-libtremorplugin
 Files: plugins/codecs/libtremorplugin.so.1.0.0 plugins/codecs/libtremorplugin.so.1.0 plugins/codecs/libtremorplugin.so.1 plugins/codecs/libtremorplugin.so
 Priority: optional
-Section: opie/plugins
+Section: libs
 Maintainer: L.J. Potter <lpotter@trolltech.com>
 Architecture: arm
 Depends: task-opie-minimal, libtremor
 Description: Ogg file plugin using tremor
 Plugin to play ogg files with the mediaplayer in the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
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
@@ -1,10 +1,10 @@
 Package: opie-wavplugin
 Files: plugins/codecs/libwavplugin*
 Priority: optional
-Section: opie/plugins
+Section: libs
 Maintainer: L.J. Potter <lpotter@trolltech.com>
 Architecture: arm
 Depends: task-opie-minimal
 Description: WAV file plugin
 Plugin to play WAV files with the mediaplayer in the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
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
@@ -1,12 +1,12 @@
 Package: libopieobex0
 Files: plugins/obex/libopieobex.so* pics/obex/*
 Priority: optional
-Section: opie/system
+Section: libs
 Maintainer: holger Freyther <zecke@handhelds.org>
 Architecture: arm
 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 4d2ebf4..7b13ece 100644
--- a/core/opie-login/opie-login.control
+++ b/core/opie-login/opie-login.control
@@ -1,10 +1,10 @@
 Package: opie-login
 Files: bin/opie-login share/opie-login/opie-session share/opie-login/pre-session share/opie-login/post-session root/opt/QtPalmtop/etc/opie-login.conf
 Priority: optional
 Section: opie/system
-Maintainer: Project Opie <opie@handhelds.org>
+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.
 Version: $QPE_VERSION$EXTRAVERSION
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
@@ -1,12 +1,12 @@
 Package: opie-opiealarm
 Files: bin/opiealarm root/etc/suspend-scripts/S46opiealarm root/etc/resume-scripts/R46opiealarm
 Priority: required
 Provides: ipaqalarm
 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,
+ Tiny, OPIE specific replacement for ipaqalarm,
 uschedule and qpe2uschedule
 Version: $QPE_VERSION$EXTRAVERSION
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
@@ -1,11 +1,11 @@
 Package: opie-addressbook
 Files: plugins/application/libaddressbook.so* bin/addressbook apps/1Pim/addressbook.desktop
 Priority: optional
-Section: opie/applications
+Section: opie/pim
 Conflicts: qpe-tkcaddressbook
 Maintainer: Stefan Eilers <eilers.stefan@epost.de>
 Architecture: arm
 Depends: task-opie-minimal, libopie1, opie-pics
 Description: Contacts
 A simple addressbook for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
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
@@ -1,11 +1,11 @@
 Package: opie-datebook
 Files: plugins/application/libdatebook.so* bin/datebook apps/1Pim/datebook.desktop
 Priority: optional
-Section: opie/applications
+Section: opie/pim
 Conflicts: qpe-tkccalendar
 Maintainer: Holger 'Zecke' Freyther <zecke@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal, libopie1, opie-pics
 Description: A datebook/appointment manager
 A datebook/appointment manager for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
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
@@ -1,9 +1,9 @@
 Package: opie-osearch
 Files: plugins/application/libosearch.so* bin/osearch apps/1Pim/osearch.desktop pics/osearch/*.png
 Priority: optional
-Section: opie/applications
+Section: opie/pim
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Search through all PIM data
 Version: $QPE_VERSION$EXTRAVERSION
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
@@ -1,17 +1,17 @@
 Package: opie-today
 Files: plugins/application/libtoday.so* bin/today apps/1Pim/today.desktop pics/today/*
 Priority: optional
-Section: opie/applications
+Section: opie/pim
 Maintainer: Maximilian Rei� <harlekin@handhelds.org>
 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 
+ This today screen 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.
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
@@ -1,9 +1,9 @@
 Package: opie-today-addressbookplugin
 Files: plugins/today/libtodayaddressbookplugin.so*
 Priority: optional
-Section: opie/applications
+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
 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 e07d770..4b288cc 100644
--- a/core/pim/today/plugins/datebook/opie-today-datebookplugin.control
+++ b/core/pim/today/plugins/datebook/opie-today-datebookplugin.control
@@ -1,9 +1,9 @@
 Package: opie-today-datebookplugin
 Files: plugins/today/libtodaydatebookplugin.so*
 Priority: optional
-Section: opie/applications
+Section: opie/plugins
 Maintainer: Maximilian Reiss <harlekin@handhelds.org>
 Architecture: arm
 Depends: libqte2, opie-today
 Description: Datebook plugin for today
 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 ac4bb64..cef3b8e 100644
--- a/core/pim/today/plugins/mail/opie-today-mailplugin.control
+++ b/core/pim/today/plugins/mail/opie-today-mailplugin.control
@@ -1,9 +1,9 @@
 Package: opie-today-mailplugin
 Files: plugins/today/libtodaymailplugin.so*
 Priority: optional
-Section: opie/applications
+Section: opie/plugins
 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
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
@@ -1,9 +1,9 @@
 Package: opie-today-todolistplugin
 Files: plugins/today/libtodaytodolistplugin.so*
 Priority: optional
-Section: opie/applications
+Section: opie/plugins
 Maintainer: Maximilian Reiss <harlekin@handhelds.org>
 Architecture: arm
 Depends: libqte2, opie-today
 Description: Todolist plugin for today
 Version: $QPE_VERSION$EXTRAVERSION
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
@@ -1,12 +1,12 @@
 Package: task-opie-today
 Priority: optional
-Section: opie/applications
+Section: opie/pim
 Maintainer: Maximilian Rei� <harlekin@handhelds.org>
 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
 Files:
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
@@ -1,10 +1,10 @@
 Package: opie-todo
 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>
 Architecture: arm
 Depends: task-opie-minimal, libopie1, opie-pics
 Description: TODO-list manager
 A Todo-list manager for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
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
@@ -1,10 +1,10 @@
 Package: opie-taskbar
 Files: bin/qpe apps/Settings/Calibrate.desktop pics/launcher pics/devicebuttons/*.png plugins/applets/libsuspendapplet.so* plugins/applets/libhomeapplet.so* plugins/applets/liblogoutapplet.so* plugins/applets/librotateapplet.so* root/etc/init.d/opie
 Priority: required
 Section: opie/system
-Maintainer: Project Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.3
 Depends: task-opie-minimal
 Replaces: opie-rotation
 Description: Launcher for Opie
diff --git a/examples/main-tab/opie-simple.control b/examples/main-tab/opie-simple.control
index 8416ad2..8525a94 100644
--- a/examples/main-tab/opie-simple.control
+++ b/examples/main-tab/opie-simple.control
@@ -1,9 +1,9 @@
 Package: opie-main-tab-example
 Files: bin/main-tab apps/Examples/main-tab.desktop
 Priority: optional
-Section: opie/applications
+Section: opie/examples
 Maintainer: Holger 'zecke' Freyther <zecke@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal,  opie-pics
 Description:  A simple example
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/examples/simple-icon/opie-simple.control b/examples/simple-icon/opie-simple.control
index 87ae80e..5adcf01 100644
--- a/examples/simple-icon/opie-simple.control
+++ b/examples/simple-icon/opie-simple.control
@@ -1,9 +1,9 @@
 Package: opie-simple-icon-example
 Files: bin/simple-icon apps/Examples/simple-icon.desktop
 Priority: optional
-Section: opie/applications
+Section: opie/examples
 Maintainer: Holger 'zecke' Freyther <zecke@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal,  opie-pics
 Description:  A simple icon example
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/examples/simple-main/opie-simple.control b/examples/simple-main/opie-simple.control
index 63622d5..331b2f4 100644
--- a/examples/simple-main/opie-simple.control
+++ b/examples/simple-main/opie-simple.control
@@ -1,9 +1,9 @@
 Package: opie-simple-main-example
 Files: bin/simple-main apps/Examples/simple-main.desktop
 Priority: optional
-Section: opie/applications
+Section: opie/examples
 Maintainer: Holger 'zecke' Freyther <zecke@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal,  opie-pics
 Description:  A simple example
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/examples/simple-pim/opie-simple.control b/examples/simple-pim/opie-simple.control
index 8416ad2..8525a94 100644
--- a/examples/simple-pim/opie-simple.control
+++ b/examples/simple-pim/opie-simple.control
@@ -1,9 +1,9 @@
 Package: opie-main-tab-example
 Files: bin/main-tab apps/Examples/main-tab.desktop
 Priority: optional
-Section: opie/applications
+Section: opie/examples
 Maintainer: Holger 'zecke' Freyther <zecke@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal,  opie-pics
 Description:  A simple example
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/examples/simple/opie-simple.control b/examples/simple/opie-simple.control
index 5d5afec..c34c370 100644
--- a/examples/simple/opie-simple.control
+++ b/examples/simple/opie-simple.control
@@ -1,9 +1,9 @@
 Package: opie-simple-example
 Files: bin/simple apps/Examples/simple.desktop
 Priority: optional
-Section: opie/applications
+Section: opie/examples
 Maintainer: Holger 'zecke' Freyther <zecke@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal,  opie-pics
 Description:  A simple example
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/examples/todayplugin/opie-today-exampleplugin.control b/examples/todayplugin/opie-today-exampleplugin.control
index b4e591f..c6055d5 100644
--- a/examples/todayplugin/opie-today-exampleplugin.control
+++ b/examples/todayplugin/opie-today-exampleplugin.control
@@ -1,9 +1,9 @@
 Package: opie-today-exampleplugin
 Files: plugins/today/libtodayexampleplugin.so*
 Priority: optional
-Section: opie/applications
+Section: opie/examples
 Maintainer: Maximilian Reiss <harlekin@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: libqte2, opie-today
-Description: an example plugin for today 
+Description: an example plugin for today
diff --git a/freetype/opie-freetype.control b/freetype/opie-freetype.control
index 5514c60..8519ec4 100644
--- a/freetype/opie-freetype.control
+++ b/freetype/opie-freetype.control
@@ -1,9 +1,9 @@
 Package: opie-freetype
 Files: plugins/fontfactories/libfreetypefactory*
 Priority: optional
-Section: opie/plugins
+Section: libs
-Maintainer: Opie <opie@llornkcor.com> 
+Maintainer: Opie <opie@llornkcor.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, libfreetype6
 Description: Freetype fontfactory plugin
diff --git a/help/en/html/opie-advancedfm-help-en.control b/help/en/html/opie-advancedfm-help-en.control
index 47bb08a..bafec72 100644
--- a/help/en/html/opie-advancedfm-help-en.control
+++ b/help/en/html/opie-advancedfm-help-en.control
@@ -1,11 +1,11 @@
 Package: opie-advancedfm-help-en
-Files: help/en/html/advancedfm.html 
+Files: help/en/html/advancedfm.html
 Priority: optional
 Section: opie/onlinedoc
 Maintainer: ljp <llornkcor@handhelds.org>
 Architecture: arm
 Depends: opie-advancedfm
 License: GPL
 Description: Opie Advanced file manager help files (english)
- 
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-appearance-help-en.control b/help/en/html/opie-appearance-help-en.control
index 7cf47f2..ae02811 100644
--- a/help/en/html/opie-appearance-help-en.control
+++ b/help/en/html/opie-appearance-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-appearance-help-en
 Files: help/en/html/appearance.html help/en/html/appearance
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-appearance
 License: GPL
 Description: appearance help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-aqpkg-help-en.control b/help/en/html/opie-aqpkg-help-en.control
index a4c73df..190dcfb 100644
--- a/help/en/html/opie-aqpkg-help-en.control
+++ b/help/en/html/opie-aqpkg-help-en.control
@@ -1,11 +1,11 @@
 Package: opie-aqpkg-help-en
 Files: help/en/html/aqpkg.html help/en/html/aqpkg/*
 Priority: optional
 Section: opie/onlinedoc
 Maintainer: Andy Qua (andy.qua@blueyonder.co.uk)
 Architecture: arm
 Depends: opie-aqpkg
 License: GPL
 Description: AQPkg Opie package manager help files (english)
- 
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-backgammon-help-en.control b/help/en/html/opie-backgammon-help-en.control
index 50f7963..fa435e4 100644
--- a/help/en/html/opie-backgammon-help-en.control
+++ b/help/en/html/opie-backgammon-help-en.control
@@ -1,10 +1,10 @@
 Package: opie-backgammon-help-en
 Files: help/en/html/backgammon.html help/en/html/backgammon
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: opie-backgammon
 License: GPL
 Description: backgammon help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-backup-help-en.control b/help/en/html/opie-backup-help-en.control
index fb20668..d3ec55e 100644
--- a/help/en/html/opie-backup-help-en.control
+++ b/help/en/html/opie-backup-help-en.control
@@ -1,10 +1,10 @@
 Package: opie-backup-help-en
 Files: help/en/html/backup.html help/en/html/backup
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: opie-backup
 License: GPL
 Description: backup help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-bluetooth-manager-help-en.control b/help/en/html/opie-bluetooth-manager-help-en.control
index 425e8c3..a8c2afb 100644
--- a/help/en/html/opie-bluetooth-manager-help-en.control
+++ b/help/en/html/opie-bluetooth-manager-help-en.control
@@ -1,10 +1,10 @@
 Package: opie-bluetooth-manager-help-en
 Files: help/en/html/bluetooth-manager.html help/en/html/bluetooth-manager
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: opie-bluetooth-manager
 License: GPL
 Description: bluetooth-manager help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-bounce-help-en.control b/help/en/html/opie-bounce-help-en.control
index b0a381e..47fa605 100644
--- a/help/en/html/opie-bounce-help-en.control
+++ b/help/en/html/opie-bounce-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-bounce-help-en
 Files: help/en/html/bounce.html help/en/html/bounce
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-bounce
 License: GPL
 Description: bounce help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-buttonsettings-help-en.control b/help/en/html/opie-buttonsettings-help-en.control
index 0d57177..2e2e475 100644
--- a/help/en/html/opie-buttonsettings-help-en.control
+++ b/help/en/html/opie-buttonsettings-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-buttonsettings-help-en
 Files: help/en/html/buttonsettings.html help/en/html/buttonsettings
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-buttonsettings
 License: GPL
 Description: buttonsettings help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-buzzword-help-en.control b/help/en/html/opie-buzzword-help-en.control
index 0fa6474..67f7fb1 100644
--- a/help/en/html/opie-buzzword-help-en.control
+++ b/help/en/html/opie-buzzword-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-buzzword-help-en
 Files: help/en/html/buzzword.html help/en/html/buzzword
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-buzzword
 License: GPL
 Description: buzzword help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-calculator-help-en.control b/help/en/html/opie-calculator-help-en.control
index 7076632..1b05f3c 100644
--- a/help/en/html/opie-calculator-help-en.control
+++ b/help/en/html/opie-calculator-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-calculator-help-en
 Files: help/en/html/calculator.html help/en/html/calculator
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-calculator
 License: GPL
 Description: calculator help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-calibrate-help-en.control b/help/en/html/opie-calibrate-help-en.control
index 169cc93..9741bce 100644
--- a/help/en/html/opie-calibrate-help-en.control
+++ b/help/en/html/opie-calibrate-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-calibrate-help-en
 Files: help/en/html/calibrate.html help/en/html/calibrate
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-calibrate
 License: GPL
 Description: calibrate help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-checkbook-help-en.control b/help/en/html/opie-checkbook-help-en.control
index 66d19f3..fed7c61 100644
--- a/help/en/html/opie-checkbook-help-en.control
+++ b/help/en/html/opie-checkbook-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-checkbook-help-en
 Files: help/en/html/checkbook.html help/en/html/checkbook
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-checkbook
 License: GPL
 Description: checkbook help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-citytime-help-en.control b/help/en/html/opie-citytime-help-en.control
index b27c58b..a2f66c4 100644
--- a/help/en/html/opie-citytime-help-en.control
+++ b/help/en/html/opie-citytime-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-citytime-help-en
 Files: help/en/html/citytime.html help/en/html/citytime
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-citytime
 License: GPL
 Description: citytime help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-clock-help-en.control b/help/en/html/opie-clock-help-en.control
index f452350..7a9a648 100644
--- a/help/en/html/opie-clock-help-en.control
+++ b/help/en/html/opie-clock-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-clock-help-en
 Files: help/en/html/clock.html help/en/html/clock
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-clock
 License: GPL
 Description: clock help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-confedit-help-en.control b/help/en/html/opie-confedit-help-en.control
index a1bd441..04d20fc 100644
--- a/help/en/html/opie-confedit-help-en.control
+++ b/help/en/html/opie-confedit-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-confedit-help-en
 Files: help/en/html/confedit.html help/en/html/confedit
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-confedit
 License: GPL
 Description: confedit help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-console-help-en.control b/help/en/html/opie-console-help-en.control
index d6ecf47..7004ce5 100644
--- a/help/en/html/opie-console-help-en.control
+++ b/help/en/html/opie-console-help-en.control
@@ -1,11 +1,11 @@
 Package: opie-console-help-en
 Files: help/en/html/opie-console.html help/en/html/opie-console/*
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Opie team <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: opie-console
 License: GPL
 Description: Opie terminal app help files (english)
- 
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-embeddedkonsole-help-en.control b/help/en/html/opie-embeddedkonsole-help-en.control
index 4c6892a..5da9e57 100644
--- a/help/en/html/opie-embeddedkonsole-help-en.control
+++ b/help/en/html/opie-embeddedkonsole-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-embeddedkonsole-help-en
 Files: help/en/html/embeddedkonsole.html
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-embeddedkonsole
 License: GPL
 Description: embeddedkonsole help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-euroconv-help-en.control b/help/en/html/opie-euroconv-help-en.control
index f83660c..876d617 100644
--- a/help/en/html/opie-euroconv-help-en.control
+++ b/help/en/html/opie-euroconv-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-euroconv-help-en
 Files: help/en/html/euroconv.html help/en/html/euroconv
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-euroconv
 License: GPL
 Description: euroconv help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-fifteen-help-en.control b/help/en/html/opie-fifteen-help-en.control
index f431487..1e1d8e4 100644
--- a/help/en/html/opie-fifteen-help-en.control
+++ b/help/en/html/opie-fifteen-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-fifteen-help-en
 Files: help/en/html/fifteen.html help/en/html/fifteen
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-fifteen
 License: GPL
 Description: fifteen help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-formatter-help-en.control b/help/en/html/opie-formatter-help-en.control
index 3d7cb15..2a298cb 100644
--- a/help/en/html/opie-formatter-help-en.control
+++ b/help/en/html/opie-formatter-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-formatter-help-en
 Files: help/en/html/formatter.html
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-formatter
 License: GPL
 Description: formatter help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-go-help-en.control b/help/en/html/opie-go-help-en.control
index 824f762..5e40369 100644
--- a/help/en/html/opie-go-help-en.control
+++ b/help/en/html/opie-go-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-go-help-en
 Files: help/en/html/go.html help/en/html/go
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-go
 License: GPL
 Description: go help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-gsmtool-help-en.control b/help/en/html/opie-gsmtool-help-en.control
index 224cf13..9671ab3 100644
--- a/help/en/html/opie-gsmtool-help-en.control
+++ b/help/en/html/opie-gsmtool-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-gsmtool-help-en
 Files: help/en/html/gsmtool.html help/en/html/gsmtool
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-gsmtool
 License: GPL
 Description: gsmtool help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-irc-help-en.control b/help/en/html/opie-irc-help-en.control
index 1fe3850..8b980c4 100644
--- a/help/en/html/opie-irc-help-en.control
+++ b/help/en/html/opie-irc-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-irc-help-en
 Files: help/en/html/opieirc.html help/en/html/opieirc
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-irc
 License: GPL
 Description: opieirc help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-kbill-help-en.control b/help/en/html/opie-kbill-help-en.control
index 39e5214..f53636e 100644
--- a/help/en/html/opie-kbill-help-en.control
+++ b/help/en/html/opie-kbill-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-kbill-help-en
 Files: help/en/html/kbill.html help/en/html/kbill
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-kbill
 License: GPL
 Description: kbill help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-kcheckers-help-en.control b/help/en/html/opie-kcheckers-help-en.control
index 3684de8..9b3a373 100644
--- a/help/en/html/opie-kcheckers-help-en.control
+++ b/help/en/html/opie-kcheckers-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-kcheckers-help-en
 Files: help/en/html/kcheckers.html help/en/html/kcheckers
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-kcheckers
 License: GPL
 Description: kcheckers help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-keypebble-help-en.control b/help/en/html/opie-keypebble-help-en.control
index c067c67..0d2f4b7 100644
--- a/help/en/html/opie-keypebble-help-en.control
+++ b/help/en/html/opie-keypebble-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-keypebble-help-en
 Files: help/en/html/keypebble.html help/en/html/keypebble
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-keypebble
 License: GPL
 Description: keypebble help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-kpacman-help-en.control b/help/en/html/opie-kpacman-help-en.control
index d572fe1..51220ce 100644
--- a/help/en/html/opie-kpacman-help-en.control
+++ b/help/en/html/opie-kpacman-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-kpacman-help-en
 Files: help/en/html/kpacman.html help/en/html/kpacman
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-kpacman
 License: GPL
 Description: kpacman help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-language-help-en.control b/help/en/html/opie-language-help-en.control
index 616c636..fd92e86 100644
--- a/help/en/html/opie-language-help-en.control
+++ b/help/en/html/opie-language-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-language-help-en
 Files: help/en/html/language.html help/en/html/language
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-language
 License: GPL
 Description: language help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-launchersettings-help-en.control b/help/en/html/opie-launchersettings-help-en.control
index 3bc8ead..9696845 100644
--- a/help/en/html/opie-launchersettings-help-en.control
+++ b/help/en/html/opie-launchersettings-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-launchersettings-help-en
 Files: help/en/html/launchersettings.html help/en/html/launchersettings
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-launchersettings
 License: GPL
 Description: launchersettings help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-light-and-power-help-en.control b/help/en/html/opie-light-and-power-help-en.control
index b563f60..765eb94 100644
--- a/help/en/html/opie-light-and-power-help-en.control
+++ b/help/en/html/opie-light-and-power-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-light-and-power-help-en
 Files: help/en/html/light-and-power.html help/en/html/light-and-power
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-light-and-power
 License: GPL
 Description: light-and-power help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-mediummount-help-en.control b/help/en/html/opie-mediummount-help-en.control
index 22261ce..ea39b1c 100644
--- a/help/en/html/opie-mediummount-help-en.control
+++ b/help/en/html/opie-mediummount-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-mediummount-help-en
 Files: help/en/html/mediummount.html help/en/html/mediummount
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-mediummount
 License: GPL
 Description: mediummount help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-mindbreaker-help-en.control b/help/en/html/opie-mindbreaker-help-en.control
index 828dde7..cc5fb25 100644
--- a/help/en/html/opie-mindbreaker-help-en.control
+++ b/help/en/html/opie-mindbreaker-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-mindbreaker-help-en
 Files: help/en/html/mindbreaker.html help/en/html/mindbreaker
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-mindbreaker
 License: GPL
 Description: mindbreaker help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-minesweep-help-en.control b/help/en/html/opie-minesweep-help-en.control
index e81ba2d..95f9fdf 100644
--- a/help/en/html/opie-minesweep-help-en.control
+++ b/help/en/html/opie-minesweep-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-minesweep-help-en
 Files: help/en/html/minesweep.html help/en/html/minesweep
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-minesweep
 License: GPL
 Description: minesweep help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-mobilemsg-help-en.control b/help/en/html/opie-mobilemsg-help-en.control
index a976e6d..0e18231 100644
--- a/help/en/html/opie-mobilemsg-help-en.control
+++ b/help/en/html/opie-mobilemsg-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-mobilemsg-help-en
 Files: help/en/html/mobilemsg.html help/en/html/mobilemsg
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-mobilemsg
 License: GPL
 Description: mobilemsg help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-networksettings-help-en.control b/help/en/html/opie-networksettings-help-en.control
index 2cf7ca9..7b0eb8e 100644
--- a/help/en/html/opie-networksettings-help-en.control
+++ b/help/en/html/opie-networksettings-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-networksettings-help-en
 Files: help/en/html/networksettings.html help/en/html/networksettings
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-networksettings
 License: GPL
 Description: networksettings help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-odict-help-en.control b/help/en/html/opie-odict-help-en.control
index 43ec937..1972b2f 100644
--- a/help/en/html/opie-odict-help-en.control
+++ b/help/en/html/opie-odict-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-odict-help-en
 Files: help/en/html/odict.html help/en/html/odict
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-odict
 License: GPL
 Description: odict help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-opie-write-help-en.control b/help/en/html/opie-opie-write-help-en.control
index cf1fe49..ad6ed9e 100644
--- a/help/en/html/opie-opie-write-help-en.control
+++ b/help/en/html/opie-opie-write-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-opie-write-help-en
 Files: help/en/html/opie-write.html help/en/html/opie-write
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-opie-write
 License: GPL
 Description: opie-write help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-opieftp-help-en.control b/help/en/html/opie-opieftp-help-en.control
index d7da397..157a6d9 100644
--- a/help/en/html/opie-opieftp-help-en.control
+++ b/help/en/html/opie-opieftp-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-opieftp-help-en
 Files: help/en/html/opieftp.html help/en/html/opieftp
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-opieftp
 License: GPL
 Description: opieftp help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-opieirc-help-en.control b/help/en/html/opie-opieirc-help-en.control
index a5027e0..706f143 100644
--- a/help/en/html/opie-opieirc-help-en.control
+++ b/help/en/html/opie-opieirc-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-opieirc-help-en
 Files: help/en/html/opieirc.html help/en/html/opieirc
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-opieirc
 License: GPL
 Description: opieirc help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-opieplayer-help-en.control b/help/en/html/opie-opieplayer-help-en.control
index d3ac2fd..a45abac 100644
--- a/help/en/html/opie-opieplayer-help-en.control
+++ b/help/en/html/opie-opieplayer-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-opieplayer-help-en
 Files: help/en/html/opieplayer.html help/en/html/opieplayer
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-opieplayer
 License: GPL
 Description: opieplayer help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-opierec-help-en.control b/help/en/html/opie-opierec-help-en.control
index bc17507..778de2d 100644
--- a/help/en/html/opie-opierec-help-en.control
+++ b/help/en/html/opie-opierec-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-opierec-help-en
 Files: help/en/html/opierec.html
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-opierec
 License: GPL
 Description: opierec help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-oxygen-help-en.control b/help/en/html/opie-oxygen-help-en.control
index 8ee0c52..f6cb618 100644
--- a/help/en/html/opie-oxygen-help-en.control
+++ b/help/en/html/opie-oxygen-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-oxygen-help-en
 Files: help/en/html/oxygen.html help/en/html/oxygen
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-oxygen
 License: GPL
 Description: oxygen help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-parashoot-help-en.control b/help/en/html/opie-parashoot-help-en.control
index 56e2ed2..9d0cfd6 100644
--- a/help/en/html/opie-parashoot-help-en.control
+++ b/help/en/html/opie-parashoot-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-parashoot-help-en
 Files: help/en/html/parashoot.html help/en/html/parashoot
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-parashoot
 License: GPL
 Description: parashoot help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-patience-help-en.control b/help/en/html/opie-patience-help-en.control
index b81862d..0214e4a 100644
--- a/help/en/html/opie-patience-help-en.control
+++ b/help/en/html/opie-patience-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-patience-help-en
 Files: help/en/html/patience.html help/en/html/patience
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-patience
 License: GPL
 Description: patience help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-qasteroids-help-en.control b/help/en/html/opie-qasteroids-help-en.control
index ba81572..52fe011 100644
--- a/help/en/html/opie-qasteroids-help-en.control
+++ b/help/en/html/opie-qasteroids-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-qasteroids-help-en
 Files: help/en/html/qasteroids.html help/en/html/qasteroids
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-qasteroids
 License: GPL
 Description: qasteroids help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-qpdf-help-en.control b/help/en/html/opie-qpdf-help-en.control
index a87b8bb..77b624a 100644
--- a/help/en/html/opie-qpdf-help-en.control
+++ b/help/en/html/opie-qpdf-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-qpdf-help-en
 Files: help/en/html/qpdf.html help/en/html/qpdf
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-qpdf
 License: GPL
 Description: qpdf help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-reader-help-en.control b/help/en/html/opie-reader-help-en.control
index 2a4194e..b72da02 100644
--- a/help/en/html/opie-reader-help-en.control
+++ b/help/en/html/opie-reader-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-reader-help-en
 Files: help/en/html/reader.html help/en/html/reader
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-reader
 License: GPL
 Description: reader help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-remote-help-en.control b/help/en/html/opie-remote-help-en.control
index 94f03a8..17127de 100644
--- a/help/en/html/opie-remote-help-en.control
+++ b/help/en/html/opie-remote-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-remote-help-en
 Files: help/en/html/remote.html help/en/html/remote
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-remote
 License: GPL
 Description: remote help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-rotation-help-en.control b/help/en/html/opie-rotation-help-en.control
index b5593b1..79c4135 100644
--- a/help/en/html/opie-rotation-help-en.control
+++ b/help/en/html/opie-rotation-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-rotation-help-en
 Files: help/en/html/rotation.html help/en/html/rotation
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-rotation
 License: GPL
 Description: rotation help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-security-help-en.control b/help/en/html/opie-security-help-en.control
index 3aef0e0..1fad1d0 100644
--- a/help/en/html/opie-security-help-en.control
+++ b/help/en/html/opie-security-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-security-help-en
 Files: help/en/html/security.html help/en/html/security
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-security
 License: GPL
 Description: security help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-sfcave-help-en.control b/help/en/html/opie-sfcave-help-en.control
index b8f1ab6..4b75586 100644
--- a/help/en/html/opie-sfcave-help-en.control
+++ b/help/en/html/opie-sfcave-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-sfcave-help-en
 Files: help/en/html/sfcave.html help/en/html/sfcave
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-sfcave
 License: GPL
 Description: sfcave help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-sheetqt-help-en.control b/help/en/html/opie-sheetqt-help-en.control
index de47fe5..2465180 100644
--- a/help/en/html/opie-sheetqt-help-en.control
+++ b/help/en/html/opie-sheetqt-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-sheetqt-help-en
 Files: help/en/html/sheetqt.html help/en/html/sheetqt
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-sheetqt
 License: GPL
 Description: sheetqt help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-showimg-help-en.control b/help/en/html/opie-showimg-help-en.control
index e4fced5..c8245b6 100644
--- a/help/en/html/opie-showimg-help-en.control
+++ b/help/en/html/opie-showimg-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-showimg-help-en
 Files: help/en/html/showimg.html help/en/html/showimg
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-showimg
 License: GPL
 Description: showimg help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-shutdown-help-en.control b/help/en/html/opie-shutdown-help-en.control
index cf4b153..2a290f4 100644
--- a/help/en/html/opie-shutdown-help-en.control
+++ b/help/en/html/opie-shutdown-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-shutdown-help-en
 Files: help/en/html/shutdown.html help/en/html/shutdown
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-shutdown
 License: GPL
 Description: shutdown help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-snake-help-en.control b/help/en/html/opie-snake-help-en.control
index 4b82cf9..74c42e9 100644
--- a/help/en/html/opie-snake-help-en.control
+++ b/help/en/html/opie-snake-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-snake-help-en
 Files: help/en/html/snake.html help/en/html/snake
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-snake
 License: GPL
 Description: snake help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-sound-help-en.control b/help/en/html/opie-sound-help-en.control
index cb34934..f870a37 100644
--- a/help/en/html/opie-sound-help-en.control
+++ b/help/en/html/opie-sound-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-sound-help-en
 Files: help/en/html/sound.html help/en/html/sound
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-sound
 License: GPL
 Description: sound help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-sshkeys-help-en.control b/help/en/html/opie-sshkeys-help-en.control
index f3528c2..43b8f0c 100644
--- a/help/en/html/opie-sshkeys-help-en.control
+++ b/help/en/html/opie-sshkeys-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-sshkeys-help-en
 Files: help/en/html/sshkeys.html help/en/html/sshkeys
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-sshkeys
 License: GPL
 Description: sshkeys help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-sysinfo-help-en.control b/help/en/html/opie-sysinfo-help-en.control
index 21ccd27..d901990 100644
--- a/help/en/html/opie-sysinfo-help-en.control
+++ b/help/en/html/opie-sysinfo-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-sysinfo-help-en
 Files: help/en/html/sysinfo.html help/en/html/sysinfo
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-sysinfo
 License: GPL
 Description: sysinfo help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-systemtime-help-en.control b/help/en/html/opie-systemtime-help-en.control
index 6b16f46..ab02a4f 100644
--- a/help/en/html/opie-systemtime-help-en.control
+++ b/help/en/html/opie-systemtime-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-systemtime-help-en
 Files: help/en/html/systemtime.html help/en/html/systemtime
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-systemtime
 License: GPL
 Description: systemtime help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-tableviewer-help-en.control b/help/en/html/opie-tableviewer-help-en.control
index 3394367..aa6f959 100644
--- a/help/en/html/opie-tableviewer-help-en.control
+++ b/help/en/html/opie-tableviewer-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-tableviewer-help-en
 Files: help/en/html/tableviewer.html help/en/html/tableviewer
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-tableviewer
 License: GPL
 Description: tableviewer help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-tetrix-help-en.control b/help/en/html/opie-tetrix-help-en.control
index c5a09f9..c006a4b 100644
--- a/help/en/html/opie-tetrix-help-en.control
+++ b/help/en/html/opie-tetrix-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-tetrix-help-en
 Files: help/en/html/tetrix.html help/en/html/tetrix
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-tetrix
 License: GPL
 Description: tetrix help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-tictac-help-en.control b/help/en/html/opie-tictac-help-en.control
index 5336b2a..e0b715e 100644
--- a/help/en/html/opie-tictac-help-en.control
+++ b/help/en/html/opie-tictac-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-tictac-help-en
 Files: help/en/html/tictac.html help/en/html/tictac
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-tictac
 License: GPL
 Description: tictac help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-tinykate-help-en.control b/help/en/html/opie-tinykate-help-en.control
index 602bfd2..fe228f0 100644
--- a/help/en/html/opie-tinykate-help-en.control
+++ b/help/en/html/opie-tinykate-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-tinykate-help-en
 Files: help/en/html/tinykate.html help/en/html/tinykate
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-tinykate
 License: GPL
 Description: tinykate help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-ubrowser-help-en.control b/help/en/html/opie-ubrowser-help-en.control
index 98b3b7a..0798b44 100644
--- a/help/en/html/opie-ubrowser-help-en.control
+++ b/help/en/html/opie-ubrowser-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-ubrowser-help-en
 Files: help/en/html/ubrowser.html help/en/html/ubrowser
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-ubrowser
 License: GPL
 Description: ubrowser help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-usermanager-help-en.control b/help/en/html/opie-usermanager-help-en.control
index 9642da1..fd16672 100644
--- a/help/en/html/opie-usermanager-help-en.control
+++ b/help/en/html/opie-usermanager-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-usermanager-help-en
 Files: help/en/html/usermanager.html help/en/html/usermanager
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-usermanager
 License: GPL
 Description: usermanager help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-vmemo-help-en.control b/help/en/html/opie-vmemo-help-en.control
index c81f29a..c379f8c 100644
--- a/help/en/html/opie-vmemo-help-en.control
+++ b/help/en/html/opie-vmemo-help-en.control
@@ -1,11 +1,11 @@
 Package: opie-vmemo-help-en
 Files: help/en/html/vmemo.html
 Priority: optional
 Section: opie/onlinedoc
 Maintainer: ljp <llornkcor@handhelds.org>
 Architecture: arm
 Depends: opie-vmemo
 License: GPL
 Description: Opie Vmemo voice recording help files (english)
- 
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-wellenreiter-help-en.control b/help/en/html/opie-wellenreiter-help-en.control
index 33aa974..b93f097 100644
--- a/help/en/html/opie-wellenreiter-help-en.control
+++ b/help/en/html/opie-wellenreiter-help-en.control
@@ -1,11 +1,11 @@
 Package: opie-wellenreiter-help-en
 Files: help/en/html/wellenreiter.html
 Priority: optional
 Section: opie/onlinedoc
 Maintainer: Michael 'Mickey' Lauer <mickeyl@handhelds.org>
 Architecture: arm
 Depends: opie-wellenreiter
 License: GPL
 Description: Opie Wellenreiter help files (english)
- 
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-wlansetup-help-en.control b/help/en/html/opie-wlansetup-help-en.control
index 7f555f7..4cabb21 100644
--- a/help/en/html/opie-wlansetup-help-en.control
+++ b/help/en/html/opie-wlansetup-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-wlansetup-help-en
 Files: help/en/html/wlansetup.html help/en/html/wlansetup
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-wlansetup
 License: GPL
 Description: wlansetup help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-wordgame-help-en.control b/help/en/html/opie-wordgame-help-en.control
index f9961fc..79e6ffe 100644
--- a/help/en/html/opie-wordgame-help-en.control
+++ b/help/en/html/opie-wordgame-help-en.control
@@ -1,9 +1,9 @@
 Package: opie-wordgame-help-en
 Files: help/en/html/wordgame.html help/en/html/wordgame
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-wordgame
 License: GPL
 Description: wordgame help files (en)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/libopie/libopie1.control b/libopie/libopie1.control
index 76e4c7a..5b6825e 100644
--- a/libopie/libopie1.control
+++ b/libopie/libopie1.control
@@ -1,11 +1,11 @@
 Package: libopie1
-Files: $OPIEDIR/lib/libopie.so.1.0.0 $OPIEDIR/lib/libopie.so.1.0 $OPIEDIR/lib/libopie.so.1
+Files: lib/libopie.so.1.0.0 lib/libopie.so.1.0 lib/libopie.so.1
 Priority: optional
 Section: opie/system
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: libqte2 (>=$QTE_VERSION), libqpe1, opie-pics
 Provides: libopie
 Replaces: libopie
 Description: Opie library
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/libopie2/opiecore/libopiecore2.control b/libopie2/opiecore/libopiecore2.control
index 4679f28..9c6e6d0 100644
--- a/libopie2/opiecore/libopiecore2.control
+++ b/libopie2/opiecore/libopiecore2.control
@@ -1,11 +1,11 @@
 Package: libopiecore2
-Files: $OPIEDIR/lib/libopiecore2.so.*
+Files: lib/libopiecore2.so.*
 Priority: optional
 Section: opie/system
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Version: 1.8.5-$SUB_VERSION.1
 Depends: libqpe1
 Provides: libopiecore2
 Description: Opie library 2.0 CORE
diff --git a/libopie2/opiedb/libopiedb2.control b/libopie2/opiedb/libopiedb2.control
index 5500dc8..eb54872 100644
--- a/libopie2/opiedb/libopiedb2.control
+++ b/libopie2/opiedb/libopiedb2.control
@@ -1,11 +1,11 @@
 Package: libopiedb2
-Files: $OPIEDIR/lib/libopiedb2.so*
+Files: lib/libopiedb2.so*
 Priority: optional
 Section: opie/system
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Version: 1.8.2-$SUB_VERSION.2
 Depends: libqpe1, libopiecore2 (1.8.2)
 Provides: libopiedb2
 Description: Opie library 2.0 DB
diff --git a/libopie2/opiemm/libopiemm2.control b/libopie2/opiemm/libopiemm2.control
index f528969..bcb239e 100644
--- a/libopie2/opiemm/libopiemm2.control
+++ b/libopie2/opiemm/libopiemm2.control
@@ -1,11 +1,11 @@
 Package: libopiemm2
-Files: $OPIEDIR/lib/libopiemm2.so.*
+Files: lib/libopiemm2.so.*
 Priority: optional
 Section: opie/system
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Version: 1.8.2-$SUB_VERSION.2
 Depends: libqpe1, libopiecore2 (1.8.2)
 Provides: libopiemm2
 Description: Opie library 2.0 MM
diff --git a/libopie2/opienet/libopienet2.control b/libopie2/opienet/libopienet2.control
index a45eb2d..a4fdc83 100644
--- a/libopie2/opienet/libopienet2.control
+++ b/libopie2/opienet/libopienet2.control
@@ -1,11 +1,11 @@
 Package: libopienet2
-Files: $OPIEDIR/lib/libopienet2.so.* $OPIEDIR/etc/manufacturers
+Files: lib/libopienet2.so.* etc/manufacturers
 Priority: optional
 Section: opie/system
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Version: 1.8.3-$SUB_VERSION
 Depends: libopiecore2 (1.8.3)
 Provides: libopienet2
 Description: Opie library 2.0 NET
diff --git a/libopie2/opiepim/libopiepim2.control b/libopie2/opiepim/libopiepim2.control
index ac8e13c..add39a5 100644
--- a/libopie2/opiepim/libopiepim2.control
+++ b/libopie2/opiepim/libopiepim2.control
@@ -1,11 +1,11 @@
 Package: libopiepim2
-Files: $OPIEDIR/lib/libopiepim2.so.*
+Files: lib/libopiepim2.so.*
 Priority: optional
 Section: opie/system
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Version: 1.8.2-$SUB_VERSION.2
 Depends: libqpe1, libopiecore2 (1.8.2)
 Provides: libopiepim2
 Description: Opie library 2.0 PIM
diff --git a/libopie2/opieui/libopieui2.control b/libopie2/opieui/libopieui2.control
index 6f61f53..0116e9b 100644
--- a/libopie2/opieui/libopieui2.control
+++ b/libopie2/opieui/libopieui2.control
@@ -1,11 +1,11 @@
 Package: libopieui2
-Files: $OPIEDIR/lib/libopieui2.so.*
+Files: lib/libopieui2.so.*
 Priority: optional
 Section: opie/system
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Version: 1.8.5-$SUB_VERSION.1
 Depends: libqpe1, libopiecore2 (1.8.5)
 Provides: libopieui2
 Description: Opie library 2.0 UI
diff --git a/libqtaux/libqtaux.control b/libqtaux/libqtaux.control
index 782a8f4..a3a8ece 100644
--- a/libqtaux/libqtaux.control
+++ b/libqtaux/libqtaux.control
@@ -1,10 +1,10 @@
 Package: libqtaux2
-Files: $OPIEDIR/lib/libqtaux2.so.*
+Files: lib/libqtaux2.so.*
 Priority: optional
 Section: opie/system
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Version: 2.3.7-1
 Depends: libqte2
 Provides: libqtaux
 Description: Qt/Embedded Auxilliary Stuff
diff --git a/library/libqpe1.control b/library/libqpe1.control
index 16fca0a..d2834eb 100644
--- a/library/libqpe1.control
+++ b/library/libqpe1.control
@@ -1,9 +1,9 @@
 Package: libqpe1
-Files: $OPIEDIR/lib/libqpe.so.1 $OPIEDIR/lib/libqpe.so.1.5 $OPIEDIR/lib/libqpe.so.1.5.0
+Files: lib/libqpe.so.1 lib/libqpe.so.1.5 lib/libqpe.so.1.5.0
 Priority: required
 Section: opie/system
-Maintainer:  Project Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: libqte2 (>=2.3.4-beta4), qte-fonts (>=$QTE_VERSION)
 Description: libqpe, base qtopia/opie library.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/library/opie-bootsplash.control b/library/opie-bootsplash.control
index fc03ecc..f8d09a8 100644
--- a/library/opie-bootsplash.control
+++ b/library/opie-bootsplash.control
@@ -1,8 +1,8 @@
 Package: opie-bootsplash
 Files: etc/init.d/bootsplash etc/rcS.d/S01bootsplash pics/bootsplash/bootlogo
 Priority: optinal
 Section: opie/system
-Maintainer:  Project Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Description: Splash screen aptempt
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/library/opie-common.control b/library/opie-common.control
index 9cb0c75..9e7f1d3 100644
--- a/library/opie-common.control
+++ b/library/opie-common.control
@@ -1,10 +1,10 @@
 Package: opie-common
 Files: etc/colors bin/opie-reorgfiles apps/*/.directory etc/mime.types apps/Settings/quit.desktop pics/logo/*
 Priority: required
 Section: opie/system
-Maintainer:  Project Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: libqpe1, qte-fonts, qpf-bitstream-vera
 Replaces: opie-base
 Description: Core opie files
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/library/task-opie-applets.control b/library/task-opie-applets.control
index 556da9a..8d19d55 100644
--- a/library/task-opie-applets.control
+++ b/library/task-opie-applets.control
@@ -1,10 +1,10 @@
 Package: task-opie-applets
 Files:
 Priority: optional
-Section: opie/system
+Section: opie/applets
 Maintainer: Maximilian Reiss <max.reiss@gmx.de>
 Architecture: arm
 Depends: task-opie-minimal, opie-batteryapplet, opie-clockapplet, opie-vmemo, opie-volumeapplet, opie-screenshotapplet, opie-pickboard, opie-multikey, opie-jumpx, opie-handwriting, opie-dvorak, opie-unikeyboard
 Description: Opie taskbar applets
 All applets for the taskbar
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/applets/autorotateapplet/opie-autorotate.control b/noncore/applets/autorotateapplet/opie-autorotate.control
index 4ab141c..9e726e9 100644
--- a/noncore/applets/autorotateapplet/opie-autorotate.control
+++ b/noncore/applets/autorotateapplet/opie-autorotate.control
@@ -1,11 +1,11 @@
 Package: opie-autorotate
-Files: plugins/applets/libautorotateapplet.so* pics/autorotate/*.png 
+Files: plugins/applets/libautorotateapplet.so* pics/autorotate/*.png
 Priority: optional
-Section: opie/taskbar
+Section: opie/applets
 Maintainer: Greg Gilbert <greg@treke.net>
 Architecture: arm
 Depends: task-opie-minimal, libopie1
 Description: Automatic screen rotation applet
 Taskbar applet for enabled and disabling the automatic rotation
 of the screen based on your devices physical orientation/
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/applets/memoryapplet/opie-memoryapplet.control b/noncore/applets/memoryapplet/opie-memoryapplet.control
index 0f42052..12026a4 100644
--- a/noncore/applets/memoryapplet/opie-memoryapplet.control
+++ b/noncore/applets/memoryapplet/opie-memoryapplet.control
@@ -1,10 +1,10 @@
 Package: opie-memoryapplet
-Files: plugins/applets/libmemoryapplet.so* $OPIEDIR/pics/memory
+Files: plugins/applets/libmemoryapplet.so* pics/memory
 Priority: optional
-Section: opie/system
+Section: opie/applets
 Maintainer: Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Memory Applet
 This applet displays the amount of free memory and manages the swap partition
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/applets/networkapplet/opie-networkapplet.control b/noncore/applets/networkapplet/opie-networkapplet.control
index f4ee7be..c4b0ce4 100644
--- a/noncore/applets/networkapplet/opie-networkapplet.control
+++ b/noncore/applets/networkapplet/opie-networkapplet.control
@@ -1,10 +1,10 @@
 Package: opie-networkapplet
 Files: plugins/applets/libnetworkapplet.so* pics/networkapplet
 Priority: optional
-Section: opie/system
+Section: opie/applets
 Maintainer: Michael 'Mickey' Lauer <mickeyl@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal, libopie2 (1.8.1), opie-networksettings
 Description: Network Applet
 A taskbar applet for controlling network interfaces
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/applets/notesapplet/opie-notesapplet.control b/noncore/applets/notesapplet/opie-notesapplet.control
index f19b964..b90bf0a 100644
--- a/noncore/applets/notesapplet/opie-notesapplet.control
+++ b/noncore/applets/notesapplet/opie-notesapplet.control
@@ -1,10 +1,10 @@
 Package: opie-notesapplet
-Files: plugins/applets/libnotesapplet.so* 
+Files: plugins/applets/libnotesapplet.so*
 Priority: optional
-Section: opie/system
+Section: opie/applets
 Maintainer: L. J. Potter <ljp@llornkcor.com>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Notes Applet
 A simple taskbar applet for making quick notes.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/applets/wirelessapplet/opie-wirelessapplet.control b/noncore/applets/wirelessapplet/opie-wirelessapplet.control
index 6dfa214..a4998d1 100644
--- a/noncore/applets/wirelessapplet/opie-wirelessapplet.control
+++ b/noncore/applets/wirelessapplet/opie-wirelessapplet.control
@@ -1,10 +1,10 @@
 Package: opie-wirelessapplet
-Files: plugins/applets/libwirelessapplet.so* 
+Files: plugins/applets/libwirelessapplet.so*
 Priority: optional
-Section: opie/system
+Section: opie/applets
 Maintainer: Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Wireless Applet
 A wireless network card status taskbar applet for the Opie environment
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/checkbook/opie-checkbook.control b/noncore/apps/checkbook/opie-checkbook.control
index 58e0076..95da438 100644
--- a/noncore/apps/checkbook/opie-checkbook.control
+++ b/noncore/apps/checkbook/opie-checkbook.control
@@ -1,10 +1,10 @@
 Package: opie-checkbook
 Files: plugins/application/libcheckbook.so* bin/checkbook apps/Applications/checkbook.desktop pics/checkbook
 Priority: optional
-Section: applications
+Section: opie/applications
 Maintainer: Dan Williams <drw@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal, libopie1
 Description: Checkbook keeping program.
 The checkbook accounting program for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/confedit/opie-confeditor.control b/noncore/apps/confedit/opie-confeditor.control
index 6d57266..ca35edb 100644
--- a/noncore/apps/confedit/opie-confeditor.control
+++ b/noncore/apps/confedit/opie-confeditor.control
@@ -1,10 +1,10 @@
 Package: opie-confeditor
 Files: bin/confedit apps/Settings/confedit.desktop pics/confedit/confedit.png
 Priority: optional
-Section: opie/
+Section: opie/settings
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Description: An enditor for the ~/Settings/*.conf files
diff --git a/noncore/apps/odict/opie-odict.control b/noncore/apps/odict/opie-odict.control
index bfc6d72..b36a84d 100644
--- a/noncore/apps/odict/opie-odict.control
+++ b/noncore/apps/odict/opie-odict.control
@@ -1,10 +1,10 @@
 Package: opie-odict
 Files: plugins/application/libodict.so* bin/odict apps/Applications/odict.desktop pics/odict/odict.png
 Priority: optional
-Section: applications
+Section: opie/applications
 Maintainer: Carsten Niehaus <cniehaus@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Dictionarylookupprogram
 Look up words :)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/opie-bartender/opie-bartender.control b/noncore/apps/opie-bartender/opie-bartender.control
index bb72352..acd3304 100644
--- a/noncore/apps/opie-bartender/opie-bartender.control
+++ b/noncore/apps/opie-bartender/opie-bartender.control
@@ -1,10 +1,10 @@
 Files: bin/bartender apps/Applications/bartender.desktop
 Priority: optional
 Package: opie-bartender
-Section: opie
+Section: opie/applications
 Maintainer: L.J. Potter <lpotter@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: qpe-base ($QPE_VERSION)
-Description: Bartender drink receipe database lookup, and 
+Description: Bartender drink receipe database lookup, and
 blood alcohol estimator.
diff --git a/noncore/apps/opie-reader/opie-reader.control b/noncore/apps/opie-reader/opie-reader.control
index 841b040..a79566e 100644
--- a/noncore/apps/opie-reader/opie-reader.control
+++ b/noncore/apps/opie-reader/opie-reader.control
@@ -1,10 +1,10 @@
 Package: opie-reader
 Files: bin/reader bin/reader apps/Applications/opie-reader.desktop pics/opie-reader/*
 Priority: optional
-Section: applications
+Section: opie/applications
 Maintainer: Tim Wentford <timwentford@hotmail.com>
 Architecture: arm
 Depends: task-opie-minimal
 License: GPL
 Description: E-Book reader
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/oxygen/opie-oxygen.control b/noncore/apps/oxygen/opie-oxygen.control
index 6f3c832..fc834f3 100644
--- a/noncore/apps/oxygen/opie-oxygen.control
+++ b/noncore/apps/oxygen/opie-oxygen.control
@@ -1,10 +1,10 @@
 Package: opie-oxygen
 Files: plugins/application/liboxygen.so* bin/oxygen apps/Applications/oxygen.desktop pics/oxygen/oxygen.png share/oxygen/*
 Priority: optional
-Section: applications
+Section: opie/applications
 Maintainer: Carsten Niehaus <cniehaus@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
-Description: Periodic System of the Elements 
+Description: Periodic System of the Elements
 The chemistry application for the Opie-environment
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/tinykate/opie-tinykate.control b/noncore/apps/tinykate/opie-tinykate.control
index 9bc0130..5de7abb 100644
--- a/noncore/apps/tinykate/opie-tinykate.control
+++ b/noncore/apps/tinykate/opie-tinykate.control
@@ -1,9 +1,9 @@
 Package: opie-tinykate
-Files: plugins/application/libkate.so* bin/kate apps/Applications/tinykate.desktop pics/tinykate $OPIEDIR/lib/libtinykate.so.1.0.0 $OPIEDIR/lib/libtinykate.so.1.0 $OPIEDIR/lib/libtinykate.so.1
+Files: plugins/application/libkate.so* bin/kate apps/Applications/tinykate.desktop pics/tinykate lib/libtinykate.so.1.0.0 lib/libtinykate.so.1.0 lib/libtinykate.so.1
 Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Kate for opie
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/zsafe/opie-zsafe.control b/noncore/apps/zsafe/opie-zsafe.control
index a2c2e4d..b58a987 100644
--- a/noncore/apps/zsafe/opie-zsafe.control
+++ b/noncore/apps/zsafe/opie-zsafe.control
@@ -1,9 +1,9 @@
 Package: opie-zsafe
 Files: bin/zsafe apps/Applications/zsafe.desktop pics/zsafe/*.png
 Priority: optional
-Section: applications
+Section: opie/applications
 Version: $QPE_VERSION$EXTRAVERSION
 Architecture: arm
 Depends: task-opie-minimal
 Maintainer: Carsten Schneider <zcarsten@gmx.net>
 Description: This is a password manager program for Opie.
diff --git a/noncore/comm/mobilemsg/opie-mobilemsg.control b/noncore/comm/mobilemsg/opie-mobilemsg.control
index 8a177ce..6043ba0 100644
--- a/noncore/comm/mobilemsg/opie-mobilemsg.control
+++ b/noncore/comm/mobilemsg/opie-mobilemsg.control
@@ -1,10 +1,10 @@
 Package: opie-mobilemsg
-Files: plugins/application/libmobilemsg.so* bin/mobilemsg apps/Applications/mobilemsg.desktop pics/mobilemsg 
+Files: plugins/application/libmobilemsg.so* bin/mobilemsg apps/Applications/mobilemsg.desktop pics/mobilemsg
 Priority: optional
-Section: opie/comm
+Section: opie/applications
 Maintainer: Bruno Rodrigues <bruno.rodrigues@litux.org>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Mobile Messaging
 For the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/decorations/flat/opie-deco-flat.control b/noncore/decorations/flat/opie-deco-flat.control
index 311f37b..89915a4 100644
--- a/noncore/decorations/flat/opie-deco-flat.control
+++ b/noncore/decorations/flat/opie-deco-flat.control
@@ -1,10 +1,10 @@
 Package: opie-deco-flat
 Files: plugins/decorations/libflat.so*
 Priority: optional
-Section: opie/decorations
+Section: opie/system
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 Description: OPIE window decoration style
 Flat window decoration style for OPIE.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/decorations/liquid/opie-deco-liquid.control b/noncore/decorations/liquid/opie-deco-liquid.control
index c14b8bf..cdc1764 100644
--- a/noncore/decorations/liquid/opie-deco-liquid.control
+++ b/noncore/decorations/liquid/opie-deco-liquid.control
@@ -1,10 +1,10 @@
 Package: opie-deco-liquid
 Files: plugins/decorations/libliquid.so*
 Priority: optional
-Section: opie/decorations
+Section: opie/system
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 Description: OPIE window decoration style
 Liquid (KDE3) window decoration style for OPIE.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/decorations/polished/opie-deco-polished.control b/noncore/decorations/polished/opie-deco-polished.control
index 15afa83..306973e 100644
--- a/noncore/decorations/polished/opie-deco-polished.control
+++ b/noncore/decorations/polished/opie-deco-polished.control
@@ -1,10 +1,10 @@
 Package: opie-deco-polished
 Files: plugins/decorations/libpolished.so*
 Priority: optional
-Section: opie/decorations
+Section: opie/system
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 Description: OPIE window decoration style
 Blended window decoration style for OPIE.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/games/sfcave-sdl/sfcave-sdl.control b/noncore/games/sfcave-sdl/sfcave-sdl.control
index 6a5773b..3c0ce3a 100644
--- a/noncore/games/sfcave-sdl/sfcave-sdl.control
+++ b/noncore/games/sfcave-sdl/sfcave-sdl.control
@@ -1,10 +1,10 @@
 Files: plugins/application/libsfcave-sdl.so* bin/sfcave-sdl apps/Games/sfcave-sdl.desktop pics/sfcave-sdl sounds/sfcave-sdl
 Package: sfcave-sdl
 Priority: optional
-Section: Games
+Section: libs
 Architecture: arm
 Maintainer: Andy Qua (andy.qua@blueyonder.co.uk)
 Depends:  libSDL,libSDL_-mixer,libSDL-image,libSDL-gfx
 Description: SFCave SDL for the Zaurus. Fly though the cave avoiding the walls.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/graphics/drawpad/opie-drawpad.control b/noncore/graphics/drawpad/opie-drawpad.control
index 2bf78f0..f0aa0b4 100644
--- a/noncore/graphics/drawpad/opie-drawpad.control
+++ b/noncore/graphics/drawpad/opie-drawpad.control
@@ -1,12 +1,12 @@
 Package: opie-drawpad
 Files: plugins/application/libdrawpad.so* bin/drawpad apps/1Pim/drawpad.desktop pics/drawpad
 Priority: optional
-Section: opie/applications
+Section: opie/pim
 Maintainer: S�bastien Prud'homme <prudhomme@laposte.net>
 Architecture: arm
 Depends: task-opie-minimal, libopie1
 Description: A note taking program with basic draw tools
 DrawPad is an easy note taking program for Zaurus.  It can also
 be used to draw simple images. DrawPad was developed for the Opie
 project, an alternative to the standard Zaurus environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/multimedia/camera/opie-camera.control b/noncore/multimedia/camera/opie-camera.control
index 969f9d9..80647e6 100644
--- a/noncore/multimedia/camera/opie-camera.control
+++ b/noncore/multimedia/camera/opie-camera.control
@@ -1,10 +1,10 @@
 Package: opie-camera
 Files: lib/libopiecam.* bin/opiecam bin/capture pics/camera apps/Applications/camera.desktop
 Priority: optional
-Section: opie/applications
+Section: opie/multimedia
-Maintainer: Michael 'Mickey' Lauer <mickeyl@Vanille.de> 
+Maintainer: Michael 'Mickey' Lauer <mickeyl@Vanille.de>
 Architecture: arm
 Version: 1.0.1
 Depends: libqpe1, libopiecore2
 Description: A Camera Application
 A Camera Application to use with the Sharp CE-AG06.
diff --git a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-Pod.control b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-Pod.control
index faa041b..86dac97 100644
--- a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-Pod.control
+++ b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-Pod.control
@@ -1,8 +1,8 @@
 Package: opie-mediaplayer2-skin-Pod
 Files: pics/mediaplayer/skins/Pod
 Priority: optional
-Section: opie/applications
+Section: opie/playerskins
 Maintainer: ljp <llornkcor@handhelds.org>
-Description: Opie Mediaplayer's skin. 
+Description: Opie Mediaplayer's skin.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-techno.control b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-techno.control
index 825b274..e9f2f15 100644
--- a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-techno.control
+++ b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-techno.control
@@ -1,8 +1,8 @@
 Package: opie-mediaplayer2-skin-techno
 Files: pics/mediaplayer/skins/techno
 Priority: optional
-Section: opie/applications
+Section: opie/playerskins
 Maintainer: L.J. Potter <lpotter@trolltech.com>
 Description: Techno Opie Mediaplayer's skin. Adapted from Qtopia
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/multimedia/opieplayer2/opie-mediaplayer2-codecs.control b/noncore/multimedia/opieplayer2/opie-mediaplayer2-codecs.control
index 0e71fc5..1d0fbfb 100644
--- a/noncore/multimedia/opieplayer2/opie-mediaplayer2-codecs.control
+++ b/noncore/multimedia/opieplayer2/opie-mediaplayer2-codecs.control
@@ -1,10 +1,10 @@
 Package:        opie-mediaplayer2-codecs
-        Files:          root/usr/lib/libao.so* root/usr/lib/libogg* root/usr/lib/libvorbisidec.so* root/usr/lib/libxine.so* root/usr/lib/xine/*
+Files:         root/usr/lib/libao.so* root/usr/lib/libogg* root/usr/lib/libvorbisidec.so* root/usr/lib/libxine.so* root/usr/lib/xine/*
-Section:        opie/multimedia
+Section:        ;ibs
 Essential:      no
 Priority:       optional
 Version:        0.7-$SUB_VERSION.3
 Architecture:   arm
 Maintainer:     Maximilian Reiss <harlekin@handhelds.org>
 Depends:        libc6 (>= 2.1), opie-mediaplayer2
 Description:    Codecs for opieplayer 2
diff --git a/noncore/multimedia/opieplayer2/opie-mediaplayer2.control b/noncore/multimedia/opieplayer2/opie-mediaplayer2.control
index 5485bbf..2f4aea5 100644
--- a/noncore/multimedia/opieplayer2/opie-mediaplayer2.control
+++ b/noncore/multimedia/opieplayer2/opie-mediaplayer2.control
@@ -1,11 +1,11 @@
 Package: opie-mediaplayer2
 Files: plugins/application/libopieplayer2.so* bin/opieplayer2  apps/Applications/mediaplayer.desktop pics/opieplayer2/add_to_playlist.png pics/opieplayer2/cut.png pics/opieplayer2/delete.png  pics/opieplayer2/down.png  pics/opieplayer2/loop.png pics/opieplayer2/MPEGPlayer.png pics/opieplayer2/musicfile.png pics/opieplayer2/playlist2.png pics/opieplayer2/play.png pics/opieplayer2/remove_from_playlist.png pics/opieplayer2/shuffle.png  pics/opieplayer2/up.png pics/opieplayer2/videofile.png
 Priority: optional
-Section: opie/applications
+Section: opie/multimedia
 Maintainer: L.J.Potter <ljp@llornkcor.com>, Maximilian Reiss <harlekin@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal, libopie1, zlib1g, opie-mediaplayer2-skin-default | opie-mediaplayer2-skin-default-landscape , libxine1 | opie-mediaplayer2-codecs
 Description: The Opie media player
 The mediaplayer for Opie. It plays mp3, mpeg, wav, ogg, quicktime, divx and
 more. Also it is streaming capable.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/multimedia/opierec/opierec.control b/noncore/multimedia/opierec/opierec.control
index d7567e6..eb7e5d1 100644
--- a/noncore/multimedia/opierec/opierec.control
+++ b/noncore/multimedia/opierec/opierec.control
@@ -1,10 +1,10 @@
 Package: opierec
-Files: bin/opierec pics/opierec apps/Applications/opierec.desktop 
+Files: bin/opierec pics/opierec apps/Applications/opierec.desktop
 Priority: optional
-Section: multimedia/applications
+Section: opie/multimedia
 Maintainer: L.J. Potter <lpotter@trolltech.com>
 Architecture: arm
 Depends: task-opie-minimal
 Description: audio sampling recorder
 A simple audio recording/playing application.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/multimedia/powerchord/opie-powerchord.control b/noncore/multimedia/powerchord/opie-powerchord.control
index d295031..3e01b62 100644
--- a/noncore/multimedia/powerchord/opie-powerchord.control
+++ b/noncore/multimedia/powerchord/opie-powerchord.control
@@ -1,10 +1,10 @@
 Files: bin/powerchord apps/Applications/powerchord.desktop pics/powerchord share/powerchord
 Priority: optional
-Section: Applications
+Section: opie/multimedia
 Maintainer: Camilo Mesias <camilo@mesias.co.uk>
 Architecture: arm
 Version: 0.0.8
 Depends: task-opie-minimal
 Description: Guitar Chord generator application
 Allows naming of chords using base note and key. Fretboard diagrams are
 produced illustrating ways to play the chord.
diff --git a/noncore/multimedia/tonleiter/tonleiter.control b/noncore/multimedia/tonleiter/tonleiter.control
index 7b389ea..336d1c3 100644
--- a/noncore/multimedia/tonleiter/tonleiter.control
+++ b/noncore/multimedia/tonleiter/tonleiter.control
@@ -1,9 +1,9 @@
 Package: tonleiter
 Files: bin/tonleiter pics/tonleiter apps/Applications/tonleiter.desktop
 Priority: optional
-Section: multimedia/applications
+Section: opie/multimedia
 Maintainer: Ralf Waspe <rwaspe@web.de>
 Architecture: arm
 Depends: task-opie-minimal
 Description: music scales for sting instruments
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/net/ftplib/ftplib.control b/noncore/net/ftplib/ftplib.control
index 918bcd2..eb191f6 100644
--- a/noncore/net/ftplib/ftplib.control
+++ b/noncore/net/ftplib/ftplib.control
@@ -1,10 +1,10 @@
 Package: ftplib
-Files: $OPIEDIR/lib/libftplib.*
+Files: lib/libftplib.*
 Priority: optional
-Section: Communications
+Section: libs
-Maintainer: L.J. Potter <ljp@llornkcor.com> 
+Maintainer: L.J. Potter <ljp@llornkcor.com>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Libftp
 The ftp library for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/net/mail/libmailwrapper/libmailwrapper.control b/noncore/net/mail/libmailwrapper/libmailwrapper.control
index 07961fe..00fcbad 100644
--- a/noncore/net/mail/libmailwrapper/libmailwrapper.control
+++ b/noncore/net/mail/libmailwrapper/libmailwrapper.control
@@ -1,10 +1,10 @@
 Package: libmailwrapper
-Files: lib/libmailwrapper.so* 
+Files: lib/libmailwrapper.so*
 Priority: optional
-Section: opie/applications
+Section: ;ibs
 Maintainer: Rajko Albrecht <alwin@handhelds.org>, Juergen Graf <jgf@handhelds.org>, Maximilian Rei� <harlekin@handhelds.org>
 Architecture: arm
 Version: 0.3-$SUB_VERSION
 Depends: task-opie-minimal, libopie1, libetpan
 Description: wrapper lib needed by Opie's mailer
 License: LGPL
diff --git a/noncore/net/mail/opie-mail.control b/noncore/net/mail/opie-mail.control
index 0ac9daf..a01fcb6 100644
--- a/noncore/net/mail/opie-mail.control
+++ b/noncore/net/mail/opie-mail.control
@@ -1,10 +1,10 @@
 Package: opie-mail
 Files: plugins/application/libopiemail.so* bin/opiemail apps/1Pim/mail.desktop pics/mail/*.png
 Priority: optional
-Section: opie/applications
+Section: opie/pim
 Maintainer: Rajko Albrecht <alwin@handhelds.org>, Juergen Graf <jgf@handhelds.org>, Maximilian Rei� <harlekin@handhelds.org>
 Architecture: arm
 Version: 0.3-$SUB_VERSION
 Depends: task-opie-minimal, libopie1, libmailwrapper
 Description: Opie's mail and news client (POP3, IMAP and NNTP)
 License: LGPL
diff --git a/noncore/net/mail/taskbarapplet/opie-mailapplet.control b/noncore/net/mail/taskbarapplet/opie-mailapplet.control
index 607f020..d6abbe3 100644
--- a/noncore/net/mail/taskbarapplet/opie-mailapplet.control
+++ b/noncore/net/mail/taskbarapplet/opie-mailapplet.control
@@ -1,10 +1,10 @@
 Package: opie-mailapplet
 Files: plugins/applets/libmailapplet.so*
 Priority: optional
-Section: opie/applications
+Section: opie/applets
 Maintainer: Rajko Albrecht <alwin@handhelds.org>, Juergen Graf <jgf@handhelds.org>, Maximilian Rei� <harlekin@handhelds.org>
 Architecture: arm
 Version: 0.3-$SUB_VERSION
 Depends: task-opie-minimal, libopie1, opie-mail
 Description: A Biff-Like mailchecker
 License: LGPL
diff --git a/noncore/net/mailit/opie-mailit.control b/noncore/net/mailit/opie-mailit.control
index c20cdf5..3789016 100644
--- a/noncore/net/mailit/opie-mailit.control
+++ b/noncore/net/mailit/opie-mailit.control
@@ -1,9 +1,9 @@
 Package: opie-mailit
 Files: plugins/application/libmailit.so* bin/mailit apps/1Pim/mailit.desktop pics/mailit
 Priority: optional
-Section: opie
+Section: opie/pim
 Maintainer: L.J. Potter <llornkcor@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION$EXTRAVERSION
 Description: EMail
 A simple POP3 email client for the Opie environment.
diff --git a/noncore/net/opieftp/opie-ftp.control b/noncore/net/opieftp/opie-ftp.control
index 269bd49..32cc7a6 100644
--- a/noncore/net/opieftp/opie-ftp.control
+++ b/noncore/net/opieftp/opie-ftp.control
@@ -1,11 +1,11 @@
 Package: opie-ftp
 Files: plugins/application/libopieftp.so* bin/opieftp pics/opieftp apps/Applications/opieftp.desktop
 Priority: optional
-Section: Communications
+Section: opie/applications
-Maintainer: L.J. Potter <ljp@llornkcor.com> 
+Maintainer: L.J. Potter <ljp@llornkcor.com>
 Architecture: arm
 Depends: task-opie-minimal, ftplib
 Replaces: opieftp
 Description: Opie-Ftp
 The ftp client for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/net/opieirc/opie-irc.control b/noncore/net/opieirc/opie-irc.control
index be31d9c..b9f20f0 100644
--- a/noncore/net/opieirc/opie-irc.control
+++ b/noncore/net/opieirc/opie-irc.control
@@ -1,9 +1,9 @@
 Package: opie-irc
 Files: plugins/application/libopieirc.so* bin/opieirc pics/opieirc apps/Applications/opieirc.desktop help/en/html/opieirc.html help/en/html/opieirc
 Priority: optional
-Section: Communications
+Section: opie/applications
 Maintainer: Wenzel Jakob <root@wazlaf.de>
 Architecture: arm
 Depends: task-opie-minimal, libopie1
 Description: The Opie IRC client lets you chat on your favorite IRC server using your handheld computer
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/net/opietooth/applet/opie-bluetoothapplet.control b/noncore/net/opietooth/applet/opie-bluetoothapplet.control
index 55b9ab0..6505892 100644
--- a/noncore/net/opietooth/applet/opie-bluetoothapplet.control
+++ b/noncore/net/opietooth/applet/opie-bluetoothapplet.control
@@ -1,10 +1,10 @@
 Package: opie-bluetoothapplet
 Files: plugins/applets/libbluetoothapplet.so* pics/bluetoothapplet/*
 Priority: optional
-Section: opie/system
+Section: opie/applets
 Maintainer: Maximilian Reiss <max.reiss@gmx.de>
 Architecture: arm
 Depends: task-opie-minimal, libopietooth1
 Description: Bluetooth Applet
 An bluetooth taskbar applet for the Opie environment
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/net/opietooth/lib/libopietooth1.control b/noncore/net/opietooth/lib/libopietooth1.control
index 850f0dc..e96ce24 100644
--- a/noncore/net/opietooth/lib/libopietooth1.control
+++ b/noncore/net/opietooth/lib/libopietooth1.control
@@ -1,10 +1,10 @@
 Package: libopietooth1
-Files: $OPIEDIR/lib/libopietooth.so.1.0.0 $OPIEDIR/lib/libopietooth.so.1.0 $OPIEDIR/lib/libopietooth.so.1 
+Files: lib/libopietooth.so.1.0.0 lib/libopietooth.so.1.0 lib/libopietooth.so.1
 Priority: optional
-Section: opie/system
+Section: libs
 Maintainer: Maximilian Rei� <max.reiss@gmx.de>
 Architecture: arm
 Replaces: libopietooth
 Depends: libqte2 (>=2.3.4), libopie, task-bluez
 Description: Opie bluetooth library
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/net/opietooth/manager/opie-bluetoothmanager.control b/noncore/net/opietooth/manager/opie-bluetoothmanager.control
index a9996cf..cc7485f 100644
--- a/noncore/net/opietooth/manager/opie-bluetoothmanager.control
+++ b/noncore/net/opietooth/manager/opie-bluetoothmanager.control
@@ -1,11 +1,11 @@
 Package: opie-bluetoothmanager
 Files: plugins/application/libbluetooth-manager.so* bin/bluetooth-manager apps/Settings/bluetooth-manager.desktop pics/opietooth/*
 Priority: optional
-Section: opie/applications
+Section: opie/settings
 Maintainer: Maximilian Rei� <max.reiss@gmx.de>
 Architecture: arm
 Version: 0.5.4-$SUB_VERSION
 Depends: task-opie-minimal, libopietooth1, opie-bluepin
 License: GPL
 Description: Bluetooth Manager application
diff --git a/noncore/settings/backup/opie-backup.control b/noncore/settings/backup/opie-backup.control
index fdb66fc..761caf2 100644
--- a/noncore/settings/backup/opie-backup.control
+++ b/noncore/settings/backup/opie-backup.control
@@ -1,9 +1,9 @@
 Package: opie-backup
 Files: plugins/application/libbackup.so* bin/backup pics/backup apps/Settings/backup.desktop
 Priority: optional
 Depends: task-opie-minimal
 Architecture: arm
 Maintainer: Stefan Eilers <Eilers.Stefan@epost.de>
-Section: opie/Settings
+Section: opie/settings
 Description: Backup and Restore utility.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/netsystemtime/opie-systemtime.control b/noncore/settings/netsystemtime/opie-systemtime.control
index d62dc33..50f3eaf 100644
--- a/noncore/settings/netsystemtime/opie-systemtime.control
+++ b/noncore/settings/netsystemtime/opie-systemtime.control
@@ -1,11 +1,11 @@
 Package: opie-systemtime
-Files: plugins/application/libsystemtime.so* bin/systemtime apps/Settings/netsystemtime.desktop etc/ntpservers pics/netsystemtime 
+Files: plugins/application/libsystemtime.so* bin/systemtime apps/Settings/netsystemtime.desktop etc/ntpservers pics/netsystemtime
 Priority: optional
 Section: opie/settings
 Provides: opie-netsystemtime
-Maintainer: Patrick S. Vogt <tille@handhelds.org>
+Maintainer: Patrick S. Vogt <tille@handhelds.org>, Dan Williams <drw@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal, ntpdate, libopie1
 Description: ntp (Network  Time  Protocol) gui
 This utility syncs system time with a atomic timerserver via internet
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/networksettings/opie-networksettings.control b/noncore/settings/networksettings/opie-networksettings.control
index 08a79c6..25e1e26 100644
--- a/noncore/settings/networksettings/opie-networksettings.control
+++ b/noncore/settings/networksettings/opie-networksettings.control
@@ -1,10 +1,10 @@
 Package: opie-networksettings
-Files: plugins/application/libnetworksettings.so* bin/networksettings apps/Settings/networksettings.desktop pics/networksettings/* pics/Network/PPPConnect.png $OPIEDIR/lib/libinterfaces.so* root/usr/bin/changedns bin/getprofile
+Files: plugins/application/libnetworksettings.so* bin/networksettings apps/Settings/networksettings.desktop pics/networksettings/* pics/Network/PPPConnect.png lib/libinterfaces.so* root/usr/bin/changedns bin/getprofile
 Priority: optional
 Section: opie/settings
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal, libopiecore2, libopienet2
 Description: Network settings.
 Replaces: opie-networksetup
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/sysinfo/opie-sysinfo.control b/noncore/settings/sysinfo/opie-sysinfo.control
index b79e9ec..f251aa7 100644
--- a/noncore/settings/sysinfo/opie-sysinfo.control
+++ b/noncore/settings/sysinfo/opie-sysinfo.control
@@ -1,10 +1,10 @@
 Package: opie-sysinfo
 Files: plugins/application/libsysinfo.so* bin/sysinfo apps/Settings/sysinfo.desktop pics/sysinfo
 Priority: optional
-Section: opie/applications
+Section: opie/settings
 Maintainer: Dan Williams <williamsdr@acm.org>
 Architecture: arm
 Depends: task-opie-minimal, libopie1
 Description: System Information dialog
 For the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/styles/flat/opie-style-flat.control b/noncore/styles/flat/opie-style-flat.control
index 80d8afc..1021493 100644
--- a/noncore/styles/flat/opie-style-flat.control
+++ b/noncore/styles/flat/opie-style-flat.control
@@ -1,10 +1,10 @@
 Package: opie-style-flat
 Files: plugins/styles/libflatstyle.so*
 Priority: optional
-Section: opie/styles
+Section: opie/system
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 Description: OPIE widget style
 Simple, flat widget style for OPIE.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/styles/fresh/opie-style-fresh.control b/noncore/styles/fresh/opie-style-fresh.control
index 661200d..4ccbcfe 100644
--- a/noncore/styles/fresh/opie-style-fresh.control
+++ b/noncore/styles/fresh/opie-style-fresh.control
@@ -1,10 +1,10 @@
 Package: opie-style-fresh
 Files: plugins/styles/libfreshstyle.so*
 Priority: optional
-Section: opie/styles
+Section: opie/system
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 Description: OPIE widget style
 Simple widget style for OPIE.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/todayplugins/fortune/opie-today-fortuneplugin.control b/noncore/todayplugins/fortune/opie-today-fortuneplugin.control
index 8f3f4ea..e465fb4 100644
--- a/noncore/todayplugins/fortune/opie-today-fortuneplugin.control
+++ b/noncore/todayplugins/fortune/opie-today-fortuneplugin.control
@@ -1,9 +1,9 @@
 Package: opie-today-fortuneplugin
 Files: plugins/today/libtodayfortuneplugin.so*
 Priority: optional
-Section: opie/applications
+Section: opie/plugins
 Maintainer: Chris Larson <kergoth@handhelds.org>
 Architecture: arm
 Depends: opie-today, fortune (<=9708-0.1) | fortune-mod
 Description: 'fortune' plugin for today
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control b/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control
index 96994f2..645dbe7 100644
--- a/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control
+++ b/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control
@@ -1,9 +1,9 @@
 Package: opie-today-stocktickerplugin
 Files: plugins/today/libtodaystocktickerplugin.so* bin/stockticker pics/stockticker/stockticker.png
 Priority: optional
-Section: opie/applications
+Section: opie/plugins
 Maintainer: L.J. Potter <lpotter@trolltech.com>
 Architecture: arm
 Depends: libqte2, opie-today
 Description: stockticker plugin for today
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/todayplugins/weather/opie-today-weatherplugin.control b/noncore/todayplugins/weather/opie-today-weatherplugin.control
index 806b64f..0861b5a 100644
--- a/noncore/todayplugins/weather/opie-today-weatherplugin.control
+++ b/noncore/todayplugins/weather/opie-today-weatherplugin.control
@@ -1,9 +1,9 @@
 Package: opie-today-weatherplugin
 Files: plugins/today/libtodayweatherplugin.so* pics/todayweatherplugin
 Priority: optional
 Section: opie/applications
-Maintainer: Dan Williams <williamsdr@acm.org>
+Maintainer: Dan Williams <drw@handhelds.org>
 Architecture: arm
 Depends: libqte2, opie-today
 Description: Current weather plugin for today.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/formatter/opie-formatter.control b/noncore/tools/formatter/opie-formatter.control
index 93badfc..47c6528 100644
--- a/noncore/tools/formatter/opie-formatter.control
+++ b/noncore/tools/formatter/opie-formatter.control
@@ -1,11 +1,11 @@
 Package: opie-formatter
 Files: plugins/application/libformatter.so* bin/formatter pics/formatter/devices.png apps/Settings/formatter.desktop
 Priority: optional
-Section: opie/applications
+Section: opie/settings
 Maintainer: L.J. Potter <lpotter@trolltech.com>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Formatter
 The filesystem formatting and mountpoint app for the Opie environment.
-ronment.
+ronment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/opie-sh/opie-sh.control b/noncore/tools/opie-sh/opie-sh.control
index f03e5ac..43b760d 100644
--- a/noncore/tools/opie-sh/opie-sh.control
+++ b/noncore/tools/opie-sh/opie-sh.control
@@ -1,11 +1,11 @@
 Package: opie-sh
 Files:  bin/opie-sh  apps/Opie-SH/opie-sh.desktop pics/opie-sh/*.png help/opie-sh/*.html
 Priority: optional
-Section: opie/applications
+Section: opie/sh
 Maintainer: Thomas Stephens <spiralman@softhome.net>
 Architecture: arm
 Version: 0.5-$SUB_VERSION
 Depends: task-opie-minimal
 License: GPL
 Description: a QDialog shell frontend
 A program to let you use various dialogs from the console (or a shell script)
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-diskfree.control b/noncore/tools/opie-sh/scripts/opie-sh-diskfree.control
index 4823e78..df1b9d9 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-diskfree.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-diskfree.control
@@ -1,11 +1,11 @@
 Package: opie-sh-diskfree
 Files: bin/diskfree.sh apps/Opie-SH/diskfree.desktop pics/opie-sh-scripts/diskfree.png
 Installed-Size:  0
 Depends: task-opie-minimal, opie-sh
 Priority: optional
-Section: opie/settings
+Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
 Architecture: arm
 License: GPL
 Description: frontend to df (show space left on mountpoints)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-fsmounter.control b/noncore/tools/opie-sh/scripts/opie-sh-fsmounter.control
index 3d08470..79f5b2e 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-fsmounter.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-fsmounter.control
@@ -1,11 +1,11 @@
 Package: opie-sh-fsmounter
 Files: bin/filesystem_mounter.sh pics/opie-sh-scripts/fsmounter.png apps/Opie-SH/filesystem_mounter.desktop
-Installed-Size:  0 
+Installed-Size:  0
 Depends: task-opie-minimal, opie-sh
 Priority: optional
-Section: opie/settings
+Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
 Architecture: arm
 License: GPL
 Description: frontend to mount/unmount filesystems
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-hostlist.control b/noncore/tools/opie-sh/scripts/opie-sh-hostlist.control
index cbc53ed..2d3e073 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-hostlist.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-hostlist.control
@@ -1,11 +1,11 @@
 Package: opie-sh-hostlist
 Files: bin/hostlist.sh pics/opie-sh-scripts/hostlist.png apps/Opie-SH/hostlist.desktop share/config/hostlist.cfg
-Installed-Size:  0 
+Installed-Size:  0
 Depends: task-opie-minimal, opie-sh
 Priority: optional
-Section: opie/settings
+Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
 Architecture: arm
 License: GPL
 Description: generate list of hosts which are up/down using ping
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-killproc.control b/noncore/tools/opie-sh/scripts/opie-sh-killproc.control
index 058787f..ef835c1 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-killproc.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-killproc.control
@@ -1,11 +1,11 @@
 Package: opie-sh-killproc
 Files: bin/killproc.sh apps/Opie-SH/killproc.desktop pics/opie-sh-scripts/killproc.png
-Installed-Size:  0 
+Installed-Size:  0
 Depends: task-opie-minimal, opie-sh
 Priority: optional
-Section: opie/settings
+Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
 Architecture: arm
 License: GPL
 Description: frontend to kill process
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-launcher-refresh.control b/noncore/tools/opie-sh/scripts/opie-sh-launcher-refresh.control
index d3e2133..a9bc66c 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-launcher-refresh.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-launcher-refresh.control
@@ -1,11 +1,11 @@
 Package: opie-sh-launcher-refresh
 Files: bin/launcher_refresh.sh pics/opie-sh-scripts/launcher_refresh.png apps/Opie-SH/launcher_refresh.desktop
 Installed-Size:  0
 Depends: task-opie-minimal, opie-sh
 Priority: optional
-Section: opie/settings
+Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
 Architecture: arm
 License: GPL
 Description: refresh the launcher so that new installed applications appear
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-logviewer.control b/noncore/tools/opie-sh/scripts/opie-sh-logviewer.control
index 21ec678..6df1489 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-logviewer.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-logviewer.control
@@ -1,11 +1,11 @@
 Package: opie-sh-logviewer
 Files: bin/logviewer.sh apps/Opie-SH/logviewer.desktop pics/opie-sh-scripts/logviewer.png
-Installed-Size:  0 
+Installed-Size:  0
 Depends: task-opie-minimal, opie-sh
 Priority: optional
-Section: opie/settings
+Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
 Architecture: arm
 License: GPL
 Description: frontend to viewing logfiles
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-rsynchelper.control b/noncore/tools/opie-sh/scripts/opie-sh-rsynchelper.control
index f1e9435..50470f1 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-rsynchelper.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-rsynchelper.control
@@ -1,11 +1,11 @@
 Package: opie-sh-rsynchelper
 Files: bin/rsyncme.sh apps/Opie-SH/rsyncme.desktop pics/opie-sh-scripts/rsyncme.png share/config/rsyncme.cfg
-Installed-Size:  0 
+Installed-Size:  0
 Depends: task-opie-minimal, opie-sh
 Priority: optional
-Section: opie/settings
+Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
 Architecture: arm
 License: GPL
 Description: frontend to rsync
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-servicemanager.control b/noncore/tools/opie-sh/scripts/opie-sh-servicemanager.control
index b638098..b0cba7d 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-servicemanager.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-servicemanager.control
@@ -1,11 +1,11 @@
 Package: opie-sh-servicemanager
 Files: bin/service_manager.sh apps/Opie-SH/service_manager.desktop pics/opie-sh-scripts/service_manager.png
 Installed-Size:  0
 Depends: task-opie-minimal, opie-sh
 Priority: optional
-Section: opie/settings
+Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
 Architecture: arm
 License: GPL
 Description: frontend to start/stop init scripts
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-ssh-askpass.control b/noncore/tools/opie-sh/scripts/opie-sh-ssh-askpass.control
index fe00f03..37ac25b 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-ssh-askpass.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-ssh-askpass.control
@@ -1,11 +1,11 @@
 Package: opie-sh-ssh-askpass
 Files: bin/opie-sh-ssh-askpass.sh
-Installed-Size:  0 
+Installed-Size:  0
 Depends: task-opie-minimal (1.5.0+), opie-sh (0.5-20020919+)
 Priority: optional
-Section: opie/system
+Section: opie/sh
 Maintainer: David Woodhouse <dwmw2@infradead.org>
 Architecture: arm
 License: GPL
 Description: Popup dialog box for OpenSSH to ask for user input
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-stowawayctrl.control b/noncore/tools/opie-sh/scripts/opie-sh-stowawayctrl.control
index 04546f4..824a767 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-stowawayctrl.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-stowawayctrl.control
@@ -1,11 +1,11 @@
 Package: opie-sh-stowawayctrl
 Files: bin/stowctrl.sh apps/Opie-SH/stowctrl.desktop pics/opie-sh-scripts/stowctrl.png
-Installed-Size:  0 
+Installed-Size:  0
 Depends: task-opie-minimal, opie-sh
 Priority: optional
-Section: opie/settings
+Section: opie/sh
 Maintainer: spiralman <spiralman@softhome.net
 Architecture: arm
 License: GPL
 Description: frontend to start/stop Stowaway keyboard
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-usbnetctrl.control b/noncore/tools/opie-sh/scripts/opie-sh-usbnetctrl.control
index 7513db9..22f0b4d 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-usbnetctrl.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-usbnetctrl.control
@@ -1,11 +1,11 @@
 Package: opie-sh-usbnetctrl
 Files: bin/usbnetctrl.sh apps/Opie-SH/usbnetctrl.desktop pics/opie-sh-scripts/usbnetctrl.png
-Installed-Size:  0 
+Installed-Size:  0
 Depends: task-opie-minimal, opie-sh
 Priority: optional
-Section: opie/settings
+Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
 Architecture: arm
 License: GPL
 Description: frontend to start/stop usbnet
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-wavelanchooser.control b/noncore/tools/opie-sh/scripts/opie-sh-wavelanchooser.control
index 5f19a16..aa0a38d 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-wavelanchooser.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-wavelanchooser.control
@@ -1,11 +1,11 @@
 Package: opie-sh-wavelanchooser
 Files: bin/opie-sh-wavelanchooser.sh apps/Opie-SH/opie-sh-wavelanchooser.desktop pics/opie-sh-scripts/qtwavelan.png
-Installed-Size:  0 
+Installed-Size:  0
 Version: 0.1-20020527-1
 Depends: task-opie-minimal (1.5.0+), opie-sh
 Priority: optional
-Section: opie/settings
+Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
 Architecture: arm
 License: GPL
 Description: frontend to choose wavelan config
diff --git a/noncore/tools/opie-sh/scripts/task-opie-sh-apps.control b/noncore/tools/opie-sh/scripts/task-opie-sh-apps.control
index 15a1502..02d5fdf 100644
--- a/noncore/tools/opie-sh/scripts/task-opie-sh-apps.control
+++ b/noncore/tools/opie-sh/scripts/task-opie-sh-apps.control
@@ -1,11 +1,11 @@
 Package: task-opie-sh-apps
 Files:
-Installed-Size:  0 
+Installed-Size:  0
 Depends: task-opie-minimal (1.5.0+), opie-sh, opie-sh-fsmounter, opie-sh-killproc, opie-sh-rsynchelper, opie-sh-servicemanager, opie-sh-usbnetctrl, opie-sh-hostlist, opie-sh-wavelanchooser, opie-sh-diskfree, opie-sh-launcher-refresh, opie-sh-logviewer, opie-sh-stowawayctrl
 Priority: optional
-Section: opie/settings
+Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
 Architecture: arm
 License: GPL
 Description: Opie shell apps
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/unsupported/mail2/opie-mail2.control b/noncore/unsupported/mail2/opie-mail2.control
index bfb5026..e802193 100644
--- a/noncore/unsupported/mail2/opie-mail2.control
+++ b/noncore/unsupported/mail2/opie-mail2.control
@@ -1,10 +1,10 @@
 Package: opie-mail2
-Files: plugins/application/libmail.so* bin/mail $OPIEDIR/lib/libmail.so* apps/1Pim/mail.desktop pics/mail/*.png sounds/mail/*.wav
+Files: plugins/application/libmail.so* bin/mail lib/libmail.so* apps/1Pim/mail.desktop pics/mail/*.png sounds/mail/*.wav
 Priority: optional
-Section: opie/applications
+Section: opie/pim
 Maintainer: Constantin Bergemann <cbergemann@lisa.de>
 Architecture: arm
 Version: $QPE_VERSION$EXTRAVERSION
 Depends: task-opie-minimal, libopie1
 Description: An IMAP mail client
 License: LGPL
diff --git a/noncore/unsupported/mailit/opie-mailit.control b/noncore/unsupported/mailit/opie-mailit.control
index c20cdf5..3789016 100644
--- a/noncore/unsupported/mailit/opie-mailit.control
+++ b/noncore/unsupported/mailit/opie-mailit.control
@@ -1,9 +1,9 @@
 Package: opie-mailit
 Files: plugins/application/libmailit.so* bin/mailit apps/1Pim/mailit.desktop pics/mailit
 Priority: optional
-Section: opie
+Section: opie/pim
 Maintainer: L.J. Potter <llornkcor@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION$EXTRAVERSION
 Description: EMail
 A simple POP3 email client for the Opie environment.
diff --git a/pics/opie-pics.control b/pics/opie-pics.control
index 547ce31..e3d6925 100644
--- a/pics/opie-pics.control
+++ b/pics/opie-pics.control
@@ -1,9 +1,9 @@
 Package: opie-pics
 Files: pics/??*.* pics/opie/* pics/addressbook/*.png pics/todo/*.png pics/datebook/*.png
 Priority: required
 Section: opie/system
-Maintainer: Project Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Description: Including unassigned and pim pics (TodoList, Addressbook, Datebook).
 These icons are available to all Opie applications.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/qt/control/qte-fonts-common.control b/qt/control/qte-fonts-common.control
index b378e02..1fd737c 100644
--- a/qt/control/qte-fonts-common.control
+++ b/qt/control/qte-fonts-common.control
@@ -1,8 +1,8 @@
 Package: qte-fonts-common
-Files: $OPIEDIR/root/usr/sbin/update-qtfontdir
+Files: root/usr/sbin/update-qtfontdir
 Priority: required
 Section: opie/system
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Version: 1:$QTE_VERSION-$QTE_REVISION-1
 Description: Qt/Embedded font common files
diff --git a/root/ptydevs.control b/root/ptydevs.control
index af9729e..50f24e6 100644
--- a/root/ptydevs.control
+++ b/root/ptydevs.control
@@ -1,10 +1,10 @@
 Package: ptydevs
 Files: root/dev
 Priority: optional
-Section: base
+Section: opie/system
 Maintainer: Opie Project <opie@handhelds.org>
 Version: 1.0.0-5
 Architecture: arm
 Description: Pseudotty devices
 These files are not included in the Familiar libc6 package.
 This package contains just a few pty/tty pairs.
author	drw <drw>	2004-02-14 00:40:29 (UTC)
committer	drw <drw>	2004-02-14 00:40:29 (UTC)
commit	c7cf5faa7f1512fa48fb298a75902d4557bc9cfa (patch) (unidiff)
tree	c6a994c6df28a3367dabd1bd2b578ada990f70f4
parent	0ca4076c89ad8bb02e0102ee7142b4f3e75add7d (diff)
download	opie-c7cf5faa7f1512fa48fb298a75902d4557bc9cfa.zip opie-c7cf5faa7f1512fa48fb298a75902d4557bc9cfa.tar.gz opie-c7cf5faa7f1512fa48fb298a75902d4557bc9cfa.tar.bz2