Merge from BRANCH_1_0.

34 files changed, 40 insertions, 40 deletions

diff --git a/core/applets/batteryapplet/opie-batteryapplet.control b/core/applets/batteryapplet/opie-batteryapplet.control
index 94dc464..0bf5507 100644
--- a/core/applets/batteryapplet/opie-batteryapplet.control
+++ b/core/applets/batteryapplet/opie-batteryapplet.control
@@ -6,3 +6,2 @@ Maintainer: Opie team <opie@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
@@ -11 +10,2 @@ Description: Battery Monitor applet
  Battery Monitor applet for the Opie environment taskbar.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/applets/cardmon/opie-cardmon.control b/core/applets/cardmon/opie-cardmon.control
index 02e1f2f..954faac 100644
--- a/core/applets/cardmon/opie-cardmon.control
+++ b/core/applets/cardmon/opie-cardmon.control
@@ -6,3 +6,2 @@ Maintainer: Maximilian Reiß <max.reiss@gmx.de>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, libopie1
@@ -10 +9,2 @@ Description: CF/PCMCIA Card Monitor applet
  SD/MMC/CF/PCMCIA Card Monitor applet for the Opie environment taskbar.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/applets/clipboardapplet/opie-clipboardapplet.control b/core/applets/clipboardapplet/opie-clipboardapplet.control
index 63a7709..3768f3f 100644
--- a/core/applets/clipboardapplet/opie-clipboardapplet.control
+++ b/core/applets/clipboardapplet/opie-clipboardapplet.control
@@ -6,3 +6,2 @@ Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
@@ -10 +9,2 @@ Description: Clipboard applet
  Clipboard applet for the Opie environment taskbar.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/applets/clockapplet/opie-clockapplet.control b/core/applets/clockapplet/opie-clockapplet.control
index 93841f7..9587882 100644
--- a/core/applets/clockapplet/opie-clockapplet.control
+++ b/core/applets/clockapplet/opie-clockapplet.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: Clock applet
  Clock applet for the Opie environment taskbar.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/applets/irdaapplet/opie-irdaapplet.control b/core/applets/irdaapplet/opie-irdaapplet.control
index 41ae925..f3bfe81 100644
--- a/core/applets/irdaapplet/opie-irdaapplet.control
+++ b/core/applets/irdaapplet/opie-irdaapplet.control
@@ -6,3 +6,2 @@ Maintainer: David Woodhouse <dwmw2@infradead.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION.1
 Depends: task-opie-minimal, libopieobex1
@@ -10 +9,2 @@ Description: Irda Applet
  An IrDA taskbar applet for the Opie environment
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/applets/restartapplet2/opie-restartapplet2.control b/core/applets/restartapplet2/opie-restartapplet2.control
index 2928846..12040a8 100644
--- a/core/applets/restartapplet2/opie-restartapplet2.control
+++ b/core/applets/restartapplet2/opie-restartapplet2.control
@@ -6,3 +6,2 @@ Maintainer: L. J. Potter <ljp@llornkcor.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION.1
 Depends: task-opie-minimal
@@ -10 +9,2 @@ Description: Restart Applet
  A simple opie menu applet to restart the  Opie environment
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/applets/screenshotapplet/opie-screenshotapplet.control b/core/applets/screenshotapplet/opie-screenshotapplet.control
index 50f6046..8f160a7 100644
--- a/core/applets/screenshotapplet/opie-screenshotapplet.control
+++ b/core/applets/screenshotapplet/opie-screenshotapplet.control
@@ -6,3 +6,2 @@ Maintainer: L. J. Potter <ljp@llornkcor.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
@@ -10 +9,2 @@ Description: Screenshot Applet
  A screenshot taskbar applet for the Opie environment
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/applets/vmemo/opie-vmemo.control b/core/applets/vmemo/opie-vmemo.control
index 58f8798..55a45d7 100644
--- a/core/applets/vmemo/opie-vmemo.control
+++ b/core/applets/vmemo/opie-vmemo.control
@@ -6,3 +6,2 @@ Maintainer: L.J. Potter <ljp@llornkcor.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-vmemo-settings
@@ -10 +9,2 @@ Description: Voice Memo Recorder Applet
  The voice memo recorder for the Opie environment
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/applets/volumeapplet/opie-volumeapplet.control b/core/applets/volumeapplet/opie-volumeapplet.control
index 78ae4c6..99b1808 100644
--- a/core/applets/volumeapplet/opie-volumeapplet.control
+++ b/core/applets/volumeapplet/opie-volumeapplet.control
@@ -6,3 +6,2 @@ Maintainer: L.J. Potter <ljp@llornkcor.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION.1
 Depends: task-opie-minimal
@@ -10 +9,2 @@ Description: Volume applet
  Volume applet for the Opie environment taskbar.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/apps/embeddedkonsole/opie-embeddedkonsole.control b/core/apps/embeddedkonsole/opie-embeddedkonsole.control
index 1999e81..b72c1fc 100644
--- a/core/apps/embeddedkonsole/opie-embeddedkonsole.control
+++ b/core/apps/embeddedkonsole/opie-embeddedkonsole.control
@@ -6,3 +6,2 @@ Maintainer: L.J. Potter <ljp@llornkcor.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, libopie1, opie-keytabs
@@ -10 +9,2 @@ Description: KDE's konsole (shell terminal)
  Ported to the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/apps/helpbrowser/opie-helpbrowser.control b/core/apps/helpbrowser/opie-helpbrowser.control
index 15eff8a..4312979 100644
--- a/core/apps/helpbrowser/opie-helpbrowser.control
+++ b/core/apps/helpbrowser/opie-helpbrowser.control
@@ -7,3 +7,2 @@ Architecture: arm
 Arch: iPAQ
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
@@ -11 +10,2 @@ Description: Browse HTML help documents
  The HTML help browser for the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/apps/qcop/opie-qcop.control b/core/apps/qcop/opie-qcop.control
index 43779da..56463aa 100644
--- a/core/apps/qcop/opie-qcop.control
+++ b/core/apps/qcop/opie-qcop.control
@@ -6,3 +6,2 @@ Maintainer: Martin Jones <mjones@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: libqte2
@@ -10 +9,2 @@ Description: Interprocess communication client
  Interprocess communication client for the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/apps/textedit/opie-textedit.control b/core/apps/textedit/opie-textedit.control
index 0d86274..5ec205b 100644
--- a/core/apps/textedit/opie-textedit.control
+++ b/core/apps/textedit/opie-textedit.control
@@ -6,3 +6,2 @@ Maintainer: L. J. Potter <llornkcor@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, libopie1
@@ -10 +9,2 @@ Description: Text Editor
  The text editor for the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/launcher/opie-taskbar.control b/core/launcher/opie-taskbar.control
index fe5f4e0..f6dcfc2 100644
--- a/core/launcher/opie-taskbar.control
+++ b/core/launcher/opie-taskbar.control
@@ -6,3 +6,2 @@ Maintainer: Project Opie <opie@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION.3
 Depends: task-opie-minimal
@@ -10 +9,2 @@ Replaces: opie-rotation
 Description: Launcher for Opie
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/multimedia/opieplayer/libmad/opie-libmadplugin.control b/core/multimedia/opieplayer/libmad/opie-libmadplugin.control
index ccd93bd..15c083f 100644
--- a/core/multimedia/opieplayer/libmad/opie-libmadplugin.control
+++ b/core/multimedia/opieplayer/libmad/opie-libmadplugin.control
@@ -1,2 +1,2 @@
-Package: opieplayer1-libmadplugin
+Package: opie-libmadplugin
 Files: plugins/codecs/libmadplugin.so.1.0.0 plugins/codecs/libmadplugin.so.1.0 plugins/codecs/libmadplugin.so.1 plugins/codecs/libmadplugin.so
@@ -6,3 +6,2 @@ Maintainer: Maximilian Reiss <max.reiss@gmx.de>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
@@ -11 +10,2 @@ Description: MP3 file plugin using libmad
  It also hast streaming support (Shoutcast/Icecast).
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/multimedia/opieplayer/libmpeg3/opie-libmpeg3plugin.control b/core/multimedia/opieplayer/libmpeg3/opie-libmpeg3plugin.control
index 76adea2..4d690eb 100644
--- a/core/multimedia/opieplayer/libmpeg3/opie-libmpeg3plugin.control
+++ b/core/multimedia/opieplayer/libmpeg3/opie-libmpeg3plugin.control
@@ -1,2 +1,2 @@
-Package: opieplayer1-libmpeg3plugin
+Package: opie-libmpeg3plugin
 Files: plugins/codecs/libmpeg3plugin.so.1.0.0 plugins/codecs/libmpeg3plugin.so.1.0 plugins/codecs/libmpeg3plugin.so.1 plugins/codecs/libmpeg3plugin.so
@@ -6,3 +6,2 @@ Maintainer: L.J.Potter <ljp@llornkcor.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
@@ -10 +9,2 @@ Description: Mpeg video file plugin using libmad
  Plugin to play MPeg3 video files with the mediaplayer in the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/multimedia/opieplayer/modplug/opie-modplugin.control b/core/multimedia/opieplayer/modplug/opie-modplugin.control
