58 files changed, 154 insertions, 144 deletions

diff --git a/core/applets/batteryapplet/qpe-batteryapplet.control b/core/applets/batteryapplet/opie-batteryapplet.control
index 83d0b8b..1d5f7bf 100644
--- a/core/applets/batteryapplet/qpe-batteryapplet.control
+++ b/core/applets/batteryapplet/opie-batteryapplet.control
@@ -1,9 +1,9 @@
 Files: plugins/applets/libbatteryapplet.so*
 Priority: optional
-Section: qpe/taskbar
+Section: opie/taskbar
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Battery Monitor applet
  Battery Monitor applet for the Qtopia environment taskbar.
diff --git a/core/applets/clipboardapplet/qpe-clipboardapplet.control b/core/applets/clipboardapplet/opie-clipboardapplet.control
index 26cbc55..d69b0e0 100644
--- a/core/applets/clipboardapplet/qpe-clipboardapplet.control
+++ b/core/applets/clipboardapplet/opie-clipboardapplet.control
@@ -1,9 +1,9 @@
 Files: plugins/applets/libclipboardapplet.so*
 Priority: optional
-Section: qpe/taskbar
+Section: opie/taskbar
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Clipboard applet
  Clipboard applet for the Qtopia environment taskbar.
diff --git a/core/applets/clockapplet/qpe-clockapplet.control b/core/applets/clockapplet/opie-clockapplet.control
index 9532ca8..5fb8bd5 100644
--- a/core/applets/clockapplet/qpe-clockapplet.control
+++ b/core/applets/clockapplet/opie-clockapplet.control
@@ -1,9 +1,9 @@
 Files: plugins/applets/libclockapplet.so*
 Priority: optional
-Section: qpe/taskbar
+Section: opie/taskbar
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Clock applet
  Clock applet for the Qtopia environment taskbar.
diff --git a/core/applets/volumeapplet/qpe-volumeapplet.control b/core/applets/volumeapplet/opie-volumeapplet.control
index a80262a..1bc3aca 100644
--- a/core/applets/volumeapplet/qpe-volumeapplet.control
+++ b/core/applets/volumeapplet/opie-volumeapplet.control
@@ -1,9 +1,9 @@
 Files: plugins/applets/libvolumeapplet.so*
 Priority: optional
-Section: qpe/taskbar
+Section: opie/taskbar
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Volume applet
  Volume applet for the Qtopia environment taskbar.
diff --git a/core/apps/embeddedkonsole/qpe-embeddedkonsole.control b/core/apps/embeddedkonsole/opie-embeddedkonsole.control
index 9b7c355..b087b9f 100644
--- a/core/apps/embeddedkonsole/qpe-embeddedkonsole.control
+++ b/core/apps/embeddedkonsole/opie-embeddedkonsole.control
@@ -1,9 +1,9 @@
 Files: bin/embeddedkonsole apps/Applications/embeddedkonsole.desktop pics/konsole etc/keytabs/*
 Priority: optional
 Section: qpe/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-4
-Depends: qpe-base ($QPE_VERSION), ptydevs
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION), ptydevs
 Description: KDE's konsole (shell terminal)
  Ported to the Qtopia environment.
diff --git a/core/apps/helpbrowser/qpe-helpbrowser.control b/core/apps/helpbrowser/opie-helpbrowser.control
index b6e3404..91569ce 100644
--- a/core/apps/helpbrowser/qpe-helpbrowser.control
+++ b/core/apps/helpbrowser/opie-helpbrowser.control
@@ -1,10 +1,10 @@
 Files: bin/helpbrowser apps/Applications/helpbrowser.desktop docs
 Priority: optional
 Section: qpe/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Arch: iPAQ
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Browse HTML help documents
  The HTML help browser for the Qtopia environment.
diff --git a/core/apps/qcop/qpe-qcop.control b/core/apps/qcop/opie-qcop.control
index 60107c4..113d40d 100644
--- a/core/apps/qcop/qpe-qcop.control
+++ b/core/apps/qcop/opie-qcop.control
@@ -1,9 +1,9 @@
 Files: bin/qcop
 Priority: required
-Section: qpe/system
+Section: opie/system
 Maintainer: Martin Jones <mjones@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
+Version: $QPE_VERSION-$SUB_VERSION
 Depends: qt-embedded (>=$QTE_VERSION)
 Description: Interprocess communication client
  Interprocess communication client for the Qtopia environment.
diff --git a/core/apps/textedit/qpe-textedit.control b/core/apps/textedit/opie-textedit.control
index b0dad7d..e0a7b03 100644
--- a/core/apps/textedit/qpe-textedit.control
+++ b/core/apps/textedit/opie-textedit.control
@@ -1,9 +1,9 @@
 Files: bin/textedit apps/Applications/textedit.desktop
 Priority: optional
-Section: qpe/applications
+Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Text Editor
  The text editor for the Qtopia environment.
diff --git a/core/launcher/qpe-taskbar.control b/core/launcher/opie-taskbar.control
index f78f136..0fa7ae8 100644
--- a/core/launcher/qpe-taskbar.control
+++ b/core/launcher/opie-taskbar.control
@@ -1,9 +1,9 @@
 Files: bin/qpe apps/Settings/Calibrate.desktop
 Priority: required
-Section: qpe/system
+Section: opie/system
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
+Version: $QPE_VERSION-$SUB_VERSION
 Depends: qt-embedded (>=$QTE_VERSION)
 Description: Launcher for QPE
  The "finder" or "explorer", or whatever you want to call it.
diff --git a/core/multimedia/opieplayer/libmad/qpe-libmadplugin.control b/core/multimedia/opieplayer/libmad/opie-libmadplugin.control
index 077350c..ad3f49e 100644
--- a/core/multimedia/opieplayer/libmad/qpe-libmadplugin.control
+++ b/core/multimedia/opieplayer/libmad/opie-libmadplugin.control
@@ -1,9 +1,9 @@
 Files: plugins/codecs/libmadplugin.so.1.0.0 plugins/codecs/libmadplugin.so.1.0 plugins/codecs/libmadplugin.so.1 plugins/codecs/libmadplugin.so
 Priority: optional
-Section: qpe/plugins
+Section: opie/plugins
 Maintainer: John Ryland <jryland@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: MP3 file plugin using libmad
  Plugin to play MP3 files with the mediaplayer in the Qtopia environment.
diff --git a/core/multimedia/opieplayer/qpe-mpegplayer.control b/core/multimedia/opieplayer/opie-mpegplayer.control
index 2cad8ab..f98fdd3 100644
--- a/core/multimedia/opieplayer/qpe-mpegplayer.control
+++ b/core/multimedia/opieplayer/opie-mpegplayer.control
@@ -1,9 +1,9 @@
 Files: bin/mpegplayer pics/mpegplayer/* apps/Applications/mpegplayer.desktop plugins/codecs/libmpeg3plugin.so plugins/codecs/libmpeg3plugin.so.1 plugins/codecs/libmpeg3plugin.so.1.0 plugins/codecs/libmpeg3plugin.so.1.0.0
 Priority: optional
-Section: qpe/applications
+Section: opie/applications
 Maintainer: John Ryland <jryland@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: MPEG video/audio player
  The mpegplayer for the Qtopia environment.
diff --git a/core/multimedia/opieplayer/wavplugin/qpe-wavplugin.control b/core/multimedia/opieplayer/wavplugin/opie-wavplugin.control
index 8e7eedb..31b1d49 100644
--- a/core/multimedia/opieplayer/wavplugin/qpe-wavplugin.control
+++ b/core/multimedia/opieplayer/wavplugin/opie-wavplugin.control
@@ -1,9 +1,9 @@
 Files: plugins/codecs/libwavplugin.so.1.0.0 plugins/codecs/libwavplugin.so.1.0 plugins/codecs/libwavplugin.so.1 plugins/codecs/libwavplugin.so
 Priority: optional
-Section: qpe/plugins
+Section: opie/plugins
 Maintainer: John Ryland <jryland@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: WAV file plugin
  Plugin to play WAV files with the mediaplayer in the Qtopia environment.
diff --git a/core/pim/addressbook/qpe-addressbook.control b/core/pim/addressbook/opie-addressbook.control
index cca98f3..a9bcc41 100644
--- a/core/pim/addressbook/qpe-addressbook.control
+++ b/core/pim/addressbook/opie-addressbook.control
@@ -1,9 +1,9 @@
 Files: bin/addressbook apps/Applications/addressbook.desktop
 Priority: optional
 Section: qpe/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Contacts
  A simple addressbook for the Qtopia environment.
diff --git a/core/pim/datebook/qpe-datebook.control b/core/pim/datebook/opie-datebook.control
index c6ab81a..a3ca2b2 100644
--- a/core/pim/datebook/qpe-datebook.control
+++ b/core/pim/datebook/opie-datebook.control
@@ -1,9 +1,9 @@
 Files: bin/datebook apps/Applications/datebook.desktop
 Priority: optional
 Section: qpe/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: A datebook/appointment manager
  A datebook/appointment manager for the Qtopia environment.
diff --git a/core/pim/todo/qpe-todo.control b/core/pim/todo/opie-todo.control
index 80195a0..77f0746 100644
--- a/core/pim/todo/qpe-todo.control
+++ b/core/pim/todo/opie-todo.control
@@ -1,9 +1,9 @@
 Files: bin/todolist apps/Applications/todo.desktop
 Priority: optional
-Section: qpe/applications
+Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: TODO-list manager
  A Todo-list manager for the Qtopia environment.
diff --git a/core/settings/citytime/qpe-citytime.control b/core/settings/citytime/opie-citytime.control
index fcec4a6..4a6b6de 100644
--- a/core/settings/citytime/qpe-citytime.control
+++ b/core/settings/citytime/opie-citytime.control
@@ -1,9 +1,9 @@
 Files: bin/citytime apps/Applications/citytime.desktop
 Priority: optional
 Section: qpe/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION), timezones
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION), timezones
 Description: Time-zone / world clock settings
  The time-zone manager for the Qtopia environment.
diff --git a/core/settings/light-and-power/qpe-light-and-power.control b/core/settings/light-and-power/opie-light-and-power.control
index 0ed9d84..d3128c4 100644
--- a/core/settings/light-and-power/qpe-light-and-power.control
+++ b/core/settings/light-and-power/opie-light-and-power.control
@@ -1,9 +1,9 @@
 Files: bin/light-and-power apps/Settings/Light.desktop
 Priority: optional
-Section: qpe/settings
+Section: opie/settings
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Light and Power settings dialog
  For the Qtopia environment.
diff --git a/core/settings/security/qpe-security.control b/core/settings/security/opie-security.control
index 78a5a86..c6da693 100644
--- a/core/settings/security/qpe-security.control
+++ b/core/settings/security/opie-security.control
@@ -1,9 +1,9 @@
 Files: bin/security apps/Settings/Security.desktop
 Priority: optional
-Section: qpe/settings
+Section: opie/settings
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Security settings dialog
  For the Qtopia environment.
diff --git a/i18n/qpe-i18n-de.control b/i18n/opie-i18n-de.control
index 98b06f9..6f49bd5 100644
--- a/i18n/qpe-i18n-de.control
+++ b/i18n/opie-i18n-de.control
@@ -1,9 +1,9 @@
 Files: i18n/de/.directory i18n/de/*.qm etc/dict/dawg.de
 Priority: optional
 Section: qpe/i18n
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: i18n: Deutsch
  German UI texts and dictionary for Qtopia environment.
diff --git a/i18n/qpe-i18n-en.control b/i18n/opie-i18n-en.control
index d732114..2f2b468 100644
--- a/i18n/qpe-i18n-en.control
+++ b/i18n/opie-i18n-en.control
@@ -1,9 +1,9 @@
 Files: i18n/en/.directory etc/dict/dawg
 Priority: optional
 Section: qpe/i18n
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: i18n: English
  English dictionary for Qtopia environment.
diff --git a/i18n/qpe-i18n-hu.control b/i18n/opie-i18n-hu.control
index 04ffefc..e95f17b 100644
--- a/i18n/qpe-i18n-hu.control
+++ b/i18n/opie-i18n-hu.control
@@ -1,10 +1,10 @@
 Files: i18n/hu/.directory i18n/hu/*.qm etc/dict/dawg.hu
 Priority: optional
 Section: qpe/i18n
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Arch: iPAQ
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: i18n: Magyar
  Hungarian UI texts and dictionary for Qtopia environment.
diff --git a/i18n/qpe-i18n-ja.control b/i18n/opie-i18n-ja.control
index 0e6404b..06f55fe 100644
--- a/i18n/qpe-i18n-ja.control
+++ b/i18n/opie-i18n-ja.control
@@ -1,10 +1,10 @@
 Files: i18n/ja/.directory i18n/ja/*.qm
 Priority: optional
 Section: qpe/i18n
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Arch: iPAQ
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION), qpf-cyberbit-120-50-t10
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION), qpf-cyberbit-120-50-t10
 Description: i18n: Japanese
  Japanese UI texts for Qtopia environment.
diff --git a/i18n/qpe-i18n-ko.control b/i18n/opie-i18n-ko.control
index 2f3ac2c..f282909 100644
--- a/i18n/qpe-i18n-ko.control
+++ b/i18n/opie-i18n-ko.control
@@ -1,10 +1,10 @@
 Files: i18n/ko/.directory i18n/ko/*.qm
 Priority: optional
 Section: qpe/i18n
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Arch: iPAQ
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION), qpf-cyberbit-120-50-t10
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION), qpf-cyberbit-120-50-t10
 Description: i18n: Korean
  Korean UI texts for Qtopia environment.
diff --git a/i18n/qpe-i18n-no.control b/i18n/opie-i18n-no.control
index d570123..b486dcc 100644
--- a/i18n/qpe-i18n-no.control
+++ b/i18n/opie-i18n-no.control
@@ -1,10 +1,10 @@
 Files: i18n/no/.directory i18n/no/*.qm etc/dict/dawg.no
 Priority: optional
 Section: qpe/i18n
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Arch: iPAQ
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: i18n: Norsk
  Norwegian UI texts and dictionary for Qtopia environment.
diff --git a/i18n/qpe-i18n-zh-CN.control b/i18n/opie-i18n-zh-cn.control
index b218f32..74eec03 100644
--- a/i18n/qpe-i18n-zh-CN.control
+++ b/i18n/opie-i18n-zh-cn.control
@@ -1,10 +1,10 @@
 Files: i18n/zh_CN/.directory i18n/zh_CN/*.qm
 Priority: optional
 Section: qpe/i18n
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Arch: iPAQ
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION), qpf-cyberbit-120-50-t10
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION), qpf-cyberbit-120-50-t10
 Description: i18n: Chinese
  Chinese UI texts for Qtopia environment.
diff --git a/i18n/opie-i18n-zh-tw.control b/i18n/opie-i18n-zh-tw.control
new file mode 100644
index 0000000..ece21e4
--- a/dev/null
+++ b/i18n/opie-i18n-zh-tw.control
@@ -0,0 +1,10 @@
+Files: i18n/zh_TW/.directory i18n/zh_TW/*.qm
+Priority: optional
+Section: qpe/i18n
+Maintainer: Warwick Allison <warwick@trolltech.com>
+Architecture: arm
+Arch: iPAQ
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION), qpf-cyberbit-120-50-t10
+Description: i18n: Chinese (TW)
+ Chinese UI texts for Qtopia environment.
diff --git a/inputmethods/handwriting/qpe-handwriting.control b/inputmethods/handwriting/opie-handwriting.control
index f1648c6..84d8ef1 100644
--- a/inputmethods/handwriting/qpe-handwriting.control
+++ b/inputmethods/handwriting/opie-handwriting.control
@@ -1,9 +1,9 @@
 Files: plugins/inputmethods/libqhandwriting.so*
 Priority: optional
 Section: qpe/inputmethods
 Maintainer: Martin Jones <mjones@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Handwriting input method
  Handwriting recognition input method for the Qtopia environment.
diff --git a/inputmethods/keyboard/qpe-keyboard.control b/inputmethods/keyboard/opie-keyboard.control
index dae67f9..76252cd 100644
--- a/inputmethods/keyboard/qpe-keyboard.control
+++ b/inputmethods/keyboard/opie-keyboard.control
@@ -1,9 +1,9 @@
 Files: plugins/inputmethods/libqkeyboard.so*
 Priority: optional
 Section: qpe/inputmethods
 Maintainer: Martin Jones <mjones@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Keyboard input method
  Keyboard input method for the Qtopia environment.
diff --git a/inputmethods/pickboard/qpe-pickboard.control b/inputmethods/pickboard/opie-pickboard.control
index 8d12181..0d860a9 100644
--- a/inputmethods/pickboard/qpe-pickboard.control
+++ b/inputmethods/pickboard/opie-pickboard.control
@@ -1,9 +1,9 @@
 Files: plugins/inputmethods/libqpickboard.so*
 Priority: optional
 Section: qpe/inputmethods
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Pickboard input method
  Pickboard dictionary-based input method for the Qtopia environment.
diff --git a/inputmethods/unikeyboard/qpe-unikeyboard.control b/inputmethods/unikeyboard/opie-unikeyboard.control
index a8c9bd3..11ce283 100644
--- a/inputmethods/unikeyboard/qpe-unikeyboard.control
+++ b/inputmethods/unikeyboard/opie-unikeyboard.control
@@ -1,9 +1,9 @@
 Files: plugins/inputmethods/libqunikeyboard.so*
 Priority: optional
 Section: qpe/inputmethods
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Unicode input method
  Basic unicode input method for the Qtopia environment.
diff --git a/library/qpe-base.control b/library/opie-base.control
index bd8a0f9..d78db9d 100644
--- a/library/qpe-base.control
+++ b/library/opie-base.control
@@ -1,10 +1,10 @@
 Files: etc/qimpen etc/colors etc/init.d/qpe etc/rc2.d/S98qpe bin/qpe-reorgfiles $QTDIR/lib/libqpe.so.$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT $QTDIR/lib/libqpe.so.$VERSION_MAJ.$VERSION_MIN $QTDIR/lib/libqpe.so.$VERSION_MAJ apps/__7separator.desktop apps/__9quit.desktop apps/*/.directory etc/mime.types apps/Settings/quit.desktop pics/UnknownDocument-14.png pics/UnknownDocument.png
 Priority: required
 Section: qpe/system
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-4
-Depends: qt-embedded (>=$QTE_VERSION), qpe-qcop, qpe-taskbar, qpe-pics, qpe-sounds, atd, apmd
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: qt-embedded (>=$QTE_VERSION), opie-qcop, opie-taskbar, opie-pics, opie-sounds, apmd
 Description: Base Qtopia environment
  A complete GUI environment for handhelds.
- You will probably want to install one of the qpe-i18n-* packages.
+ You will probably want to install one of the opie-i18n-* packages.
diff --git a/library/task-qpe.control b/library/task-opie.control
index 57092f9..1d71bd4 100644
--- a/library/task-qpe.control
+++ b/library/task-opie.control
@@ -1,10 +1,10 @@
 Files: 
 Priority: required
 Section: qpe/system
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-qipkg qpe-base
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-qipkg opie-base
 Description: Bootstrap Qtopia environment
  A complete GUI environment for handhelds.
- You will probably want to install one of the qpe-i18n-* packages.
+ You will probably want to install one of the opie-i18n-* packages.
diff --git a/noncore/apps/tableviewer/qpe-tableviewer.control b/noncore/apps/tableviewer/opie-tableviewer.control
index 86d0342..d96dddb 100644
--- a/noncore/apps/tableviewer/qpe-tableviewer.control
+++ b/noncore/apps/tableviewer/opie-tableviewer.control
@@ -1,10 +1,10 @@
 Files: EXCLUDED bin/tableviewer apps/Applications/tableviewer.desktop
 Priority: optional
-Section: qpe/applications
+Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Arch: iPAQ
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: XML database browsers
  A table/database viewer for the Qtopia environment.
diff --git a/noncore/comm/keypebble/qpe-keypebble.control b/noncore/comm/keypebble/opie-keypebble.control
index 75c1b9f..4a62443 100644
--- a/noncore/comm/keypebble/qpe-keypebble.control
+++ b/noncore/comm/keypebble/opie-keypebble.control
@@ -1,10 +1,10 @@
 Files: bin/keypebble apps/Applications/keypebble.desktop pics/vnc.png
 Priority: optional
 Section: qpe/applications
 Maintainer: Martin Jones <mjones@trolltech.com>
 Architecture: arm
 Arch: iPAQ
