90 files changed, 108 insertions, 120 deletions

diff --git a/core/applets/batteryapplet/opie-batteryapplet.control b/core/applets/batteryapplet/opie-batteryapplet.control
index 94dc464..0bf5507 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
 Maintainer: Opie team <opie@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 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 02e1f2f..954faac 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
 Maintainer: Maximilian Reiß <max.reiss@gmx.de>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 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 63a7709..3768f3f 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
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 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 93841f7..9587882 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
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 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 41ae925..f3bfe81 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
 Maintainer: David Woodhouse <dwmw2@infradead.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION.1
 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/restartapplet2/opie-restartapplet2.control b/core/applets/restartapplet2/opie-restartapplet2.control
index 2928846..12040a8 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* 
 Priority: optional
 Section: opie/system
 Maintainer: L. J. Potter <ljp@llornkcor.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION.1
 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 50f6046..8f160a7 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* 
 Priority: optional
 Section: opie/system
 Maintainer: L. J. Potter <ljp@llornkcor.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 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 58f8798..55a45d7 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
 Maintainer: L.J. Potter <ljp@llornkcor.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 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 78ae4c6..99b1808 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
 Maintainer: L.J. Potter <ljp@llornkcor.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION.1
 Depends: task-opie-minimal
 Description: Volume applet
  Volume applet for the Opie environment taskbar.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/apps/embeddedkonsole/opie-embeddedkonsole.control b/core/apps/embeddedkonsole/opie-embeddedkonsole.control
index 1999e81..b72c1fc 100644
--- a/core/apps/embeddedkonsole/opie-embeddedkonsole.control
+++ b/core/apps/embeddedkonsole/opie-embeddedkonsole.control
@@ -1,10 +1,10 @@
 Package: opie-embeddedkonsole
 Files: bin/embeddedkonsole apps/Applications/embeddedkonsole.desktop pics/konsole
 Priority: optional
 Section: opie/applications
 Maintainer: L.J. Potter <ljp@llornkcor.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, libopie1, opie-keytabs
 Description: KDE's konsole (shell terminal)
  Ported to the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/apps/helpbrowser/opie-helpbrowser.control b/core/apps/helpbrowser/opie-helpbrowser.control
index 15eff8a..4312979 100644
--- a/core/apps/helpbrowser/opie-helpbrowser.control
+++ b/core/apps/helpbrowser/opie-helpbrowser.control
@@ -1,11 +1,11 @@
 Package: opie-helpbrowser
 Files: bin/helpbrowser apps/Applications/helpbrowser.desktop docs pics/helpbrowser
 Priority: optional
 Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Arch: iPAQ
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Description: Browse HTML help documents
  The HTML help browser for the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/apps/qcop/opie-qcop.control b/core/apps/qcop/opie-qcop.control
index 43779da..56463aa 100644
--- a/core/apps/qcop/opie-qcop.control
+++ b/core/apps/qcop/opie-qcop.control
@@ -1,10 +1,10 @@
 Package: opie-qcop
 Files: bin/qcop
 Priority: required
 Section: opie/system
 Maintainer: Martin Jones <mjones@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: libqte2
 Description: Interprocess communication client
  Interprocess communication client for the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/apps/textedit/opie-textedit.control b/core/apps/textedit/opie-textedit.control
index 0d86274..5ec205b 100644
--- a/core/apps/textedit/opie-textedit.control
+++ b/core/apps/textedit/opie-textedit.control
@@ -1,10 +1,10 @@
 Package: opie-textedit
 Files: bin/textedit apps/1Pim/textedit.desktop pics/textedit
 Priority: optional
 Section: opie/applications
 Maintainer: L. J. Potter <llornkcor@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 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 fe5f4e0..f6dcfc2 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>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION.3
 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 ccd93bd..15c083f 100644
--- a/core/multimedia/opieplayer/libmad/opie-libmadplugin.control
+++ b/core/multimedia/opieplayer/libmad/opie-libmadplugin.control
@@ -1,11 +1,11 @@
-Package: opieplayer1-libmadplugin
+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
 Maintainer: Maximilian Reiss <max.reiss@gmx.de>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 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 76adea2..4d690eb 100644
--- a/core/multimedia/opieplayer/libmpeg3/opie-libmpeg3plugin.control
+++ b/core/multimedia/opieplayer/libmpeg3/opie-libmpeg3plugin.control
@@ -1,10 +1,10 @@
-Package: opieplayer1-libmpeg3plugin
+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
 Maintainer: L.J.Potter <ljp@llornkcor.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 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 e8fe893..dba0d7b 100644
--- a/core/multimedia/opieplayer/modplug/opie-modplugin.control
+++ b/core/multimedia/opieplayer/modplug/opie-modplugin.control
@@ -1,10 +1,10 @@
-Package: opieplayer1-modplugin
+Package: opie-modplugin
 Files: plugins/codecs/libmodplugin.so*
 Priority: optional
 Section: opie/plugins
 Maintainer: Simon Hausmann <hausmann@kde.org>, L.J. Potter <llornkcor@handhelds.org>
 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/opie-mediaplayer.control b/core/multimedia/opieplayer/opie-mediaplayer.control
index eb2d157..97e9f88 100644
--- a/core/multimedia/opieplayer/opie-mediaplayer.control
+++ b/core/multimedia/opieplayer/opie-mediaplayer.control
@@ -1,10 +1,10 @@
 Package: opie-mediaplayer
 Files: bin/opieplayer pics/opieplayer apps/Applications/opieplayer.desktop
 Priority: optional
 Section: opie/applications
 Maintainer: L.J.Potter <ljp@llornkcor.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, libopie1, opie-mediaplayer2-skin-default | opie-mediaplayer2-skin-default-landscape
 Description: The Opie media player
  The mediaplayer for Opie. It plays mp3, mpeg, and wav.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/multimedia/opieplayer/vorbis/opie-libtremorplugin.control b/core/multimedia/opieplayer/vorbis/opie-libtremorplugin.control
index d47904f..ab834d1 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
 Maintainer: L.J. Potter <llornkcor@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 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/vorbis/tremor/libtremor.control b/core/multimedia/opieplayer/vorbis/tremor/libtremor.control
index 9defddc..3a0b3b8 100644
--- a/core/multimedia/opieplayer/vorbis/tremor/libtremor.control
+++ b/core/multimedia/opieplayer/vorbis/tremor/libtremor.control
@@ -1,10 +1,10 @@
 Package: libtremor
-Files: root/usr/lib/libtremor.so root/usr/lib/libtremor.so.1 root/usr/lib/libtremor.so.1.0 root/usr/lib/libtremor.so.1.0.0
+Files: lib/libtremor.so lib/libtremor.so.1 lib/libtremor.so.1.0 lib/libtremor.so.1.0.0
 Priority: optional
 Section: opie/plugins
 Maintainer: Lorn Potter <llornkcor@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Description: vorbis (tremor) library
  Library needed for playing 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 f5fa641..a59c35b 100644
--- a/core/multimedia/opieplayer/wavplugin/opie-wavplugin.control
+++ b/core/multimedia/opieplayer/wavplugin/opie-wavplugin.control
@@ -1,10 +1,10 @@
-Package: opieplayer1-wavplugin
+Package: opie-wavplugin
 Files: plugins/codecs/libwavplugin*
 Priority: optional
 Section: opie/plugins
 Maintainer: Lorn Potter <llornkcor@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 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 778c411..d43aa89 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
 Maintainer: holger Freyther <zecke@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION.1
 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 d28c67e..4d2ebf4 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
+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>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-common, libqpe1, libopie1
+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 e2e90a8..dca6c96 100644
--- a/core/opiealarm/opie-opiealarm.control
+++ b/core/opiealarm/opie-opiealarm.control
@@ -1,13 +1,13 @@
 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
-Version: $QPE_VERSION-$SUB_VERSION
 Description: A wakeup system for OPIE events.
  Tiny, OPIE specific  replacement for ipaqalarm,
  uschedule and qpe2uschedule
  
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/pim/osearch/opie-osearch.control b/core/pim/osearch/opie-osearch.control
index 54e2cda..ef209de 100644
--- a/core/pim/osearch/opie-osearch.control
+++ b/core/pim/osearch/opie-osearch.control
@@ -1,10 +1,10 @@
 Package: opie-osearch
 Files: bin/osearch apps/1Pim/osearch.desktop pics/osearch/*.png
 Priority: optional
 Section: opie/
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Description: search...
 
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/pim/today/opie-today.control b/core/pim/today/opie-today.control
index a057faa..70f7738 100644
--- a/core/pim/today/opie-today.control
+++ b/core/pim/today/opie-today.control
@@ -1,17 +1,17 @@
 Package: opie-today
 Files: bin/today apps/1Pim/today.desktop pics/today/*
 Priority: optional
 Section: opie/applications
 Maintainer: Maximilian Reiß <harlekin@handhelds.org>
 Architecture: arm
-Version: 0.6.2-$SUB_VERSION
+Version: $QPE_VERSION$EXTRAVERSION
 Depends: task-opie-minimal, libopie1
 License: GPL
 Description: today screen
  This today screen app gives an overview of appointments 
  and todos.
  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/datebook/opie-today-datebookplugin.control b/core/pim/today/plugins/datebook/opie-today-datebookplugin.control
index 231f4d0..e07d770 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
 Maintainer: Maximilian Reiss <harlekin@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: libqte2, opie-today
 Description: Datebook plugin for today
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/pim/today/plugins/todolist/opie-today-todolistplugin.control b/core/pim/today/plugins/todolist/opie-today-todolistplugin.control
index e6944b5..0f05e47 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
 Maintainer: Maximilian Reiss <harlekin@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 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 d28e1f8..b4bddbf 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
 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, opie-today-mailplugin
+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/settings/button/opie-button-settings.control b/core/settings/button/opie-button-settings.control
index fcc10e7..34dc7e0 100644
--- a/core/settings/button/opie-button-settings.control
+++ b/core/settings/button/opie-button-settings.control
@@ -1,10 +1,10 @@
 Package: opie-button-settings
 Files: bin/buttonsettings apps/Settings/Button.desktop pics/buttonsettings/*.png
 Priority: optional
 Section: opie/settings
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Description: Device-buttons settings dialog
  For the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/settings/citytime/opie-citytime.control b/core/settings/citytime/opie-citytime.control
index ce26e34..5b0c8da 100644
--- a/core/settings/citytime/opie-citytime.control
+++ b/core/settings/citytime/opie-citytime.control
@@ -1,10 +1,10 @@
 Package: opie-citytime
 Files: bin/citytime apps/Settings/citytime.desktop pics/citytime
 Priority: optional
 Section: opie/settings
 Maintainer: Maximilian Reiss <harlekin@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, timezones
 Description: Time-zone / world clock settings
  The time-zone manager for the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/settings/launcher/opie-launcher-settings.control b/core/settings/launcher/opie-launcher-settings.control
index 21a5559..0e7832d 100644
--- a/core/settings/launcher/opie-launcher-settings.control
+++ b/core/settings/launcher/opie-launcher-settings.control
@@ -1,10 +1,10 @@
 Package: opie-launcher-settings
 Files: bin/launchersettings apps/Settings/Launcher.desktop pics/launchersettings
 Priority: optional
 Section: opie/settings
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Description: Launcher settings dialog
  For the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/settings/light-and-power/opie-light-and-power.control b/core/settings/light-and-power/opie-light-and-power.control
index 89a5b2f..da6fc4f 100644
--- a/core/settings/light-and-power/opie-light-and-power.control
+++ b/core/settings/light-and-power/opie-light-and-power.control
@@ -1,10 +1,10 @@
 Package: opie-light-and-power
 Files: bin/light-and-power apps/Settings/Light.desktop pics/lightandpower
 Priority: optional
 Section: opie/settings
 Maintainer: Maximilian Reiss <harlekin@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Description: Light and Power settings dialog
  For the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/settings/security/opie-security.control b/core/settings/security/opie-security.control
index 84b001d..0da6f0f 100644
--- a/core/settings/security/opie-security.control
+++ b/core/settings/security/opie-security.control
@@ -1,10 +1,10 @@
 Package: opie-security
 Files: bin/security apps/Settings/Security.desktop pics/security
 Priority: optional
 Section: opie/settings
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Description: Security settings dialog
  For the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-advancedfm-help-en.control b/help/en/html/opie-advancedfm-help-en.control
index b3b7f5e..47bb08a 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/opie-advancedfm.html 
+Files: help/en/html/advancedfm.html 
 Priority: optional
 Section: opie/onlinedoc
 Maintainer: ljp <llornkcor@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-advancedfm
 License: GPL
 Description: Opie Advanced file manager help files (english)
  
+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 011191f..a4c73df 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
+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
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-aqpkg
 License: GPL
 Description: AQPkg Opie package manager help files (english)
  
+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 3ac3954..d6ecf47 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>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 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 560505e..4c6892a 100644
--- a/help/en/html/opie-embeddedkonsole-help-en.control
+++ b/help/en/html/opie-embeddedkonsole-help-en.control
@@ -1,11 +1,9 @@
 Package: opie-embeddedkonsole-help-en
-Files: help/en/html/opie-embeddedkonsole.html
+Files: help/en/html/embeddedkonsole.html
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: ljp <llornkcor@handhelds.org>
-Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
+Maintainer: Team Opie <opie@handhelds.org>
 Depends: opie-embeddedkonsole
 License: GPL
-Description: Open Embeddedkonsole help files (english)
- 
+Description: embeddedkonsole 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 f2fd4f7..3d7cb15 100644
--- a/help/en/html/opie-formatter-help-en.control
+++ b/help/en/html/opie-formatter-help-en.control
@@ -1,11 +1,9 @@
 Package: opie-formatter-help-en
-Files: help/en/html/opie-formatter.html
+Files: help/en/html/formatter.html
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: ljp <llornkcor@handhelds.org>
-Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
+Maintainer: Team Opie <opie@handhelds.org>
 Depends: opie-formatter
 License: GPL
-Description: Formatter help files (english)
- 
+Description: formatter 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 9285cd0..c067c67 100644
--- a/help/en/html/opie-keypebble-help-en.control
+++ b/help/en/html/opie-keypebble-help-en.control
@@ -1,11 +1,9 @@
 Package: opie-keypebble-help-en
-Files: help/en/html/opie-keypebble.html 
+Files: help/en/html/keypebble.html help/en/html/keypebble
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: treke <treke@handhelds.org>
-Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
+Maintainer: Team Opie <opie@handhelds.org>
 Depends: opie-keypebble
 License: GPL
-Description: Opie VNC Viewer help files (english)
- 
+Description: keypebble 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 726308c..c81f29a 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/opie-vmemo.html
+Files: help/en/html/vmemo.html
 Priority: optional
 Section: opie/onlinedoc
 Maintainer: ljp <llornkcor@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 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 597b9ac..33aa974 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
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-wellenreiter
 License: GPL
 Description: Opie Wellenreiter help files (english)
  
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/library/opie-common.control b/library/opie-common.control
index 052d368..9cb0c75 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/* pics/opie-sh/opie-sh.png
+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>
 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-minimal.control b/library/task-opie-minimal.control
index c629d51..155bd9a 100644
--- a/library/task-opie-minimal.control
+++ b/library/task-opie-minimal.control
@@ -1,14 +1,13 @@
 Package: task-opie-minimal
 Files: 
 Priority: required
 Section: opie/system
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: libqte2 (>=$QTE_VERSION), qte-fonts (>=$QTE_VERSION), opie-common, libqpe1, libopie1, opie-qcop, opie-sounds, apmd, opie-pics, timezones, opie-aqpkg, opie-taskbar, opie-opiealarm, opie-login 
 Provides: opie-base, qpe-base
 Replaces: opie-base, qpe-base
 Description: Bootstrap Opie environment(minimal)
  A complete GUI environment for handhelds. This is the _minimal_ version.
  You will probably want to install one of the opie-i18n-* packages.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/library/task-opie-settings.control b/library/task-opie-settings.control
index e8ffb45..7922bff 100644
--- a/library/task-opie-settings.control
+++ b/library/task-opie-settings.control
@@ -1,11 +1,10 @@
 Package: task-opie-settings
 Files: 
 Priority: optional
 Section: opie/applications
 Maintainer: Maximilian Reiss <max.reiss@gmx.de>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-appearance, opie-security, opie-systemtime, opie-light-and-power
 Description: Opie settings app
  All settings apps
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/comm/mobilemsg/opie-mobilemsg.control b/noncore/comm/mobilemsg/opie-mobilemsg.control
index c5fbc7f..98ac72e 100644
--- a/noncore/comm/mobilemsg/opie-mobilemsg.control
+++ b/noncore/comm/mobilemsg/opie-mobilemsg.control
@@ -1,10 +1,10 @@
 Package: opie-mobilemsg
-Files: bin/mobilemsg apps/Applications/mobilemsg.desktop
+Files: bin/mobilemsg apps/Applications/mobilemsg.desktop pics/mobilemsg 
 Priority: optional
 Section: opie/comm
 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/settings/appearance2/opie-appearance.control b/noncore/settings/appearance2/opie-appearance.control
index 43705e1..2b08c76 100644
--- a/noncore/settings/appearance2/opie-appearance.control
+++ b/noncore/settings/appearance2/opie-appearance.control
@@ -1,10 +1,10 @@
 Package: opie-appearance
 Files: bin/appearance apps/Settings/Appearance.desktop pics/appearance
 Priority: optional
 Section: opie/settings
 Maintainer: Dan Williams <wiliamsdr@acm.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, libopie1
 Description: Appearance 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 2f166b9..f4040aa 100644
--- a/noncore/settings/language/opie-language.control
+++ b/noncore/settings/language/opie-language.control
@@ -1,10 +1,10 @@
 Package: opie-language
 Files: bin/language apps/Settings/Language.desktop
 Priority: optional
 Section: opie/settings
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Description: Language settings dialog
  For the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/mediummount/opie-mediummount.control b/noncore/settings/mediummount/opie-mediummount.control
index 295fba4..637095f 100644
--- a/noncore/settings/mediummount/opie-mediummount.control
+++ b/noncore/settings/mediummount/opie-mediummount.control
@@ -1,11 +1,11 @@
 Package: opie-mediummount
 Files: bin/mediummount apps/Settings/medium.desktop pics/mediummount/*
 Priority: optional
 Section: opie/settings
 Maintainer: Holger Freyther <zecke@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION.1
 Depends: task-opie-minimal
 License: GPL
 Description: Configure app for the medium mounter
  Configure app 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 a1f69e4..ced9333 100644
--- a/noncore/settings/netsystemtime/opie-systemtime.control
+++ b/noncore/settings/netsystemtime/opie-systemtime.control
@@ -1,11 +1,11 @@
 Package: opie-systemtime
 Files: 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>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 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 62bf6f2..124d1e6 100644
--- a/noncore/settings/networksettings/opie-networksettings.control
+++ b/noncore/settings/networksettings/opie-networksettings.control
@@ -1,10 +1,10 @@
 Package: opie-networksettings
 Files: bin/networksettings apps/Settings/networksettings.desktop pics/networksettings/* pics/Network/PPPConnect.png $OPIEDIR/lib/libinterfaces.so* root/usr/bin/changedns bin/getprofile
 Priority: optional
 Section: opie/settings
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Description: Network settings.
 Replaces: opie-networksetup
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/networksettings/ppp/opie-networksettingsplugin-kppp.control b/noncore/settings/networksettings/ppp/opie-networksettingsplugin-kppp.control
index c68ae33..94b1d3f 100644
--- a/noncore/settings/networksettings/ppp/opie-networksettingsplugin-kppp.control
+++ b/noncore/settings/networksettings/ppp/opie-networksettingsplugin-kppp.control
@@ -1,10 +1,10 @@
 Package: opie-networksettingsplugin-kppp
-Files: plugins/networksettings/libkppp.so* 
+Files: plugins/networksettings/libkppp.so* root/etc/ppp/peers/*
 Priority: optional
 Section: opie/settings
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-networksettings
 Description: Network settings kppp plugin.
 
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/networksettings/wlan/opie-networksettingsplugin-wlan.control b/noncore/settings/networksettings/wlan/opie-networksettingsplugin-wlan.control
index 703aea5..719337f 100644
--- a/noncore/settings/networksettings/wlan/opie-networksettingsplugin-wlan.control
+++ b/noncore/settings/networksettings/wlan/opie-networksettingsplugin-wlan.control
@@ -1,10 +1,10 @@
 Package: opie-networksettingsplugin-wlan
 Files: plugins/networksettings/libwlan.so* 
 Priority: optional
 Section: opie/settings
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-networksettings
 Description: Network settings wavelan plugin.
 
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/sound/opie-vmemo-settings.control b/noncore/settings/sound/opie-vmemo-settings.control
index 895ef44..d7589d3 100644
--- a/noncore/settings/sound/opie-vmemo-settings.control
+++ b/noncore/settings/sound/opie-vmemo-settings.control
@@ -1,12 +1,12 @@
 Package: opie-vmemo-settings
 Files: bin/sound apps/Settings/Sound.desktop
 Priority: optional
 Section: opie/settings
 Maintainer: L.J. Potter
 Architecture: arm
 Arch: iPAQ
-Version: $QPE_VERSION-$SUB_VERSION
 Conflicts: opie-sound
 Depends: task-opie-minimal
-Description: Settings for voice memos
+Description: Sound settings dialog
  For the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/sshkeys/opie-sshkeys.control b/noncore/settings/sshkeys/opie-sshkeys.control
index ec7afbc..44c58b6 100644
--- a/noncore/settings/sshkeys/opie-sshkeys.control
+++ b/noncore/settings/sshkeys/opie-sshkeys.control
@@ -1,9 +1,9 @@
 Package: opie-sshkeys
 Files: bin/sshkeys apps/Settings/sshkeys.desktop pics/sshkeys/sshkeys.png
 Priority: optional
 Section: opie/settings
 Maintainer: David Woodhouse <dwmw2@infradead.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, ssh, opie-sh-ssh-askpass
 Description: Utility for managing ssh-agent keys.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/tabmanager/opie-tabmanager.control b/noncore/settings/tabmanager/opie-tabmanager.control
index 65b4702..f064f12 100644
--- a/noncore/settings/tabmanager/opie-tabmanager.control
+++ b/noncore/settings/tabmanager/opie-tabmanager.control
@@ -1,11 +1,11 @@
 Package: opie-tabmanager
 Files: bin/tabmanager apps/Settings/tabmanager.desktop pics/tabmanager/tabmanager.png
 Priority: optional
 Section: opie/settings
-Version: $QPE_VERSION-$SUB_VERSION-1.2
 Depends: task-opie-minimal
 Architecture: arm
 Maintainer: Benjamin Meyer <meyerb@sharpsec.com>
 Description: Tab Manager
  Create new tabs, remove old tabs. Edit tab's name, comment and icon.
  Edit applications name, exec, comment and icon. Add/remove applications.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/usermanager/opie-usermanager.control b/noncore/settings/usermanager/opie-usermanager.control
index 9948dab..90367e6 100644
--- a/noncore/settings/usermanager/opie-usermanager.control
+++ b/noncore/settings/usermanager/opie-usermanager.control
@@ -1,10 +1,10 @@
 Package: opie-usermanager
 Files: bin/usermanager apps/Settings/usermanager.desktop pics/usermanager/*
 Priority: optional
 Section: opie/settings
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Architecture: arm
 Maintainer: Ted Parnefors <zaurus@bredband.net>
 License: GPL
 Description: User/Group manager for Opie.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/styles/flat/opie-style-flat.control b/noncore/styles/flat/opie-style-flat.control
index 97953d9..80d8afc 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
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 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 edcce64..661200d 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
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 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 2701013..250f308 100644
--- a/noncore/styles/liquid/opie-liquid.control
+++ b/noncore/styles/liquid/opie-liquid.control
@@ -1,11 +1,11 @@
 Package: opie-liquid
 Files: plugins/styles/libliquid.so*
 Priority: optional
 Section: opie/system
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION.1
 Depends: task-opie-minimal
 Description: Liquid style by Mosfet.
  Mosfet's well known Liquid GUI style from KDE,
  ported to OPIE.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/styles/metal/opie-metal.control b/noncore/styles/metal/opie-metal.control
index 5afb8b6..653e126 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* 
 Priority: optional
 Section: opie/system
 Maintainer: L.J. Potter <ljp@llornkcor.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION.1
 Depends: task-opie-minimal
 Description: Metal style by Trolltech.
  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 2b1f873..d53de77 100644
--- a/noncore/styles/theme/opie-theme-luna.control
+++ b/noncore/styles/theme/opie-theme-luna.control
@@ -1,11 +1,11 @@
 Package: opie-theme-luna
 Files: plugins/styles/themes/luna.themerc plugins/styles/pixmaps/luna/*.png
 Priority: optional
 Section: opie/system
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION.1
 Depends: opie-theme
 Description: Luna theme for OPIE.
  This is the KDE2 theme Luna from Aronnax repackaged
  for OPIE.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/styles/theme/opie-theme.control b/noncore/styles/theme/opie-theme.control
index c658aad..eaff270 100644
--- a/noncore/styles/theme/opie-theme.control
+++ b/noncore/styles/theme/opie-theme.control
@@ -1,11 +1,11 @@
 Package: opie-theme
 Files: plugins/styles/libtheme.so*
 Priority: optional
 Section: opie/system
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION.1
 Depends: task-opie-minimal
 Description: Themed style.
  This style accepts all themes written
  for KDE 2.2
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/todayplugins/fortune/opie-today-fortuneplugin.control b/noncore/todayplugins/fortune/opie-today-fortuneplugin.control
index 6737c35..8f3f4ea 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
 Maintainer: Chris Larson <kergoth@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 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 a67949a..5b328d9 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
 Maintainer: ljp <llornkcor@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 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 5b8937f..806b64f 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>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: libqte2, opie-today
 Description: Current weather plugin for today.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/calculator/opie-calculator.control b/noncore/tools/calculator/opie-calculator.control
index fbbe246..79d6970 100644
--- a/noncore/tools/calculator/opie-calculator.control
+++ b/noncore/tools/calculator/opie-calculator.control
@@ -1,11 +1,11 @@
 Package: opie-calculator
 Files: bin/calculator apps/Applications/calculator.desktop etc/unit_conversion.dat pics/calc
 Priority: optional
 Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Description: Calculator
  A multi-function calculator for the Opie environment.
  Includes units conversion.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/clock/opie-clock.control b/noncore/tools/clock/opie-clock.control
index 09841ae..381feba 100644
--- a/noncore/tools/clock/opie-clock.control
+++ b/noncore/tools/clock/opie-clock.control
@@ -1,10 +1,10 @@
 Package: opie-clock
 Files: bin/clock apps/Applications/clock.desktop
 Priority: optional
 Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Description: Clock and stop-watch
  A simple clock and stop-watch for the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/euroconv/opie-euroconv.control b/noncore/tools/euroconv/opie-euroconv.control
index 44d6024..711be63 100644
--- a/noncore/tools/euroconv/opie-euroconv.control
+++ b/noncore/tools/euroconv/opie-euroconv.control
@@ -1,10 +1,10 @@
 Package: opie-euroconv
 Files: bin/euroconv pics/euroconv/* apps/Applications/euroconv.desktop
 Priority: optional
 Section: opie/applications
 Maintainer: Eric Santonacci <Eric.Santonacci@talc.fr>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Description: Euroconv
  Converts currencies between different european formats
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/formatter/opie-formatter.control b/noncore/tools/formatter/opie-formatter.control
index 78c46bf..ef710b0 100644
--- a/noncore/tools/formatter/opie-formatter.control
+++ b/noncore/tools/formatter/opie-formatter.control
@@ -1,11 +1,11 @@
 Package: opie-formatter
 Files: bin/formatter pics/formatter/devices.png apps/Settings/formatter.desktop
 Priority: optional
 Section: opie/applications
 Maintainer: L.J. Potter <ljp@llornkcor.com> 
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 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 e9a23d9..dc55b18 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 bin/opie-sh-howto.sh apps/Opie-SH/opie-sh.desktop pics/opie-sh/error.png pics/opie-sh/info.png pics/opie-sh/warning.png help/opie-sh/*.html
+Files: bin/opie-sh bin/opie-sh-howto.sh apps/Opie-SH/opie-sh.desktop pics/opie-sh/*.png help/opie-sh/*.html
 Priority: optional
 Section: opie/applications
 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 ca424f6..4823e78 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
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-sh
 Priority: optional
 Section: opie/settings
 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 26a2a44..3d08470 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 
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-sh
 Priority: optional
 Section: opie/settings
 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 d529bb4..cbc53ed 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 
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-sh
 Priority: optional
 Section: opie/settings
 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 d63a135..058787f 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 
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-sh
 Priority: optional
 Section: opie/settings
 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 8b9dfb2..d3e2133 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
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-sh
 Priority: optional
 Section: opie/settings
 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 3cb5172..21ec678 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 
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-sh
 Priority: optional
 Section: opie/settings
 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 f9f03cd..f1e9435 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 
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-sh
 Priority: optional
 Section: opie/settings
 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 639511d..b638098 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
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-sh
 Priority: optional
 Section: opie/settings
 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 c89a9a7..fe00f03 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 
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal (1.5.0+), opie-sh (0.5-20020919+)
 Priority: optional
 Section: opie/system
 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 ce158e1..04546f4 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 
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-sh
 Priority: optional
 Section: opie/settings
 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 0e7315f..7513db9 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 
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-sh
 Priority: optional
 Section: opie/settings
 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/task-opie-sh-apps.control b/noncore/tools/opie-sh/scripts/task-opie-sh-apps.control
index d687a1f..15a1502 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 
-Version: $QPE_VERSION-$SUB_VERSION
 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
 Maintainer: gonz <gonz@directbox.com>
 Architecture: arm
 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 4685c71..a3255db 100644
--- a/noncore/tools/remote/opie-remote.control
+++ b/noncore/tools/remote/opie-remote.control
@@ -1,11 +1,11 @@
 Package: opie-remote
 Files: bin/remote apps/Applications/remote.desktop pics/remote/*.png
 Priority: optional
 Section: opie/applications
 Maintainer: Thomas Stephens <spiralman@softhome.net>
 Architecture: arm
-Version: 0.3-$SUB_VERSION
+Version: $QPE_VERSION$EXTRAVERSION
 Depends: task-opie-minimal, lirc
 License: GPL
 Description: a remote control
  A remote control using irda. A frontend to lirc.
diff --git a/pics/opie-pics.control b/pics/opie-pics.control
index bb9e7b9..547ce31 100644
--- a/pics/opie-pics.control
+++ b/pics/opie-pics.control
@@ -1,9 +1,9 @@
 Package: opie-pics
-Files: pics/??*.* pics/opie/*
+Files: pics/??*.* pics/opie/* pics/addressbook/*.png pics/todo/*.png pics/datebook/*.png
 Priority: required
 Section: opie/system
 Maintainer: Project Opie <opie@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION.2
-Description: a few unassigned for Opie environment
- These icons are available to all Opie application.
+Description: Including unassigned and pim pics (TodoList, Addressbook, Datebook).
+ These icons are available to all Opie applications.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/scripts/remove/opie-remove.control b/scripts/remove/opie-remove.control
index 9b3b749..c837dc8 100644
--- a/scripts/remove/opie-remove.control
+++ b/scripts/remove/opie-remove.control
@@ -1,8 +1,7 @@
 Package: opie-remove
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Section: opie/system
 Priority: optional
 Version: 0.9.1
-Architecture: all
 Description: Remove opie -- Use at own risc -- will remove opie and /opt/QtPalmtop/
 Files:
diff --git a/scripts/remove/qpe-remove.control b/scripts/remove/qpe-remove.control
index 96b4b45..0b766d9 100644
--- a/scripts/remove/qpe-remove.control
+++ b/scripts/remove/qpe-remove.control
@@ -1,8 +1,7 @@
 Package: qpe-remove
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Section: opie/system
 Priority: optional
 Version: 0.9.1
-Architecture: all
 Description: Remove qtopia -- Use at own risc -- will remove qtopia and /opt/QtPalmtop/
 Files:
diff --git a/scripts/update/opie-update.control b/scripts/update/opie-update.control
index 91d0ab9..e8fdc65 100644
--- a/scripts/update/opie-update.control
+++ b/scripts/update/opie-update.control
@@ -1,9 +1,8 @@
 Package: opie-update
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Section: opie/system
 Priority: optional
 Version: 0.9.1
-Architecture: all
 Description: Reinstall opie.  Dummy package that reinstalls opie, by removing 
  everything and reinstalling it.
 Files:
diff --git a/scripts/update/qpe-opie-update.control b/scripts/update/qpe-opie-update.control
index 1dd79de..add6746 100644
--- a/scripts/update/qpe-opie-update.control
+++ b/scripts/update/qpe-opie-update.control
@@ -1,10 +1,9 @@
 Package: qpe-opie-update
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Section: opie/system
 Priority: optional
 Version: 0.9.1
-Architecture: all
 Description: Remove qtopia and install opie.  Dummy package that removes qtopia
  and installs opie, by removing everything and installing the same opie
  packages.
 Files:
diff --git a/sounds/opie-sounds.control b/sounds/opie-sounds.control
index cb4d84e..b720e0d 100644
--- a/sounds/opie-sounds.control
+++ b/sounds/opie-sounds.control
@@ -1,9 +1,9 @@
 Package: opie-sounds
 Files: sounds/*.wav
 Priority: required
 Section: opie/system
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Description: Basic sounds for Opie environment
  These sounds are available to all Opie applications.
+Version: $QPE_VERSION$EXTRAVERSION