index e8fe893..dba0d7b 100644
--- a/core/multimedia/opieplayer/modplug/opie-modplugin.control
+++ b/core/multimedia/opieplayer/modplug/opie-modplugin.control
@@ -1,2 +1,2 @@
-Package: opieplayer1-modplugin
+Package: opie-modplugin
 Files: plugins/codecs/libmodplugin.so*
diff --git a/core/multimedia/opieplayer/opie-mediaplayer.control b/core/multimedia/opieplayer/opie-mediaplayer.control
index eb2d157..97e9f88 100644
--- a/core/multimedia/opieplayer/opie-mediaplayer.control
+++ b/core/multimedia/opieplayer/opie-mediaplayer.control
@@ -6,3 +6,2 @@ Maintainer: L.J.Potter <ljp@llornkcor.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, libopie1, opie-mediaplayer2-skin-default | opie-mediaplayer2-skin-default-landscape
@@ -10 +9,2 @@ Description: The Opie media player
  The mediaplayer for Opie. It plays mp3, mpeg, and wav.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/multimedia/opieplayer/vorbis/opie-libtremorplugin.control b/core/multimedia/opieplayer/vorbis/opie-libtremorplugin.control
index d47904f..ab834d1 100644
--- a/core/multimedia/opieplayer/vorbis/opie-libtremorplugin.control
+++ b/core/multimedia/opieplayer/vorbis/opie-libtremorplugin.control
@@ -6,3 +6,2 @@ Maintainer: L.J. Potter <llornkcor@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, libtremor
@@ -10 +9,2 @@ Description: Ogg file plugin using tremor
  Plugin to play ogg files with the mediaplayer in the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/multimedia/opieplayer/vorbis/tremor/libtremor.control b/core/multimedia/opieplayer/vorbis/tremor/libtremor.control
index 9defddc..3a0b3b8 100644
--- a/core/multimedia/opieplayer/vorbis/tremor/libtremor.control
+++ b/core/multimedia/opieplayer/vorbis/tremor/libtremor.control
@@ -1,3 +1,3 @@
 Package: libtremor
-Files: root/usr/lib/libtremor.so root/usr/lib/libtremor.so.1 root/usr/lib/libtremor.so.1.0 root/usr/lib/libtremor.so.1.0.0
+Files: lib/libtremor.so lib/libtremor.so.1 lib/libtremor.so.1.0 lib/libtremor.so.1.0.0
 Priority: optional
@@ -6,3 +6,2 @@ Maintainer: Lorn Potter <llornkcor@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
@@ -10 +9,2 @@ Description: vorbis (tremor) library
  Library needed for playing OGG files with the mediaplayer in the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/multimedia/opieplayer/wavplugin/opie-wavplugin.control b/core/multimedia/opieplayer/wavplugin/opie-wavplugin.control
index f5fa641..a59c35b 100644
--- a/core/multimedia/opieplayer/wavplugin/opie-wavplugin.control
+++ b/core/multimedia/opieplayer/wavplugin/opie-wavplugin.control
@@ -1,2 +1,2 @@
-Package: opieplayer1-wavplugin
+Package: opie-wavplugin
 Files: plugins/codecs/libwavplugin*
@@ -6,3 +6,2 @@ Maintainer: Lorn Potter <llornkcor@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
@@ -10 +9,2 @@ Description: WAV file plugin
  Plugin to play WAV files with the mediaplayer in the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/obex/libopieobex0.control b/core/obex/libopieobex0.control
index 778c411..d43aa89 100644
--- a/core/obex/libopieobex0.control
+++ b/core/obex/libopieobex0.control
@@ -6,3 +6,2 @@ Maintainer: holger Freyther <zecke@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION.1
 Depends: task-opie-minimal ($QPE_VERSION), openobex | libopenobex1
@@ -12 +11,2 @@ Description: Irda obex lib
  
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/opie-login/opie-login.control b/core/opie-login/opie-login.control
index d28c67e..4d2ebf4 100644
--- a/core/opie-login/opie-login.control
+++ b/core/opie-login/opie-login.control
@@ -1,3 +1,3 @@
 Package: opie-login
-Files: bin/opie-login share/opie-login/opie-session share/opie-login/pre-session share/opie-login/post-session
+Files: bin/opie-login share/opie-login/opie-session share/opie-login/pre-session share/opie-login/post-session root/opt/QtPalmtop/etc/opie-login.conf
 Priority: optional
@@ -6,5 +6,5 @@ Maintainer: Project Opie <opie@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-common, libqpe1, libopie1
+Depends: task-opie-minimal, libopie1, opie-security
 Description: Multiuser login for OPIE
  A xdm/kdm equivalent for OPIE.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/opiealarm/opie-opiealarm.control b/core/opiealarm/opie-opiealarm.control
index e2e90a8..dca6c96 100644
--- a/core/opiealarm/opie-opiealarm.control
+++ b/core/opiealarm/opie-opiealarm.control
@@ -8,3 +8,2 @@ Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Description: A wakeup system for OPIE events.
@@ -13 +12,2 @@ Description: A wakeup system for OPIE events.
  
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/pim/osearch/opie-osearch.control b/core/pim/osearch/opie-osearch.control
index 54e2cda..ef209de 100644
--- a/core/pim/osearch/opie-osearch.control
+++ b/core/pim/osearch/opie-osearch.control
@@ -6,3 +6,2 @@ Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
@@ -10 +9,2 @@ Description: search...
 
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/pim/today/opie-today.control b/core/pim/today/opie-today.control
index a057faa..70f7738 100644
--- a/core/pim/today/opie-today.control
+++ b/core/pim/today/opie-today.control
@@ -6,3 +6,3 @@ Maintainer: Maximilian Reiß <harlekin@handhelds.org>
 Architecture: arm
-Version: 0.6.2-$SUB_VERSION
+Version: $QPE_VERSION$EXTRAVERSION
 Depends: task-opie-minimal, libopie1
diff --git a/core/pim/today/plugins/datebook/opie-today-datebookplugin.control b/core/pim/today/plugins/datebook/opie-today-datebookplugin.control
index 231f4d0..e07d770 100644
--- a/core/pim/today/plugins/datebook/opie-today-datebookplugin.control
+++ b/core/pim/today/plugins/datebook/opie-today-datebookplugin.control
@@ -6,4 +6,4 @@ Maintainer: Maximilian Reiss <harlekin@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: libqte2, opie-today
 Description: Datebook plugin for today
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/pim/today/plugins/todolist/opie-today-todolistplugin.control b/core/pim/today/plugins/todolist/opie-today-todolistplugin.control
index e6944b5..0f05e47 100644
--- a/core/pim/today/plugins/todolist/opie-today-todolistplugin.control
+++ b/core/pim/today/plugins/todolist/opie-today-todolistplugin.control
@@ -6,4 +6,4 @@ Maintainer: Maximilian Reiss <harlekin@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: libqte2, opie-today
 Description: Todolist plugin for today
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/pim/today/task-opie-today.control b/core/pim/today/task-opie-today.control
index d28e1f8..b4bddbf 100644
--- a/core/pim/today/task-opie-today.control
+++ b/core/pim/today/task-opie-today.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: 0.5-$SUB_VERSION
-Depends: task-opie-minimal, libopie1, opie-today, opie-today-datebookplugin, opie-today-todolistplugin, opie-today-mailplugin
+Depends: task-opie-minimal, libopie1, opie-today, opie-today-datebookplugin, opie-today-todolistplugin
 License: GPL
diff --git a/core/settings/button/opie-button-settings.control b/core/settings/button/opie-button-settings.control
index fcc10e7..34dc7e0 100644
--- a/core/settings/button/opie-button-settings.control
+++ b/core/settings/button/opie-button-settings.control
@@ -6,3 +6,2 @@ Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
@@ -10 +9,2 @@ Description: Device-buttons settings dialog
  For the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/settings/citytime/opie-citytime.control b/core/settings/citytime/opie-citytime.control
index ce26e34..5b0c8da 100644
--- a/core/settings/citytime/opie-citytime.control
+++ b/core/settings/citytime/opie-citytime.control
@@ -6,3 +6,2 @@ Maintainer: Maximilian Reiss <harlekin@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, timezones
@@ -10 +9,2 @@ Description: Time-zone / world clock settings
  The time-zone manager for the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/settings/launcher/opie-launcher-settings.control b/core/settings/launcher/opie-launcher-settings.control
index 21a5559..0e7832d 100644
--- a/core/settings/launcher/opie-launcher-settings.control
+++ b/core/settings/launcher/opie-launcher-settings.control
@@ -6,3 +6,2 @@ Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
@@ -10 +9,2 @@ Description: Launcher settings dialog
  For the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/settings/light-and-power/opie-light-and-power.control b/core/settings/light-and-power/opie-light-and-power.control
index 89a5b2f..da6fc4f 100644
--- a/core/settings/light-and-power/opie-light-and-power.control
+++ b/core/settings/light-and-power/opie-light-and-power.control
@@ -6,3 +6,2 @@ Maintainer: Maximilian Reiss <harlekin@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
@@ -10 +9,2 @@ Description: Light and Power settings dialog
  For the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/settings/security/opie-security.control b/core/settings/security/opie-security.control
index 84b001d..0da6f0f 100644
--- a/core/settings/security/opie-security.control
+++ b/core/settings/security/opie-security.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: Security settings dialog
  For the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION