25 files changed, 14 insertions, 29 deletions
diff --git a/i18n/opie-i18n-es.control b/i18n/opie-i18n-es.control
index f8184a6..63acbaa 100644
--- a/i18n/opie-i18n-es.control
+++ b/i18n/opie-i18n-es.control
@@ -6,4 +6,4 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: i18n: Spanish
-Spanish UI texts and dictionary for Qtopia environment.
+ Spanish UI texts and dictionary for Qtopia environment.
diff --git a/i18n/opie-i18n-fr.control b/i18n/opie-i18n-fr.control
index 14f1063..dca23cc 100644
--- a/i18n/opie-i18n-fr.control
+++ b/i18n/opie-i18n-fr.control
@@ -6,4 +6,4 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: i18n: French
-French UI texts and dictionary for Qtopia environment.
+ French UI texts and dictionary for Qtopia environment.
diff --git a/libopie/libopie.control b/libopie/libopie.control
index 7672528..6bf3883 100644
--- a/libopie/libopie.control
+++ b/libopie/libopie.control
@@ -1,7 +1,6 @@
 Files: $QTDIR/lib/libopie.so.1.0.0 $QTDIR/lib/libopie.so.1.0 $QTDIR/lib/libopie.so.1 pics/opie/*
 Priority: optional
 Section: opie/system
-Package: libopie
 Maintainer: - 
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
diff --git a/noncore/apps/advancedfm/opie-advancedfm.control b/noncore/apps/advancedfm/opie-advancedfm.control
index 957a584..bda8543 100644
--- a/noncore/apps/advancedfm/opie-advancedfm.control
+++ b/noncore/apps/advancedfm/opie-advancedfm.control
@@ -1,6 +1,5 @@
 Files: bin/advancedfm apps/Applications/advancedfm.desktop
 Priority: optional
-Package: opie-advancedfm
 Section: opie/applications
 Maintainer: L.J. Potter <ljp@llornkcor.com> 
 Architecture: arm
diff --git a/noncore/games/kcheckers/opie-kcheckers.control b/noncore/games/kcheckers/opie-kcheckers.control
index a1b0503..3c47a7e 100644
--- a/noncore/games/kcheckers/opie-kcheckers.control
+++ b/noncore/games/kcheckers/opie-kcheckers.control
@@ -1,5 +1,4 @@
 Files: bin/kcheckers apps/Games/kcheckers.desktop pics/kcheckers
-Package: opie-kcheckers
 Priority: optional
 Section: opie/games
 Maintainer: leseb <prudhomme@laposte.net>
diff --git a/noncore/games/kpacman/opie-kpacman.control b/noncore/games/kpacman/opie-kpacman.control
index 13714c0..aa7353e 100644
--- a/noncore/games/kpacman/opie-kpacman.control
+++ b/noncore/games/kpacman/opie-kpacman.control
@@ -1,5 +1,4 @@
 Files: bin/kpacman apps/Games/kpacman.desktop pics/kpacman/kpacman.png share/kpacman
-Package: opie-kpacman
 Version: 0.3.1
 Depends: opie-base ($QPE_VERSION)
 Priority: optional
diff --git a/noncore/games/tictac/opie-tictac.control b/noncore/games/tictac/opie-tictac.control
index 9bbd746..11ffb2e 100644
--- a/noncore/games/tictac/opie-tictac.control
+++ b/noncore/games/tictac/opie-tictac.control
@@ -1,5 +1,4 @@
 Files: bin/tictac apps/Games/tictac.desktop pics/tictac
-Package: opie-tictac
 Priority: optional
 Section: opie/games
 Maintainer: ljp <ljp@llornkcor.com>
diff --git a/noncore/graphics/drawpad/opie-drawpad.control b/noncore/graphics/drawpad/opie-drawpad.control
index e3bb01d..11e56e0 100644
--- a/noncore/graphics/drawpad/opie-drawpad.control
+++ b/noncore/graphics/drawpad/opie-drawpad.control
@@ -1,5 +1,4 @@
 Files: bin/drawpad apps/1Pim/drawpad.desktop pics/drawpad
-Package: opie-drawpad
 Priority: optional
 Section: opie/applications
 Maintainer: S�bastien Prud'homme <prudhomme@laposte.net>
diff --git a/noncore/net/opieftp/opieftp.control b/noncore/net/opieftp/opieftp.control
index eb83311..18ec80f 100644
--- a/noncore/net/opieftp/opieftp.control
+++ b/noncore/net/opieftp/opieftp.control
@@ -1,6 +1,5 @@
 Files: bin/opieftp pics/opieftp apps/Applications/opieftp.desktop
 Priority: optional
-Package: opieftp
 Section: Communications
 Maintainer: L.J. Potter <ljp@llornkcor.com> 
 Architecture: arm
diff --git a/noncore/net/opietooth/lib/libopietooth.control b/noncore/net/opietooth/lib/libopietooth.control
index 7f26206..d35b119 100644
--- a/noncore/net/opietooth/lib/libopietooth.control
+++ b/noncore/net/opietooth/lib/libopietooth.control
@@ -1,7 +1,6 @@
 Files: $QTDIR/lib/libopietooth.so.1.0.0 $QTDIR/lib/libopietooth.so.1.0 $QTDIR/lib/libopietooth.so.1 
 Priority: optional
 Section: opie/system
-Package: libopietooth
 Maintainer: Maximilian Rei� <max.reiss@gmx.de>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
diff --git a/noncore/settings/netsystemtime/opie-netsystemtime.control b/noncore/settings/netsystemtime/opie-netsystemtime.control
index b9f9891..c04b89b 100644
--- a/noncore/settings/netsystemtime/opie-netsystemtime.control
+++ b/noncore/settings/netsystemtime/opie-netsystemtime.control
@@ -8,4 +8,4 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION), ntpdate, libopie
 Description: ntp (Network  Time  Protocol) gui
-This utility syncs system time with a atomic timerserver via internet
+ This utility syncs system time with a atomic timerserver via internet
diff --git a/noncore/settings/tabmanager/opie-tabmanager.control b/noncore/settings/tabmanager/opie-tabmanager.control
index 04c2624..9254a9f 100644
--- a/noncore/settings/tabmanager/opie-tabmanager.control
+++ b/noncore/settings/tabmanager/opie-tabmanager.control
@@ -1,4 +1,3 @@
-Package: opie-tabmanager
 Files: bin/tabmanager apps/Settings/tabmanager.desktop pics/tabmanager/tabmanager.png
 Priority: optional
 Section: opie/settings
diff --git a/noncore/styles/liquid/opie-liquid.control b/noncore/styles/liquid/opie-liquid.control
index 7b6ae71..eb4c503 100644
--- a/noncore/styles/liquid/opie-liquid.control
+++ b/noncore/styles/liquid/opie-liquid.control
@@ -7,4 +7,4 @@ Version: $QPE_VERSION-$SUB_VERSION.1
 Depends: opie-base ($QPE_VERSION)
 Description: Liquid style by Mosfet.
 Mosfet's well known Liquid GUI style from KDE,
-ported to OPIE.
+ ported to OPIE.
diff --git a/noncore/styles/theme/opie-theme-luna.control b/noncore/styles/theme/opie-theme-luna.control
index 3764da8..05bbff5 100644
--- a/noncore/styles/theme/opie-theme-luna.control
+++ b/noncore/styles/theme/opie-theme-luna.control
@@ -7,4 +7,4 @@ Version: $QPE_VERSION-$SUB_VERSION.1
 Depends: opie-theme ($QPE_VERSION)
 Description: Luna theme for OPIE.
 This is the KDE2 theme Luna from Aronnax repackaged
-for OPIE.
+ for OPIE.
diff --git a/noncore/styles/theme/opie-theme.control b/noncore/styles/theme/opie-theme.control
index adb4f4b..1485884 100644
--- a/noncore/styles/theme/opie-theme.control
+++ b/noncore/styles/theme/opie-theme.control
@@ -7,5 +7,4 @@ Version: $QPE_VERSION-$SUB_VERSION.1
 Depends: opie-base ($QPE_VERSION)
 Description: Themed style.
 This style accepts all themes written
-for KDE 2.2
+ for KDE 2.2
diff --git a/noncore/tools/formatter/opie-formatter.control b/noncore/tools/formatter/opie-formatter.control
index 6feb202..b6ecf7d 100644
--- a/noncore/tools/formatter/opie-formatter.control
+++ b/noncore/tools/formatter/opie-formatter.control
@@ -1,6 +1,5 @@
 Files: bin/formatter pics/formatter/devices.png apps/Settings/formatter.desktop
 Priority: optional
-Package: formatter
 Section: opie/applications
 Maintainer: L.J. Potter <ljp@llornkcor.com> 
 Architecture: arm
diff --git a/noncore/tools/opie-sh/opie-sh.control b/noncore/tools/opie-sh/opie-sh.control
index 8f586fe..1ebf659 100644
--- a/noncore/tools/opie-sh/opie-sh.control
+++ b/noncore/tools/opie-sh/opie-sh.control
@@ -1,6 +1,5 @@
 Files: bin/opie-sh* apps/Applications/opie-sh.desktop pics/opie-sh/*.png help/opie-sh/*.html
 Priority: optional
-Package: opie-sh
 Section: opie/applications
 Maintainer: Thomas Stephens <spiralman@softhome.net>
 Architecture: arm
diff --git a/noncore/unsupported/mail2/bend/opie-mailapplet.control b/noncore/unsupported/mail2/bend/opie-mailapplet.control
index 05c5a1c..9a8b5c6 100644
--- a/noncore/unsupported/mail2/bend/opie-mailapplet.control
+++ b/noncore/unsupported/mail2/bend/opie-mailapplet.control
@@ -1,5 +1,4 @@
 Files: plugins/applets/libbend.so*
-Package: opie-mailapplet
 Priority: optional
 Section: opie/applications
 Maintainer: Constantin Bergemann <cbergemann@lisa.de>
diff --git a/noncore/unsupported/mail2/opie-mail2.control b/noncore/unsupported/mail2/opie-mail2.control
index 544a0b9..a323a4c 100644
--- a/noncore/unsupported/mail2/opie-mail2.control
+++ b/noncore/unsupported/mail2/opie-mail2.control
@@ -1,5 +1,4 @@
 Files: bin/mail $QTDIR/lib/libmail.so* apps/1Pim/mail.desktop pics/mail/*.png sounds/mail/*.wav
-Package: opie-mail2
 Priority: optional
 Section: opie/applications
 Maintainer: Constantin Bergemann <cbergemann@lisa.de>
diff --git a/noncore/unsupported/qpdf/opie-qpdf.control b/noncore/unsupported/qpdf/opie-qpdf.control
index 6763e85..3642a8e 100644
--- a/noncore/unsupported/qpdf/opie-qpdf.control
+++ b/noncore/unsupported/qpdf/opie-qpdf.control
@@ -1,5 +1,4 @@
 Files: bin/qpdf apps/Applications/qpdf.desktop pics/qpdf/qpdf_icon.png
-Package: opie-qpdf
 Priority: optional
 Section: opie/applications
 Maintainer: Robert Griebl <sandman@handhelds.org>
diff --git a/root/ptydevs.control b/root/ptydevs.control
index 8d9146c..dbff09f 100644
--- a/root/ptydevs.control
+++ b/root/ptydevs.control
@@ -3,7 +3,7 @@ Priority: optional
 Section: base
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Version: 1.0.0-5
-Arch: iPAQ
+Architecture: arm
 Description: Pseudotty devices
 These files are not included in the Familiar libc6 package.
 This package contains just a few pty/tty pairs.
diff --git a/scripts/remove/opie-remove.control b/scripts/remove/opie-remove.control
index 8ccedcd..cb4a406 100644
--- a/scripts/remove/opie-remove.control
+++ b/scripts/remove/opie-remove.control
@@ -1,5 +1,5 @@
-Packagename: opie-remove
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Section: opie/system
+Priority: optional
 Version: 0.9.1
 Description: Remove opie -- Use at own risc -- will remove opie and /opt/QtPalmtop/
diff --git a/scripts/remove/qpe-remove.control b/scripts/remove/qpe-remove.control
index b239713..b1f002d 100644
--- a/scripts/remove/qpe-remove.control
+++ b/scripts/remove/qpe-remove.control
@@ -1,5 +1,5 @@
-Packagename: qpe
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Section: opie/system
+Priority: optional
 Version: 0.9.1
 Description: Remove qtopia -- Use at own risc -- will remove qtopia and /opt/QtPalmtop/
diff --git a/scripts/update/opie-update.control b/scripts/update/opie-update.control
index 34cb01b..a2f5e97 100644
--- a/scripts/update/opie-update.control
+++ b/scripts/update/opie-update.control
@@ -1,6 +1,6 @@
-Packagename: opie-update
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Section: opie/system
+Priority: optional
 Version: 0.9.1
 Description: Reinstall opie.  Dummy package that reinstalls opie, by removing 
-everything and reinstalling it.
+ everything and reinstalling it.
diff --git a/scripts/update/qpe-opie-update.control b/scripts/update/qpe-opie-update.control
index 329754a..81a5370 100644
--- a/scripts/update/qpe-opie-update.control
+++ b/scripts/update/qpe-opie-update.control
@@ -1,7 +1,7 @@
-Packagename: qpe-opie-update
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Section: opie/system
+Priority: optional
 Version: 0.9.1
 Description: Remove qtopia and install opie.  Dummy package that removes qtopia
-and installs opie, by removing everything and installing the same opie
+ and installs opie, by removing everything and installing the same opie
-packages.
+ packages.