18 files changed, 47 insertions, 47 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
@@ -3,7 +3,7 @@ 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
@@ -4,7 +4,7 @@ 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
@@ -3,7 +3,7 @@ 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
@@ -3,7 +3,7 @@ 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
@@ -3,7 +3,7 @@ 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.