8 files changed, 10 insertions, 10 deletions

diff --git a/core/apps/calibrate/opie-calibrate.control b/core/apps/calibrate/opie-calibrate.control
index 3bd6884..0f2daaf 100644
--- a/core/apps/calibrate/opie-calibrate.control
+++ b/core/apps/calibrate/opie-calibrate.control
@@ -4,7 +4,7 @@ Priority: optional
 Section: opie/applications
 Architecture: arm
 Maintainer: Opie Team <opie@handhelds.org>
-Version: $QPE_VERSION-$SUB_VERSION
-Depends: task-opie-minimal, libopie1
+Version: $QPE_VERSION$EXTRAVERSION
+Depends: task-opie-minimal, libqpe1
 Description: Standalone calibration utility
  Use this standalone calibration utility to calibrate your touchscreen.
diff --git a/core/multimedia/opieplayer/modplug/opie-modplugin.control b/core/multimedia/opieplayer/modplug/opie-modplugin.control
index 1f86c47..9e0957b 100644
--- a/core/multimedia/opieplayer/modplug/opie-modplugin.control
+++ b/core/multimedia/opieplayer/modplug/opie-modplugin.control
@@ -4,7 +4,7 @@ Priority: optional
 Section: libs
 Maintainer: Simon Hausmann <hausmann@kde.org>, L.J. Potter <lpotter@trolltech.com>
 Architecture: arm
-Version: 2.0.2
+Version: $QPE_VERSION$EXTRAVERSION
 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/obex/libopieobex0.control b/core/obex/libopieobex0.control
index 91f7366..383f778 100644
--- a/core/obex/libopieobex0.control
+++ b/core/obex/libopieobex0.control
@@ -4,7 +4,7 @@ Priority: optional
 Section: libs
 Maintainer: holger Freyther <zecke@handhelds.org>
 Architecture: arm
-Depends: task-opie-minimal ($QPE_VERSION), openobex | libopenobex1
+Depends: task-opie-minimal ($QPE_VERSION), openobex | libopenobex-1.0-1
 Provides: libopieobex1
 Replaces: libopieobex1
 Description: Irda obex lib
diff --git a/core/pim/today/plugins/mail/opie-today-mailplugin.control b/core/pim/today/plugins/mail/opie-today-mailplugin.control
index 60598e6..3a73db7 100644
--- a/core/pim/today/plugins/mail/opie-today-mailplugin.control
+++ b/core/pim/today/plugins/mail/opie-today-mailplugin.control
@@ -4,6 +4,6 @@ Priority: optional
 Section: opie/plugins
 Maintainer: Maximilian Reiss <harlekin@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
+Version: $QPE_VERSION$EXTRAVERSION
 Depends: libqte2, opie-today, opie-mailapplet
 Description: Mail plugin for Today
diff --git a/core/pim/today/task-opie-today.control b/core/pim/today/task-opie-today.control
index 1df02bd..6798141 100644
--- a/core/pim/today/task-opie-today.control
+++ b/core/pim/today/task-opie-today.control
@@ -3,8 +3,8 @@ Priority: optional
 Section: opie/pim
 Maintainer: Maximilian Reiß <harlekin@handhelds.org>
 Architecture: arm
-Version: 0.5-$SUB_VERSION
-Depends: task-opie-minimal, libopie1, opie-today, opie-today-datebookplugin, opie-today-todolistplugin
+Version: $QPE_VERSION$EXTRAVERSION
+Depends: task-opie-minimal, opie-today, opie-today-datebookplugin, opie-today-todolistplugin
 License: GPL
 Description: Task for basic Today app setup
  Includes datebook and todolist plugins.
diff --git a/core/settings/citytime/opie-citytime.control b/core/settings/citytime/opie-citytime.control
index 5f3f33c..03fa555 100644
--- a/core/settings/citytime/opie-citytime.control
+++ b/core/settings/citytime/opie-citytime.control
@@ -4,7 +4,7 @@ Priority: optional
 Section: opie/settings
 Maintainer: Maximilian Reiss <harlekin@handhelds.org>
 Architecture: arm
-Depends: task-opie-minimal, timezones
+Depends: task-opie-minimal
 Description: Time-zone / world clock settings
  The time-zone manager for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/settings/security/demo/multiauth.control b/core/settings/security/demo/multiauth.control
index 756e5b8..c7dd82a 100644
--- a/core/settings/security/demo/multiauth.control
+++ b/core/settings/security/demo/multiauth.control
@@ -4,7 +4,7 @@ Priority: optional
 Section: opie/settings
 Maintainer: Clement Seveillac <clement@nist.gov>
 Architecture: arm
-Version: 0.0.2
+Version: $QPE_VERSION$EXTRAVERSION
 Depends: opie-security
 Description: multi-plugin authentication demonstrator for Opie.
  This demonstration application allows us to use one or several
diff --git a/core/symlinker/opie-symlinker.control b/core/symlinker/opie-symlinker.control
index 6378653..9b55380 100644
--- a/core/symlinker/opie-symlinker.control
+++ b/core/symlinker/opie-symlinker.control
@@ -4,6 +4,6 @@ Priority: optional
 Section: opie/system
 Maintainer: Project Opie <opie@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION.3
+Version: $QPE_VERSION$EXTRAVERSION
 Depends: task-opie-minimal
 Description: Enables apps on external media