-Version: $QPE_VERSION-2
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: VNC Viewer
  Virtual Network Computing (VNC) viewer
diff --git a/noncore/games/chess/qpe-chess.control b/noncore/games/chess/opie-chess.control
index 2a7d2d2..d82edcb 100644
--- a/noncore/games/chess/qpe-chess.control
+++ b/noncore/games/chess/opie-chess.control
@@ -1,9 +1,9 @@
 Files: bin/chess apps/Games/chess.desktop
 Priority: optional
 Section: qpe/games
 Maintainer: Luke Graham <luke@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Crafty GUI
  A GUI for the crafty chess engine
diff --git a/noncore/games/fifteen/qpe-fifteen.control b/noncore/games/fifteen/opie-fifteen.control
index d77eb32..a89b666 100644
--- a/noncore/games/fifteen/qpe-fifteen.control
+++ b/noncore/games/fifteen/opie-fifteen.control
@@ -1,11 +1,11 @@
 Files: bin/fifteen apps/Games/fifteen.desktop pics/Fifteen.png
 Priority: optional
 Section: qpe/games
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Arch: iPAQ
-Version: $QPE_VERSION-4
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Fifteen pieces game
  A game for the Qtopia environment
 .
diff --git a/noncore/games/go/qpe-go.control b/noncore/games/go/opie-go.control
index edc106b..865a5dc 100644
--- a/noncore/games/go/qpe-go.control
+++ b/noncore/games/go/opie-go.control
@@ -1,9 +1,9 @@
 Files: bin/go apps/Games/go.desktop
 Priority: optional
 Section: qpe/games
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: The game of Go
  A game for the Qtopia environment.
diff --git a/noncore/games/mindbreaker/qpe-mindbreaker.control b/noncore/games/mindbreaker/opie-mindbreaker.control
index 3bad93d..6346233 100644
--- a/noncore/games/mindbreaker/qpe-mindbreaker.control
+++ b/noncore/games/mindbreaker/opie-mindbreaker.control
@@ -1,9 +1,9 @@
 Files: bin/mindbreaker apps/Games/mindbreaker.desktop pics/mindbreaker
 Priority: optional
-Section: qpe/games
+Section: opie/games
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Game: crack the coloured code
  A game for the Qtopia environment.
diff --git a/noncore/games/minesweep/qpe-minesweep.control b/noncore/games/minesweep/opie-minesweep.control
index 36bc221..4c7726e 100644
--- a/noncore/games/minesweep/qpe-minesweep.control
+++ b/noncore/games/minesweep/opie-minesweep.control
@@ -1,9 +1,9 @@
 Files: bin/minesweep apps/Games/minesweep.desktop
 Priority: optional
-Section: qpe/games
+Section: opie/games
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Game: find the mines
  A game for the Qtopia environment.
diff --git a/noncore/games/parashoot/qpe-parashoot.control b/noncore/games/parashoot/opie-parashoot.control
index 82e9421..6c728bc 100644
--- a/noncore/games/parashoot/qpe-parashoot.control
+++ b/noncore/games/parashoot/opie-parashoot.control
@@ -1,9 +1,9 @@
 Files: bin/parashoot apps/Games/parashoot.desktop pics/parashoot
 Priority: optional
