Merge from BRANCH_1_0.

39 files changed, 42 insertions, 42 deletions

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,8 +1,8 @@
 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
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
@@ -2,10 +2,10 @@ 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
@@ -2,11 +2,11 @@ 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,8 +1,8 @@
 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
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.