merge control files with BRANCH

15 files changed, 20 insertions, 21 deletions

diff --git a/core/apps/embeddedkonsole/opie-embeddedkonsole.control b/core/apps/embeddedkonsole/opie-embeddedkonsole.control
index b72c1fc..95d28bf 100644
--- a/core/apps/embeddedkonsole/opie-embeddedkonsole.control
+++ b/core/apps/embeddedkonsole/opie-embeddedkonsole.control
@@ -1,5 +1,5 @@
 Package: opie-embeddedkonsole
-Files: bin/embeddedkonsole apps/Applications/embeddedkonsole.desktop pics/konsole
+Files: plugins/application/libembeddedkonsole.so* bin/embeddedkonsole apps/Applications/embeddedkonsole.desktop pics/konsole
 Priority: optional
 Section: opie/applications
 Maintainer: L.J. Potter <ljp@llornkcor.com>
diff --git a/core/apps/helpbrowser/opie-helpbrowser.control b/core/apps/helpbrowser/opie-helpbrowser.control
index 4312979..7729c2b 100644
--- a/core/apps/helpbrowser/opie-helpbrowser.control
+++ b/core/apps/helpbrowser/opie-helpbrowser.control
@@ -1,5 +1,5 @@
 Package: opie-helpbrowser
-Files: bin/helpbrowser apps/Applications/helpbrowser.desktop docs pics/helpbrowser
+Files: plugins/application/libhelpbrowser.so* bin/helpbrowser apps/Applications/helpbrowser.desktop docs pics/helpbrowser
 Priority: optional
 Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
diff --git a/core/apps/textedit/opie-textedit.control b/core/apps/textedit/opie-textedit.control
index 5ec205b..1e72316 100644
--- a/core/apps/textedit/opie-textedit.control
+++ b/core/apps/textedit/opie-textedit.control
@@ -1,5 +1,5 @@
 Package: opie-textedit
-Files: bin/textedit apps/1Pim/textedit.desktop pics/textedit
+Files: plugins/application/libtextedit.so* bin/textedit apps/1Pim/textedit.desktop pics/textedit
 Priority: optional
 Section: opie/applications
 Maintainer: L. J. Potter <llornkcor@handhelds.org>
diff --git a/core/multimedia/opieplayer/opie-mediaplayer.control b/core/multimedia/opieplayer/opie-mediaplayer.control
index 97e9f88..63c4fd7 100644
--- a/core/multimedia/opieplayer/opie-mediaplayer.control
+++ b/core/multimedia/opieplayer/opie-mediaplayer.control
@@ -1,10 +1,10 @@
 Package: opie-mediaplayer
-Files: bin/opieplayer pics/opieplayer apps/Applications/opieplayer.desktop
+Files: plugins/application/libopieplayer.so* bin/opieplayer pics/opieplayer apps/Applications/opieplayer.desktop
 Priority: optional
 Section: opie/applications
 Maintainer: L.J.Potter <ljp@llornkcor.com>
 Architecture: arm
 Depends: task-opie-minimal, libopie1, opie-mediaplayer2-skin-default | opie-mediaplayer2-skin-default-landscape
 Description: The Opie media player
- The mediaplayer for Opie. It plays mp3, mpeg, and wav.
+ The mediaplayer for Opie. It plays mp3, mpeg, mod and wav.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/pim/addressbook/opie-addressbook.control b/core/pim/addressbook/opie-addressbook.control
index d949bd4..29740e4 100644
--- a/core/pim/addressbook/opie-addressbook.control
+++ b/core/pim/addressbook/opie-addressbook.control
@@ -1,5 +1,5 @@
 Package: opie-addressbook
-Files: bin/addressbook apps/1Pim/addressbook.desktop
+Files: plugins/application/libaddressbook.so* bin/addressbook apps/1Pim/addressbook.desktop
 Priority: optional
 Section: opie/applications
 Conflicts: qpe-tkcaddressbook
diff --git a/core/pim/datebook/opie-datebook.control b/core/pim/datebook/opie-datebook.control
index fe5a086..4fe9abf 100644
--- a/core/pim/datebook/opie-datebook.control
+++ b/core/pim/datebook/opie-datebook.control
@@ -1,9 +1,9 @@
 Package: opie-datebook
-Files: bin/datebook apps/1Pim/datebook.desktop
+Files: plugins/application/libdatebook.so* bin/datebook apps/1Pim/datebook.desktop
 Priority: optional
 Section: opie/applications
 Conflicts: qpe-tkccalendar
-Maintainer: Warwick Allison <warwick@trolltech.com>
+Maintainer: Holger 'Zecke' Freyther <zecke@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal, libopie1, opie-pics
 Description: A datebook/appointment manager
diff --git a/core/pim/osearch/opie-osearch.control b/core/pim/osearch/opie-osearch.control
index ef209de..738a9b7 100644
--- a/core/pim/osearch/opie-osearch.control
+++ b/core/pim/osearch/opie-osearch.control
@@ -1,10 +1,9 @@
 Package: opie-osearch