-Section: qpe/games
+Section: opie/games
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Game: shoot the parachutists
  A game for the Qtopia environment.
diff --git a/noncore/games/qasteroids/qpe-qasteroids.control b/noncore/games/qasteroids/opie-qasteroids.control
index c1b328e..f02924b 100644
--- a/noncore/games/qasteroids/qpe-qasteroids.control
+++ b/noncore/games/qasteroids/opie-qasteroids.control
@@ -1,9 +1,9 @@
 Files: bin/qasteroids apps/Games/qasteroids.desktop pics/qasteroids pics/Asteroids.png
 Priority: optional
-Section: qpe/games
+Section: opie/games
 Maintainer: Martin Jones <mjones@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Game: shoot the asteroids
  A game for the Qtopia environment.
diff --git a/noncore/games/snake/qpe-snake.control b/noncore/games/snake/opie-snake.control
index 489e642..72d6b2d 100644
--- a/noncore/games/snake/qpe-snake.control
+++ b/noncore/games/snake/opie-snake.control
@@ -1,9 +1,9 @@
 Files: bin/snake apps/Games/snake.desktop pics/snake
 Priority: optional
-Section: qpe/games
+Section: opie/games
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Game: control the snake
  A game for the Qtopia environment.
diff --git a/noncore/games/solitaire/qpe-solitaire.control b/noncore/games/solitaire/opie-solitaire.control
index 71abb0c..79690b2 100644
--- a/noncore/games/solitaire/qpe-solitaire.control
+++ b/noncore/games/solitaire/opie-solitaire.control
@@ -1,9 +1,9 @@
 Files: bin/patience apps/Games/patience.desktop pics/cards
 Priority: optional
-Section: qpe/games
+Section: opie/games
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Game: solitaire card games
  A solitaire game for the Qtopia environment.
diff --git a/noncore/games/tetrix/qpe-tetrix.control b/noncore/games/tetrix/opie-tetrix.control
index 46dfdf5..f5a08d7 100644
--- a/noncore/games/tetrix/qpe-tetrix.control
+++ b/noncore/games/tetrix/opie-tetrix.control
@@ -1,10 +1,10 @@
 Files: bin/tetrix apps/Games/tetrix.desktop
 Priority: optional
-Section: qpe/games
+Section: opie/games
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Arch: iPAQ
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Game: control falling blocks
  A game for the Qtopia environment.
diff --git a/noncore/games/wordgame/qpe-wordgame.control b/noncore/games/wordgame/opie-wordgame.control
index 2293f52..828a42e 100644
--- a/noncore/games/wordgame/qpe-wordgame.control
+++ b/noncore/games/wordgame/opie-wordgame.control
@@ -1,10 +1,10 @@
 Files: bin/wordgame apps/Games/wordgame.desktop
 Priority: optional
-Section: qpe/games
+Section: opie/games
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Crossword game
  A crossword game for the Qtopia environment.
  Play against the computer or human opponents.
diff --git a/noncore/multimedia/showimg/qpe-showimg.control b/noncore/multimedia/showimg/opie-showimg.control
index 8189048..ebd653f 100644
--- a/noncore/multimedia/showimg/qpe-showimg.control
+++ b/noncore/multimedia/showimg/opie-showimg.control
@@ -1,10 +1,10 @@
 Files: bin/showimg apps/Applications/showimg.desktop
 Priority: optional
-Section: qpe/applications
+Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Image Viewer
  The image viewer for the Qtopia environment. Supports
  Whichever formats are compiled into Qt/Embedded (eg. PNG).
diff --git a/noncore/settings/language/qpe-language.control b/noncore/settings/language/opie-language.control
index b33c947..5cd488c 100644
--- a/noncore/settings/language/qpe-language.control
+++ b/noncore/settings/language/opie-language.control
@@ -1,9 +1,9 @@
 Files: bin/language apps/Settings/Language.desktop
 Priority: optional
-Section: qpe/settings
+Section: opie/settings
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Language settings dialog
  For the Qtopia environment.
diff --git a/noncore/settings/sound/qpe-sound.control b/noncore/settings/sound/opie-sound.control
index f7f1c4f..9ac6977 100644
--- a/noncore/settings/sound/qpe-sound.control
+++ b/noncore/settings/sound/opie-sound.control
@@ -1,10 +1,10 @@
 Files: bin/sound apps/Settings/Sound.desktop
 Priority: optional
-Section: qpe/settings
+Section: opie/settings
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Arch: iPAQ
-Version: $QPE_VERSION-1
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Sound settings dialog
  For the Qtopia environment.
diff --git a/noncore/settings/sysinfo/opie-sysinfo.control b/noncore/settings/sysinfo/opie-sysinfo.control
new file mode 100644
index 0000000..770e671
--- a/dev/null
+++ b/noncore/settings/sysinfo/opie-sysinfo.control
@@ -0,0 +1,9 @@
+Files: bin/sysinfo apps/Applications/sysinfo.desktop pics/opie-logo.png pics/tux-logo.png
+Priority: optional
+Section: opie/applications
+Maintainer: Warwick Allison <warwick@trolltech.com>
+Architecture: arm
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
+Description: System Information dialog
+ For the Qtopia environment.
diff --git a/noncore/settings/sysinfo/qpe-sysinfo.control b/noncore/settings/sysinfo/qpe-sysinfo.control
deleted file mode 100644
index 0ddb6cf..0000000
--- a/noncore/settings/sysinfo/qpe-sysinfo.control
+++ b/dev/null
@@ -1,9 +0,0 @@
-Files: bin/sysinfo apps/Applications/sysinfo.desktop
-Priority: optional
-Section: qpe/applications
-Maintainer: Warwick Allison <warwick@trolltech.com>
-Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
-Description: System Information dialog
- For the Qtopia environment.
diff --git a/noncore/tools/calculator/qpe-calculator.control b/noncore/tools/calculator/opie-calculator.control
index afef70b..e8cf8dd 100644
--- a/noncore/tools/calculator/qpe-calculator.control
+++ b/noncore/tools/calculator/opie-calculator.control
@@ -1,10 +1,10 @@
 Files: bin/calculator apps/Applications/calculator.desktop etc/unit_conversion.dat
 Priority: optional
 Section: qpe/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Calculator
  A multi-function calculator for the Qtopia environment.
  Includes units conversion.
diff --git a/noncore/tools/clock/qpe-clock.control b/noncore/tools/clock/opie-clock.control
index 62f377f..2f72d4c 100644
--- a/noncore/tools/clock/qpe-clock.control
+++ b/noncore/tools/clock/opie-clock.control
@@ -1,9 +1,9 @@
 Files: bin/clock apps/Applications/clock.desktop
 Priority: optional
 Section: qpe/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Clock and stop-watch
  A simple clock and stop-watch for the Qtopia environment.
diff --git a/noncore/unsupported/filebrowser/qpe-filebrowser.control b/noncore/unsupported/filebrowser/opie-filebrowser.control
index c55fe6a..b0e8f9e 100644
--- a/noncore/unsupported/filebrowser/qpe-filebrowser.control
+++ b/noncore/unsupported/filebrowser/opie-filebrowser.control
@@ -1,9 +1,9 @@
 Files: bin/filebrowser apps/Applications/filebrowser.desktop
 Priority: optional
 Section: qpe/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Browse the file system
  The filebrowser for the Qtopia environment.
diff --git a/noncore/unsupported/oipkg/qpe-qipkg.control b/noncore/unsupported/oipkg/opie-qipkg.control
index 3c3e7c8..b89bc65 100644
--- a/noncore/unsupported/oipkg/qpe-qipkg.control
+++ b/noncore/unsupported/oipkg/opie-qipkg.control
@@ -1,9 +1,9 @@
 Files: bin/qipkg apps/Settings/qipkg.desktop
 Priority: optional
-Section: qpe/settings
+Section: opie/settings
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Package Manager
  A GUI front-end to ipkg for the Qtopia environment.
diff --git a/pics/qpe-pics.control b/pics/opie-pics.control
index 449ba43..3fd5b67 100644
--- a/pics/qpe-pics.control
+++ b/pics/opie-pics.control
@@ -1,8 +1,8 @@
 Files: pics/??*.*
 Priority: required
-Section: qpe/system
+Section: opie/system
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
+Version: $QPE_VERSION-$SUB_VERSION
 Description: Basic icons for Qtopia environment
  These icons are available to all QPE application.
diff --git a/quickexec/qpe-quickexec.control b/quickexec/opie-quickexec.control
index e93b9b0..dad3fa4 100644
--- a/quickexec/qpe-quickexec.control
+++ b/quickexec/opie-quickexec.control
@@ -1,11 +1,11 @@
 Files: bin/quickexec
 Priority: required
-Section: qpe/applications
+Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Arch: iPAQ
-Version: $QPE_VERSION-3
-Depends: qpe-base ($QPE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
 Description: Calculator
  A multi-function calculator for the Qtopia environment.
  Includes units conversion.
diff --git a/root/qpe-ppp.control b/root/opie-ppp.control
index 7910c37..7910c37 100644
--- a/root/qpe-ppp.control
+++ b/root/opie-ppp.control
diff --git a/sounds/qpe-sounds.control b/sounds/opie-sounds.control
index 14ae8e6..620668c 100644
--- a/sounds/qpe-sounds.control
+++ b/sounds/opie-sounds.control
@@ -1,8 +1,8 @@
 Files: sounds/*.wav
 Priority: required
-Section: qpe/system
+Section: opie/system
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-3
+Version: $QPE_VERSION-$SUB_VERSION
 Description: Basic sounds for Qtopia environment
  These icons are available to all QPE application.