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

59 files changed, 82 insertions, 91 deletions

diff --git a/noncore/apps/confedit/opie-confeditor.control b/noncore/apps/confedit/opie-confeditor.control
index ca35edb..12ae6a9 100644
--- a/noncore/apps/confedit/opie-confeditor.control
+++ b/noncore/apps/confedit/opie-confeditor.control
@@ -7,4 +7,3 @@ 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 b36a84d..b5cf931 100644
--- a/noncore/apps/odict/opie-odict.control
+++ b/noncore/apps/odict/opie-odict.control
@@ -5,6 +5,6 @@ Section: opie/applications
 Maintainer: Carsten Niehaus <cniehaus@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
-Description: Dictionarylookupprogram
+Description: Dictionary look-up program
  Look up words :)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/opie-console/opie-console.control b/noncore/apps/opie-console/opie-console.control
index 504de85..5548baf 100644
--- a/noncore/apps/opie-console/opie-console.control
+++ b/noncore/apps/opie-console/opie-console.control
@@ -1,11 +1,10 @@
 Package: opie-console
-Files:  bin/opie-console apps/Applications/opie-console.desktop pics/console/* 
+Files:  bin/opie-console apps/Applications/opie-console.desktop pics/console/*
 Priority: optional
 Section: opie/applications
-Maintainer: Opie team <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Version: 0.6-$SUB_VERSION
 Depends: qpe-base, libopie1, opie-console-help-en, lrzsz, opie-keytabs
 License: GPL
 Description: Opie terminal app
- 
diff --git a/noncore/apps/tableviewer/opie-tableviewer.control b/noncore/apps/tableviewer/opie-tableviewer.control
index be0cea1..805781e 100644
--- a/noncore/apps/tableviewer/opie-tableviewer.control
+++ b/noncore/apps/tableviewer/opie-tableviewer.control
@@ -2,9 +2,9 @@ Package: opie-tableviewer
 Files: plugins/application/libtableviewer.so* bin/tableviewer apps/Applications/tableviewer.desktop
 Priority: optional
 Section: opie/applications
-Maintainer: Opie Project <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
-Arch: iPAQ
+Arch: arm
 Depends: task-opie-minimal
 Description: XML database browsers
  A table/database viewer for the Opie environment.
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-commondev.control b/noncore/apps/tinykate/opie-tinykate-syntax-commondev.control
index dd5e24b..828be03 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax-commondev.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax-commondev.control
@@ -3,7 +3,7 @@ Files: share/tinykate/syntax/c.xml share/tinykate/syntax/cpp.xml share/tinykate/
 Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
-Architecture: arm
+Architecture: all
 Depends: task-opie-minimal, opie-tinykate
 Description: Syntax Highlighting Patterns for for common programming languages for TinyKate
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-documentation.control b/noncore/apps/tinykate/opie-tinykate-syntax-documentation.control
index c47acc0..25571a2 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax-documentation.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax-documentation.control
@@ -3,7 +3,7 @@ Files: share/tinykate/syntax/latex.xml share/tinykate/syntax/postscript.xml shar
 Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
-Architecture: arm
+Architecture: all
 Depends: task-opie-minimal, opie-tinykate
 Description: Syntax Highlighting Patterns for document oriented languages for TinyKate
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-misc.control b/noncore/apps/tinykate/opie-tinykate-syntax-misc.control
index 0e80518..8eb76b1 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax-misc.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax-misc.control
@@ -3,7 +3,7 @@ Files: share/tinykate/syntax/idconsole.xml share/tinykate/syntax/matlab.xml shar
 Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
-Architecture: arm
+Architecture: all
 Depends: task-opie-minimal, opie-tinykate
 Description: Syntax Highlighting Patterns for  misc languages for TinyKate
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-miscdev.control b/noncore/apps/tinykate/opie-tinykate-syntax-miscdev.control
index 3f7ea0d..b8b5c32 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax-miscdev.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax-miscdev.control
@@ -3,7 +3,7 @@ Files: share/tinykate/syntax/ada.xml share/tinykate/syntax/eiffel.xml share/tiny
 Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
-Architecture: arm
+Architecture: all
 Depends: task-opie-minimal, opie-tinykate
 Description: Syntax Highlighting Patterns for for uncommon programming languages for TinyKate
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-unix.control b/noncore/apps/tinykate/opie-tinykate-syntax-unix.control
index ea4e026..7218f33 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax-unix.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax-unix.control
@@ -1,9 +1,9 @@
 Package: opie-tinykate-syntax-unix
-Files: share/tinykate/syntax/cs.xml share/tinykate/syntax/bash.xml share/tinykate/syntax/changelog.xml share/tinykate/syntax/desktop.xml share/tinykate/syntax/diff.xml share/tinykate/syntax/mab.xml share/tinykate/syntax/makefile.xml share/tinykate/syntax/rpmspec.xml share/tinykate/syntax/sml.xml share/tinykate/syntax/winehq.xml 
+Files: share/tinykate/syntax/cs.xml share/tinykate/syntax/bash.xml share/tinykate/syntax/changelog.xml share/tinykate/syntax/desktop.xml share/tinykate/syntax/diff.xml share/tinykate/syntax/mab.xml share/tinykate/syntax/makefile.xml share/tinykate/syntax/rpmspec.xml share/tinykate/syntax/sml.xml share/tinykate/syntax/winehq.xml
 Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
-Architecture: arm
+Architecture: all
 Depends: task-opie-minimal, opie-tinykate
 Description: Syntax Highlighting Patterns for UNIX/Linux specific files for TinyKate
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-web.control b/noncore/apps/tinykate/opie-tinykate-syntax-web.control
index 8f9c71a..53f07d3 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax-web.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax-web.control
@@ -3,7 +3,7 @@ Files: share/tinykate/syntax/css.xml share/tinykate/syntax/html.xml share/tinyka
 Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
-Architecture: arm
+Architecture: all
 Depends: task-opie-minimal, opie-tinykate
 Description: Syntax Highlighting Patterns for for common programming languages for TinyKate
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax.control b/noncore/apps/tinykate/opie-tinykate-syntax.control
index 712933c..ac8e68e 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax.control
@@ -2,7 +2,7 @@ Package: opie-tinykate-syntax
 Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
-Architecture: arm
+Architecture: all
 Depends: task-opie-minimal, opie-tinykate, opie-tinykate-syntax-commondev, opie-tinykate-syntax-documentation, opie-tinykate-syntax-misc, opie-tinykate-syntax-miscdev, opie-tinykate-syntax-unix, opie-tinykate-syntax-web
 Description: Syntax Highlighting Patterns virtual package, which installs all available syntax patterns.
 Files:
diff --git a/noncore/apps/tinykate/opie-tinykate.control b/noncore/apps/tinykate/opie-tinykate.control
index 5de7abb..66e17ad 100644
--- a/noncore/apps/tinykate/opie-tinykate.control
+++ b/noncore/apps/tinykate/opie-tinykate.control
@@ -5,5 +5,5 @@ Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
-Description: Kate for opie
+Description: Kate for Opie
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/decorations/flat/opie-deco-flat.control b/noncore/decorations/flat/opie-deco-flat.control
index 89915a4..1e285d0 100644
--- a/noncore/decorations/flat/opie-deco-flat.control
+++ b/noncore/decorations/flat/opie-deco-flat.control
@@ -6,5 +6,5 @@ Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 Description: OPIE window decoration style
- Flat window decoration style for OPIE.
+ 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 cdc1764..2165633 100644
--- a/noncore/decorations/liquid/opie-deco-liquid.control
+++ b/noncore/decorations/liquid/opie-deco-liquid.control
@@ -6,5 +6,5 @@ Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 Description: OPIE window decoration style
- Liquid (KDE3) window decoration style for OPIE.
+ 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 306973e..1b4bc6b 100644
--- a/noncore/decorations/polished/opie-deco-polished.control
+++ b/noncore/decorations/polished/opie-deco-polished.control
@@ -6,5 +6,5 @@ Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 Description: OPIE window decoration style
- Blended window decoration style for OPIE.
+ Blended window decoration style for Opie.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/games/kbill/opie-kbill.control b/noncore/games/kbill/opie-kbill.control
index b1422d4..3299b93 100644
--- a/noncore/games/kbill/opie-kbill.control
+++ b/noncore/games/kbill/opie-kbill.control
@@ -7,7 +7,7 @@ Architecture: arm
 Version: 0.8-$SUB_VERSION
 Depends: task-opie-minimal
 License: GPL
-Description: the famous hit Bill game
+Description: The famous hit Bill game
  Hit Bill as hard as you can before he
- infects your network with a wannabe 
+ infects your network with a wannabe
  OS.
diff --git a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-Pod.control b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-Pod.control
index 86dac97..41996fa 100644
--- a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-Pod.control
+++ b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-Pod.control
@@ -3,6 +3,5 @@ Files: pics/mediaplayer/skins/Pod
 Priority: optional
 Section: opie/playerskins
 Maintainer: ljp <llornkcor@handhelds.org>
-Description: Opie Mediaplayer's skin.
-
+Description: Opie mediaplayers skin.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default-landscape.control b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default-landscape.control
index 90d1469..f3714e8 100644
--- a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default-landscape.control
+++ b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default-landscape.control
@@ -5,5 +5,5 @@ Section: opie/playerskins
 Maintainer: L.J. Potter <lpotter@trolltech.com>
 Architecture: arm
 Depends: task-opie-minimal
-Description: Landscape skin for opie mediaplayer's
+Description: Landscape skin for Opie mediaplayers
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default.control b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default.control
index 7f4ac38..e9781f9 100644
--- a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default.control
+++ b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default.control
@@ -5,5 +5,5 @@ Section: opie/playerskins
 Maintainer: L.J. Potter <lpotter@trolltech.com>
 Architecture: arm
 Depends: task-opie-minimal
-Description: Default skin for opie mediaplayer's
+Description: Default skin for Opie mediaplayers
 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 e9f2f15..d27c0a2 100644
--- a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-techno.control
+++ b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-techno.control
@@ -3,6 +3,5 @@ Files: pics/mediaplayer/skins/techno
 Priority: optional
 Section: opie/playerskins
 Maintainer: L.J. Potter <lpotter@trolltech.com>
-Description: Techno Opie Mediaplayer's skin. Adapted from Qtopia
-
+Description: Techno Opie mediaplayers skin. Adapted from Qtopia
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/multimedia/showimg/opie-showimg.control b/noncore/multimedia/showimg/opie-showimg.control
index dc59c01..1e54383 100644
--- a/noncore/multimedia/showimg/opie-showimg.control
+++ b/noncore/multimedia/showimg/opie-showimg.control
@@ -2,10 +2,10 @@ Package: opie-showimg
 Files: plugins/application/libshowimg.so* bin/showimg apps/Applications/showimg.desktop pics/imageviewer
 Priority: optional
 Section: opie/applications
-Maintainer: Opie Project <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Image Viewer
  The image viewer for the Opie environment. Supports
- Whichever formats are compiled into Qt/Embedded (eg. PNG).
+ all graphics formats are compiled into Qt/Embedded (eg. PNG).
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/net/mail/taskbarapplet/opie-mailapplet.control b/noncore/net/mail/taskbarapplet/opie-mailapplet.control
index 5ca7ddb..84adc7b 100644
--- a/noncore/net/mail/taskbarapplet/opie-mailapplet.control
+++ b/noncore/net/mail/taskbarapplet/opie-mailapplet.control
@@ -6,5 +6,5 @@ Maintainer: Rajko Albrecht <alwin@handhelds.org>, Juergen Graf <jgf@handhelds.or
 Architecture: arm
 Version: 0.4-$SUB_VERSION
 Depends: task-opie-minimal, libopie1, opie-mail
-Description: A Biff-Like mailchecker
+Description: A Biff-like mailchecker
 License: LGPL
diff --git a/noncore/net/opietooth/blue-pin/opie-bluepin.control b/noncore/net/opietooth/blue-pin/opie-bluepin.control
index 89a4746..7147975 100644
--- a/noncore/net/opietooth/blue-pin/opie-bluepin.control
+++ b/noncore/net/opietooth/blue-pin/opie-bluepin.control
@@ -8,4 +8,3 @@ Version: 0.3.4-$SUB_VERSION
 Depends: task-opie-minimal
 License: GPL
 Description: Bluetooth pin application
-
diff --git a/noncore/net/opietooth/manager/opie-bluetoothmanager.control b/noncore/net/opietooth/manager/opie-bluetoothmanager.control
index cc7485f..4fe1e06 100644
--- a/noncore/net/opietooth/manager/opie-bluetoothmanager.control
+++ b/noncore/net/opietooth/manager/opie-bluetoothmanager.control
@@ -8,4 +8,3 @@ Version: 0.5.4-$SUB_VERSION
 Depends: task-opie-minimal, libopietooth1, opie-bluepin
 License: GPL
 Description: Bluetooth Manager application
-
diff --git a/noncore/net/ubrowser/opie-ubrowser.control b/noncore/net/ubrowser/opie-ubrowser.control
index 07021ec..cf96888 100644
--- a/noncore/net/ubrowser/opie-ubrowser.control
+++ b/noncore/net/ubrowser/opie-ubrowser.control
@@ -7,4 +7,4 @@ Architecture: arm
 Version: 0.1-$SUB_VERSION
 Depends: task-opie-minimal
 License: GPL
-Description: a very small web browser
+Description: A very small web browser
diff --git a/noncore/settings/appearance2/opie-appearance.control b/noncore/settings/appearance2/opie-appearance.control
index 724276e..b398862 100644
--- a/noncore/settings/appearance2/opie-appearance.control
+++ b/noncore/settings/appearance2/opie-appearance.control
@@ -2,9 +2,8 @@ Package: opie-appearance
 Files: plugins/application/libappearance.so* bin/appearance apps/Settings/Appearance.desktop pics/appearance
 Priority: optional
 Section: opie/settings
-Maintainer: Dan Williams <wiliamsdr@acm.org>
+Maintainer: Dan Williams <drw@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal, libopie1
-Description: Appearance settings dialog
- For the Opie environment.
+Description: Appearance settings dialog for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/doctab/opie-doctab.control b/noncore/settings/doctab/opie-doctab.control
index 9951561..4c5c7d0 100644
--- a/noncore/settings/doctab/opie-doctab.control
+++ b/noncore/settings/doctab/opie-doctab.control
@@ -5,6 +5,5 @@ Section: opie/settings
 Maintainer: The Opie Team <opie-devel@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
-Description: DocTab settings dialog
- For the Opie environment.
+Description: DocTab settings dialog for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/language/opie-language.control b/noncore/settings/language/opie-language.control
index 9e9fbeb..722a749 100644
--- a/noncore/settings/language/opie-language.control
+++ b/noncore/settings/language/opie-language.control
@@ -2,7 +2,7 @@ Package: opie-language
 Files: plugins/application/liblanguage.so* bin/language apps/Settings/Language.desktop
 Priority: optional
 Section: opie/settings
-Maintainer: Opie Project <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Language settings dialog
diff --git a/noncore/settings/mediummount/opie-mediummount.control b/noncore/settings/mediummount/opie-mediummount.control
index 772b9a6..b039f24 100644
--- a/noncore/settings/mediummount/opie-mediummount.control
+++ b/noncore/settings/mediummount/opie-mediummount.control
@@ -6,6 +6,6 @@ Maintainer: Holger Freyther <zecke@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 License: GPL
-Description: Configure app for the medium mounter
- Configure app for the medium mounter
+Description: Medium mount configuration
+ Configuration application for the medium mounter.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/netsystemtime/opie-systemtime.control b/noncore/settings/netsystemtime/opie-systemtime.control
index 50f3eaf..1ebc1da 100644
--- a/noncore/settings/netsystemtime/opie-systemtime.control
+++ b/noncore/settings/netsystemtime/opie-systemtime.control
@@ -6,6 +6,7 @@ Provides: opie-netsystemtime
 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
+Description: System time
+ This utility allows the system time to be set manually
+ or synced with a timerserver via Internet.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/packagemanager/opie-packagemanager.control b/noncore/settings/packagemanager/opie-packagemanager.control
index afab3ce..cad2cdd 100644
--- a/noncore/settings/packagemanager/opie-packagemanager.control
+++ b/noncore/settings/packagemanager/opie-packagemanager.control
@@ -7,4 +7,4 @@ Replaces: packagemanager
 Architecture: arm
 Maintainer: Dan Williams (drw@handhelds.org)
 Description: Opie package management client
-Version: 0.3.0
+Version: 0.3.0$EXTRAVERSION
diff --git a/noncore/settings/sysinfo/opie-sysinfo.control b/noncore/settings/sysinfo/opie-sysinfo.control
index f251aa7..9b56b36 100644
--- a/noncore/settings/sysinfo/opie-sysinfo.control
+++ b/noncore/settings/sysinfo/opie-sysinfo.control
@@ -2,9 +2,8 @@ Package: opie-sysinfo
 Files: plugins/application/libsysinfo.so* bin/sysinfo apps/Settings/sysinfo.desktop pics/sysinfo
 Priority: optional
 Section: opie/settings
-Maintainer: Dan Williams <williamsdr@acm.org>
+Maintainer: Dan Williams <drw@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal, libopie1
-Description: System Information dialog
- For the Opie environment.
+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 1021493..09487b1 100644
--- a/noncore/styles/flat/opie-style-flat.control
+++ b/noncore/styles/flat/opie-style-flat.control
@@ -5,6 +5,6 @@ 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.
+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 4ccbcfe..0305301 100644
--- a/noncore/styles/fresh/opie-style-fresh.control
+++ b/noncore/styles/fresh/opie-style-fresh.control
@@ -5,6 +5,6 @@ Section: opie/system
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
-Description: OPIE widget style
- Simple widget style for OPIE.
+Description: Opie widget style
+ Simple widget style for Opie.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/styles/liquid/opie-liquid.control b/noncore/styles/liquid/opie-liquid.control
index 250f308..ad625ad 100644
--- a/noncore/styles/liquid/opie-liquid.control
+++ b/noncore/styles/liquid/opie-liquid.control
@@ -7,5 +7,5 @@ Architecture: arm
 Depends: task-opie-minimal
 Description: Liquid style by Mosfet.
  Mosfet's well known Liquid GUI style from KDE,
- ported to OPIE.
+ ported to Opie.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/styles/metal/opie-metal.control b/noncore/styles/metal/opie-metal.control
index 653e126..7be25a3 100644
--- a/noncore/styles/metal/opie-metal.control
+++ b/noncore/styles/metal/opie-metal.control
@@ -1,10 +1,10 @@
 Package: opie-metal
-Files: plugins/styles/libmetal.so* 
+Files: plugins/styles/libmetal.so*
 Priority: optional
 Section: opie/system
 Maintainer: L.J. Potter <ljp@llornkcor.com>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Metal style by Trolltech.
- Metal style ported to OPIE.
+ Metal style ported to Opie.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/styles/theme/opie-theme-luna.control b/noncore/styles/theme/opie-theme-luna.control
index d53de77..6ae59c5 100644
--- a/noncore/styles/theme/opie-theme-luna.control
+++ b/noncore/styles/theme/opie-theme-luna.control
@@ -5,7 +5,7 @@ Section: opie/system
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
 Depends: opie-theme
-Description: Luna theme for OPIE.
+Description: Luna theme for Opie.
  This is the KDE2 theme Luna from Aronnax repackaged
- for OPIE.
+ 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 e465fb4..48ddab1 100644
--- a/noncore/todayplugins/fortune/opie-today-fortuneplugin.control
+++ b/noncore/todayplugins/fortune/opie-today-fortuneplugin.control
@@ -5,5 +5,5 @@ 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
+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 645dbe7..3e3bad1 100644
--- a/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control
+++ b/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control
@@ -5,5 +5,5 @@ Section: opie/plugins
 Maintainer: L.J. Potter <lpotter@trolltech.com>
 Architecture: arm
 Depends: libqte2, opie-today
-Description: stockticker plugin for today
+Description: Stock ticker 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 0861b5a..80b7d2b 100644
--- a/noncore/todayplugins/weather/opie-today-weatherplugin.control
+++ b/noncore/todayplugins/weather/opie-today-weatherplugin.control
@@ -5,5 +5,6 @@ Section: opie/applications
 Maintainer: Dan Williams <drw@handhelds.org>
 Architecture: arm
 Depends: libqte2, opie-today
-Description: Current weather plugin for today.
+Description: Weather plugin for Today
+ Displays current weather conditions.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/calculator/opie-calculator.control b/noncore/tools/calculator/opie-calculator.control
index e2dbdf8..f5a03ad 100644
--- a/noncore/tools/calculator/opie-calculator.control
+++ b/noncore/tools/calculator/opie-calculator.control
@@ -2,7 +2,7 @@ Package: opie-calculator
 Files: plugins/application/libcalculator.so* bin/calculator apps/Applications/calculator.desktop etc/unit_conversion.dat pics/calc
 Priority: optional
 Section: opie/applications
-Maintainer: Opie Project <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Calculator
diff --git a/noncore/tools/clock/opie-clock.control b/noncore/tools/clock/opie-clock.control
index 75f1440..37991a1 100644
--- a/noncore/tools/clock/opie-clock.control
+++ b/noncore/tools/clock/opie-clock.control
@@ -2,7 +2,7 @@ Package: opie-clock
 Files: plugins/application/libclock.so* bin/clock apps/Applications/clock.desktop
 Priority: optional
 Section: opie/applications
-Maintainer: Opie Project <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Clock and stop-watch
diff --git a/noncore/tools/formatter/opie-formatter.control b/noncore/tools/formatter/opie-formatter.control
index 47c6528..11fe57a 100644
--- a/noncore/tools/formatter/opie-formatter.control
+++ b/noncore/tools/formatter/opie-formatter.control
@@ -5,7 +5,5 @@ 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.
+Description: The filesystem formatting and mountpoint app for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/opie-sh/opie-sh.control b/noncore/tools/opie-sh/opie-sh.control
index 43b760d..106a183 100644
--- a/noncore/tools/opie-sh/opie-sh.control
+++ b/noncore/tools/opie-sh/opie-sh.control
@@ -7,5 +7,5 @@ Architecture: arm
 Version: 0.5-$SUB_VERSION
 Depends: task-opie-minimal
 License: GPL
-Description: a QDialog shell frontend
+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 df1b9d9..0892146 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-diskfree.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-diskfree.control
@@ -5,7 +5,7 @@ Depends: task-opie-minimal, opie-sh
 Priority: optional
 Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
-Architecture: arm
+Architecture: all
 License: GPL
-Description: frontend to df (show space left on mountpoints)
+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 79f5b2e..2800a84 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-fsmounter.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-fsmounter.control
@@ -5,7 +5,7 @@ Depends: task-opie-minimal, opie-sh
 Priority: optional
 Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
-Architecture: arm
+Architecture: all
 License: GPL
-Description: frontend to mount/unmount filesystems
+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 2d3e073..c0b2b6c 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-hostlist.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-hostlist.control
@@ -5,7 +5,7 @@ Depends: task-opie-minimal, opie-sh
 Priority: optional
 Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
-Architecture: arm
+Architecture: all
 License: GPL
-Description: generate list of hosts which are up/down using ping
+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 ef835c1..2d12e66 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-killproc.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-killproc.control
@@ -5,7 +5,7 @@ Depends: task-opie-minimal, opie-sh
 Priority: optional
 Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
-Architecture: arm
+Architecture: all
 License: GPL
-Description: frontend to kill process
+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 a9bc66c..7e3a645 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-launcher-refresh.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-launcher-refresh.control
@@ -5,7 +5,7 @@ Depends: task-opie-minimal, opie-sh
 Priority: optional
 Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
-Architecture: arm
+Architecture: all
 License: GPL
-Description: refresh the launcher so that new installed applications appear
+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 6df1489..9000dd2 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-logviewer.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-logviewer.control
@@ -5,7 +5,7 @@ Depends: task-opie-minimal, opie-sh
 Priority: optional
 Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
-Architecture: arm
+Architecture: all
 License: GPL
-Description: frontend to viewing logfiles
+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 50470f1..4de8ecb 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-rsynchelper.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-rsynchelper.control
@@ -5,7 +5,7 @@ Depends: task-opie-minimal, opie-sh
 Priority: optional
 Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
-Architecture: arm
+Architecture: all
 License: GPL
-Description: frontend to rsync
+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 b0cba7d..d107ec6 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-servicemanager.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-servicemanager.control
@@ -5,7 +5,7 @@ Depends: task-opie-minimal, opie-sh
 Priority: optional
 Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
-Architecture: arm
+Architecture: all
 License: GPL
-Description: frontend to start/stop init scripts
+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 37ac25b..1a47d1a 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-ssh-askpass.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-ssh-askpass.control
@@ -5,7 +5,7 @@ Depends: task-opie-minimal (1.5.0+), opie-sh (0.5-20020919+)
 Priority: optional
 Section: opie/sh
 Maintainer: David Woodhouse <dwmw2@infradead.org>
-Architecture: arm
+Architecture: all
 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 824a767..49f6ec1 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-stowawayctrl.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-stowawayctrl.control
@@ -5,7 +5,7 @@ Depends: task-opie-minimal, opie-sh
 Priority: optional
 Section: opie/sh
 Maintainer: spiralman <spiralman@softhome.net
-Architecture: arm
+Architecture: all
 License: GPL
-Description: frontend to start/stop Stowaway keyboard
+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 22f0b4d..8443c92 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-usbnetctrl.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-usbnetctrl.control
@@ -5,7 +5,7 @@ Depends: task-opie-minimal, opie-sh
 Priority: optional
 Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
-Architecture: arm
+Architecture: all
 License: GPL
-Description: frontend to start/stop usbnet
+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 aa0a38d..3c3463f 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-wavelanchooser.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-wavelanchooser.control
@@ -6,6 +6,6 @@ Depends: task-opie-minimal (1.5.0+), opie-sh
 Priority: optional
 Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
-Architecture: arm
+Architecture: all
 License: GPL
-Description: frontend to choose wavelan config
+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 02d5fdf..14bcc4b 100644
--- a/noncore/tools/opie-sh/scripts/task-opie-sh-apps.control
+++ b/noncore/tools/opie-sh/scripts/task-opie-sh-apps.control
@@ -5,7 +5,7 @@ Depends: task-opie-minimal (1.5.0+), opie-sh, opie-sh-fsmounter, opie-sh-killpro
 Priority: optional
 Section: opie/sh
 Maintainer: gonz <gonz@directbox.com>
-Architecture: arm
+Architecture: all
 License: GPL
 Description: Opie shell apps
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/remote/opie-remote.control b/noncore/tools/remote/opie-remote.control
index d29bb06..201d929 100644
--- a/noncore/tools/remote/opie-remote.control
+++ b/noncore/tools/remote/opie-remote.control
@@ -7,5 +7,5 @@ Architecture: arm
 Version: $QPE_VERSION$EXTRAVERSION
 Depends: task-opie-minimal, lirc
 License: GPL
-Description: a remote control
+Description: A remote control
  A remote control using irda. A frontend to lirc.
diff --git a/noncore/unsupported/filebrowser/opie-filebrowser.control b/noncore/unsupported/filebrowser/opie-filebrowser.control
index a9751f9..d40bd8a 100644
--- a/noncore/unsupported/filebrowser/opie-filebrowser.control
+++ b/noncore/unsupported/filebrowser/opie-filebrowser.control
@@ -2,7 +2,7 @@ Package: opie-filebrowser
 Files: bin/filebrowser apps/Applications/filebrowser.desktop pics/filebrowser/
 Priority: optional
 Section: opie/applications
-Maintainer: Opie Project <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal