Merges from BRANCH_1_0

9 files changed, 9 insertions, 9 deletions

diff --git a/inputmethods/dvorak/opie-dvorak.control b/inputmethods/dvorak/opie-dvorak.control
index 4fa9847..7e66c1a 100644
--- a/inputmethods/dvorak/opie-dvorak.control
+++ b/inputmethods/dvorak/opie-dvorak.control
@@ -1,12 +1,12 @@
 Package: opie-dvorak
 Files: plugins/inputmethods/libqdvorak.so*
 Priority: optional
 Section: opie/inputmethods
 Maintainer: Jeremy Cowgar <jc@cowgar.com>
 Architecture: arm
-Version: $QPE_VERSION-4
 Depends: task-opie-minimal, opie-pickboard
 Description: Dvorak keyboard input method
  Dvorak keyboard input method for the Opie environment. This is
  based off of the original keyboard input method. Thanks be to
  Martin Jones <mjones@trolltech.com> for the original.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/inputmethods/handwriting/opie-handwriting-classicset.control b/inputmethods/handwriting/opie-handwriting-classicset.control
index f320a78..db13c0d 100644
--- a/inputmethods/handwriting/opie-handwriting-classicset.control
+++ b/inputmethods/handwriting/opie-handwriting-classicset.control
@@ -1,10 +1,10 @@
 Package: opie-handwriting-classicset
 Files: etc/qimpen/default.conf etc/qimpen/combining.qpt etc/qimpen/asciilower.qpt etc/qimpen/asciiupper.qpt etc/qimpen/numeric.qpt
 Priority: optional
 Section: opie/inputmethods
 Maintainer: Jake Richardson <jake@asdfnews.org>
 Architecture: all
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Description: Classic character set for the Handwriting inputmethod.
  Classic character set for the Handwriting inputmethod.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/inputmethods/handwriting/opie-handwriting.control b/inputmethods/handwriting/opie-handwriting.control
index 470c81b..e2f49c9 100644
--- a/inputmethods/handwriting/opie-handwriting.control
+++ b/inputmethods/handwriting/opie-handwriting.control
@@ -1,10 +1,10 @@
 Package: opie-handwriting
 Files: plugins/inputmethods/libqhandwriting.so*
 Priority: optional
 Section: opie/inputmethods
 Maintainer: Martin Jones <mjones@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-handwriting-classicset | opie-handwriting-graffitiset
 Description: Handwriting input method
  Handwriting recognition input method for the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/inputmethods/jumpx/opie-jumpx.control b/inputmethods/jumpx/opie-jumpx.control
index 270a428..b8664cc 100644
--- a/inputmethods/jumpx/opie-jumpx.control
+++ b/inputmethods/jumpx/opie-jumpx.control
@@ -1,11 +1,11 @@
 Package: opie-jumpx
 Files: plugins/inputmethods/libqjumpx.so* pics/jumpx
 Priority: optional
 Section: opie/inputmethods
 Maintainer: Markus Gritsch <gritsch@iue.tuwien.ac.at>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 License: GPL
 Description: JumpX input method
  Keyboard-like input method for the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/inputmethods/keyboard/opie-keyboard.control b/inputmethods/keyboard/opie-keyboard.control
index 701026b..0162cec 100644
--- a/inputmethods/keyboard/opie-keyboard.control
+++ b/inputmethods/keyboard/opie-keyboard.control
@@ -1,10 +1,10 @@
 Package: opie-keyboard
 Files: plugins/inputmethods/libqkeyboard.so*
 Priority: optional
 Section: opie/inputmethods
 Maintainer: Martin Jones <mjones@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-pickboard
 Description: Keyboard input method
  Keyboard input method for the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/inputmethods/kjumpx/opie-kjumpx.control b/inputmethods/kjumpx/opie-kjumpx.control
index 06759a6..3650812 100644
--- a/inputmethods/kjumpx/opie-kjumpx.control
+++ b/inputmethods/kjumpx/opie-kjumpx.control
@@ -1,11 +1,11 @@
 Package: opie-kjumpx
 Files: plugins/inputmethods/libqkjumpx.so* pics/kjumpx/*
 Priority: optional
 Section: opie/inputmethods
 Maintainer: Jake Richardson <jake@asdfnews.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 License: GPL
 Description: Koreanized JumpX input method
  Keyboard-like input method for the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/inputmethods/multikey/opie-multikey.control b/inputmethods/multikey/opie-multikey.control
index bb4fd97..11e06cb 100644
--- a/inputmethods/multikey/opie-multikey.control
+++ b/inputmethods/multikey/opie-multikey.control
@@ -1,10 +1,10 @@
 Package: opie-multikey
 Files: plugins/inputmethods/libqmultikey.so* share/multikey/*
 Priority: optional
 Section: opie/inputmethods
 Maintainer: Jake Richardson (jake@asdfnews.org)
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-pickboard
 Description: Multiple language keyboard
  Keyboard for inputing multiple languages in the OPIE environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/inputmethods/pickboard/opie-pickboard.control b/inputmethods/pickboard/opie-pickboard.control
index d722721..5db91f6 100644
--- a/inputmethods/pickboard/opie-pickboard.control
+++ b/inputmethods/pickboard/opie-pickboard.control
@@ -1,10 +1,10 @@
 Package: opie-pickboard
 Files: plugins/inputmethods/libqpickboard.so*
 Priority: optional
 Section: opie/inputmethods
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Description: Pickboard input method
  Pickboard dictionary-based input method for the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/inputmethods/unikeyboard/opie-unikeyboard.control b/inputmethods/unikeyboard/opie-unikeyboard.control
index cd06721..30eb03a 100644
--- a/inputmethods/unikeyboard/opie-unikeyboard.control
+++ b/inputmethods/unikeyboard/opie-unikeyboard.control
@@ -1,10 +1,10 @@
 Package: opie-unikeyboard
 Files: plugins/inputmethods/libqunikeyboard.so*
 Priority: optional
 Section: opie/inputmethods
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Description: Unicode input method
  Basic unicode input method for the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION