summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-08-09 16:02:00 (UTC)
committer kergoth <kergoth>2003-08-09 16:02:00 (UTC)
commite3f4607edd0c1ca1434adb446df1d4a1d27c6a86 (patch) (side-by-side diff)
tree873766a505b5acfdc39959fb5e3fb28daa6d84f8
parent0799b67a825c8ec00e57a63e5a5d55fd26bb2337 (diff)
downloadopie-e3f4607edd0c1ca1434adb446df1d4a1d27c6a86.zip
opie-e3f4607edd0c1ca1434adb446df1d4a1d27c6a86.tar.gz
opie-e3f4607edd0c1ca1434adb446df1d4a1d27c6a86.tar.bz2
Merges from BRANCH_1_0
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/dvorak/opie-dvorak.control2
-rw-r--r--inputmethods/handwriting/opie-handwriting-classicset.control2
-rw-r--r--inputmethods/handwriting/opie-handwriting.control2
-rw-r--r--inputmethods/jumpx/opie-jumpx.control2
-rw-r--r--inputmethods/keyboard/opie-keyboard.control2
-rw-r--r--inputmethods/kjumpx/opie-kjumpx.control2
-rw-r--r--inputmethods/multikey/opie-multikey.control2
-rw-r--r--inputmethods/pickboard/opie-pickboard.control2
-rw-r--r--inputmethods/unikeyboard/opie-unikeyboard.control2
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
@@ -6,3 +6,2 @@ Maintainer: Jeremy Cowgar <jc@cowgar.com>
Architecture: arm
-Version: $QPE_VERSION-4
Depends: task-opie-minimal, opie-pickboard
@@ -12 +11,2 @@ Description: Dvorak keyboard input method
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
@@ -6,3 +6,2 @@ Maintainer: Jake Richardson <jake@asdfnews.org>
Architecture: all
-Version: $QPE_VERSION-$SUB_VERSION
Depends: task-opie-minimal
@@ -10 +9,2 @@ 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
@@ -6,3 +6,2 @@ Maintainer: Martin Jones <mjones@trolltech.com>
Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
Depends: task-opie-minimal, opie-handwriting-classicset | opie-handwriting-graffitiset
@@ -10 +9,2 @@ 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
@@ -6,3 +6,2 @@ Maintainer: Markus Gritsch <gritsch@iue.tuwien.ac.at>
Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
Depends: task-opie-minimal
@@ -11 +10,2 @@ 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
@@ -6,3 +6,2 @@ Maintainer: Martin Jones <mjones@trolltech.com>
Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
Depends: task-opie-minimal, opie-pickboard
@@ -10 +9,2 @@ 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
@@ -6,3 +6,2 @@ Maintainer: Jake Richardson <jake@asdfnews.org>
Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
Depends: task-opie-minimal
@@ -11 +10,2 @@ 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
@@ -6,3 +6,2 @@ Maintainer: Jake Richardson (jake@asdfnews.org)
Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
Depends: task-opie-minimal, opie-pickboard
@@ -10 +9,2 @@ 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
@@ -6,3 +6,2 @@ Maintainer: Warwick Allison <warwick@trolltech.com>
Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
Depends: task-opie-minimal
@@ -10 +9,2 @@ 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
@@ -6,3 +6,2 @@ Maintainer: Warwick Allison <warwick@trolltech.com>
Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
Depends: task-opie-minimal
@@ -10 +9,2 @@ Description: Unicode input method
Basic unicode input method for the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION