8 files changed, 9 insertions, 9 deletions
diff --git a/inputmethods/dasher/opie-dasher-english.control b/inputmethods/dasher/opie-dasher-english.control
index c2cee2e..180f121 100644
--- a/inputmethods/dasher/opie-dasher-english.control
+++ b/inputmethods/dasher/opie-dasher-english.control
@@ -1,12 +1,12 @@
 Package: opie-dasher-english
 Files: share/dasher/training_english_GB.txt
 Priority: optional
 Section: opie/inputmethods
 Maintainer: Matthew Garrett <mjg59@srcf.ucam.org>
 Architecture: arm
-Version: $QPE_VERSION-1
+Version: $QPE_VERSION$EXTRAVERSION
 Depends: opie-dasher
 Description: Dasher text input method
  Dasher is a novel zooming text entry method that allows significantly faster
  text entry than traditional methods. This package provides the necessary
  data file to allow it to make predictions in English.
diff --git a/inputmethods/dasher/opie-dasher.control b/inputmethods/dasher/opie-dasher.control
index 586b88a..48c407a 100644
--- a/inputmethods/dasher/opie-dasher.control
+++ b/inputmethods/dasher/opie-dasher.control
@@ -1,11 +1,11 @@
 Package: opie-dasher
 Files: plugins/inputmethods/libqdasher.so* share/dasher/alphabet.xml
 Priority: optional
 Section: opie/inputmethods
 Maintainer: Matthew Garrett <mjg59@srcf.ucam.org>
 Architecture: arm
-Version: $QPE_VERSION-1
+Version: $QPE_VERSION$EXTRAVERSION
 Depends: task-opie-minimal
 Description: Dasher text input method
  Dasher is a novel zooming text entry method that allows significantly faster
  text entry than traditional methods.
diff --git a/noncore/net/opietooth/applet/config.in b/noncore/net/opietooth/applet/config.in
index ee37ed6..ec568ea 100644
--- a/noncore/net/opietooth/applet/config.in
+++ b/noncore/net/opietooth/applet/config.in
@@ -1,4 +1,4 @@
   config OPIETOOTH-APPLET
     boolean
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 && OPIETOOTH && LIBOPIETOOTH
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && OPIETOOTH && LIBOPIETOOTH
diff --git a/noncore/net/opietooth/blue-pin/config.in b/noncore/net/opietooth/blue-pin/config.in
index 93bc70c..c853717 100644
--- a/noncore/net/opietooth/blue-pin/config.in
+++ b/noncore/net/opietooth/blue-pin/config.in
@@ -1,4 +1,4 @@
   config BLUE-PIN
     boolean "opie-bluepin (Bluetooth pin application)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 && OPIETOOTH
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && OPIETOOTH
diff --git a/noncore/net/opietooth/lib/config.in b/noncore/net/opietooth/lib/config.in
index 7be2575..4e73895 100644
--- a/noncore/net/opietooth/lib/config.in
+++ b/noncore/net/opietooth/lib/config.in
@@ -1,4 +1,4 @@
   config LIBOPIETOOTH
     boolean "libopietooth1 (Opie Bluetooth library)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 && OPIETOOTH
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && OPIETOOTH
diff --git a/noncore/net/opietooth/lib/libopietooth1.control b/noncore/net/opietooth/lib/libopietooth1.control
index e96ce24..1040de2 100644
--- a/noncore/net/opietooth/lib/libopietooth1.control
+++ b/noncore/net/opietooth/lib/libopietooth1.control
@@ -1,10 +1,10 @@
 Package: libopietooth1
 Files: lib/libopietooth.so.1.0.0 lib/libopietooth.so.1.0 lib/libopietooth.so.1
 Priority: optional
 Section: libs
 Maintainer: Maximilian Reiß <max.reiss@gmx.de>
 Architecture: arm
 Replaces: libopietooth
-Depends: libqte2 (>=2.3.4), libopie, task-bluez
+Depends: libqte2 (>=2.3.4), libopie1, task-bluez
 Description: Opie bluetooth library
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/net/opietooth/manager/config.in b/noncore/net/opietooth/manager/config.in
index 2f06e37..ecebb9b 100644
--- a/noncore/net/opietooth/manager/config.in
+++ b/noncore/net/opietooth/manager/config.in
@@ -1,4 +1,4 @@
   config OPIETOOTH-MANAGER
     boolean "opie-bluetoothmanager (Bluetooth manager)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 && OPIETOOTH && LIBOPIETOOTH
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && OPIETOOTH && LIBOPIETOOTH
diff --git a/qt/control/qte-fonts-common.control b/qt/control/qte-fonts-common.control
index 1fd737c..14e7ccf 100644
--- a/qt/control/qte-fonts-common.control
+++ b/qt/control/qte-fonts-common.control
@@ -1,8 +1,8 @@
 Package: qte-fonts-common
 Files: root/usr/sbin/update-qtfontdir
 Priority: required
 Section: opie/system
 Maintainer: Opie Team <opie@handhelds.org>
-Architecture: arm
-Version: 1:$QTE_VERSION-$QTE_REVISION-1
+Architecture: all
+Version: 1:$QTE_VERSION-$QTE_REVISION
 Description: Qt/Embedded font common files