-Files: bin/osearch apps/1Pim/osearch.desktop pics/osearch/*.png
+Files: plugins/application/libosearch.so* bin/osearch apps/1Pim/osearch.desktop pics/osearch/*.png
 Priority: optional
-Section: opie/
+Section: opie/applications
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
-Description: search...
-
+Description: Search through all PIM data
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/pim/today/opie-today.control b/core/pim/today/opie-today.control
index 70f7738..aab4db9 100644
--- a/core/pim/today/opie-today.control
+++ b/core/pim/today/opie-today.control
@@ -1,5 +1,5 @@
 Package: opie-today
-Files: bin/today apps/1Pim/today.desktop pics/today/*
+Files: plugins/application/libtoday.so* bin/today apps/1Pim/today.desktop pics/today/*
 Priority: optional
 Section: opie/applications
 Maintainer: Maximilian Reiß <harlekin@handhelds.org>
diff --git a/core/pim/todo/opie-todo.control b/core/pim/todo/opie-todo.control
index 17a65a8..86f9b7a 100644
--- a/core/pim/todo/opie-todo.control
+++ b/core/pim/todo/opie-todo.control
@@ -1,5 +1,5 @@
 Package: opie-todo
-Files: bin/todolist apps/1Pim/todo.desktop
+Files: plugins/application/libtodolist.so* bin/todolist apps/1Pim/todo.desktop
 Priority: optional
 Section: opie/applications
 Maintainer: Holger 'zecke' Freyther <zecke@handhelds.org>
diff --git a/core/settings/button/opie-button-settings.control b/core/settings/button/opie-button-settings.control
index 34dc7e0..93b084c 100644
--- a/core/settings/button/opie-button-settings.control
+++ b/core/settings/button/opie-button-settings.control
@@ -1,5 +1,5 @@
 Package: opie-button-settings
-Files: bin/buttonsettings apps/Settings/Button.desktop pics/buttonsettings/*.png
+Files: plugins/application/libbuttonsettings.so* bin/buttonsettings apps/Settings/Button.desktop pics/buttonsettings/*.png
 Priority: optional
 Section: opie/settings
 Maintainer: Robert Griebl <sandman@handhelds.org>
diff --git a/core/settings/citytime/opie-citytime.control b/core/settings/citytime/opie-citytime.control
index 5b0c8da..5f3f33c 100644
--- a/core/settings/citytime/opie-citytime.control
+++ b/core/settings/citytime/opie-citytime.control
@@ -1,5 +1,5 @@
 Package: opie-citytime
-Files: bin/citytime apps/Settings/citytime.desktop pics/citytime
+Files: plugins/application/libcitytime.so* bin/citytime apps/Settings/citytime.desktop pics/citytime
 Priority: optional
 Section: opie/settings
 Maintainer: Maximilian Reiss <harlekin@handhelds.org>
diff --git a/core/settings/launcher/opie-launcher-settings.control b/core/settings/launcher/opie-launcher-settings.control
index 0e7832d..58596e8 100644
--- a/core/settings/launcher/opie-launcher-settings.control
+++ b/core/settings/launcher/opie-launcher-settings.control
@@ -1,5 +1,5 @@
 Package: opie-launcher-settings
-Files: bin/launchersettings apps/Settings/Launcher.desktop pics/launchersettings
+Files: plugins/application/liblaunchersettings.so* bin/launchersettings apps/Settings/Launcher.desktop pics/launchersettings
 Priority: optional
 Section: opie/settings
 Maintainer: Robert Griebl <sandman@handhelds.org>
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 da6fc4f..eaa47f3 100644
--- a/core/settings/light-and-power/opie-light-and-power.control
+++ b/core/settings/light-and-power/opie-light-and-power.control
@@ -1,5 +1,5 @@
 Package: opie-light-and-power
-Files: bin/light-and-power apps/Settings/Light.desktop pics/lightandpower
+Files: plugins/application/liblight-and-power.so* bin/light-and-power apps/Settings/Light.desktop pics/lightandpower
 Priority: optional
 Section: opie/settings
 Maintainer: Maximilian Reiss <harlekin@handhelds.org>
diff --git a/core/settings/security/opie-security.control b/core/settings/security/opie-security.control
index 0da6f0f..6059e90 100644
--- a/core/settings/security/opie-security.control
+++ b/core/settings/security/opie-security.control
@@ -1,5 +1,5 @@
 Package: opie-security
-Files: bin/security apps/Settings/Security.desktop pics/security
+Files: plugins/application/libsecurity.so* bin/security apps/Settings/Security.desktop pics/security
 Priority: optional
 Section: opie/settings
 Maintainer: Warwick Allison <warwick@trolltech.com>
diff --git a/core/tools/quicklauncher/qpe-quicklauncher.control b/core/tools/quicklauncher/qpe-quicklauncher.control
index f07a7d5..b1bab53 100644
--- a/core/tools/quicklauncher/qpe-quicklauncher.control
+++ b/core/tools/quicklauncher/qpe-quicklauncher.control
@@ -4,7 +4,7 @@ Section: qpe/system
 Maintainer: Trolltech (www.trolltech.com)
 Architecture: $CPU_ARCH
 Arch: $DEVICE_ARCH
-Version: $QPE_VERSION-12
-Depends: qpe-libqtopia qpe-pim
+Version: $QPE_VERSION$EXTRAVERSION
+Depends:
 Description: Quick launcher stub
  Launcher stub for quick launch enabled applications.