package naming change.. alter library packages to use debian naming convention. also moved bits that didnt belong in lib pakcages elsewhere.

15 files changed, 31 insertions, 16 deletions

diff --git a/core/applets/cardmon/opie-cardmon.control b/core/applets/cardmon/opie-cardmon.control
index 359936a..708e6df 100644
--- a/core/applets/cardmon/opie-cardmon.control
+++ b/core/applets/cardmon/opie-cardmon.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base ($QPE_VERSION), libopie
+Depends: opie-base ($QPE_VERSION), libopie1
 Description: CF/PCMCIA Card Monitor applet
diff --git a/core/applets/irdaapplet/opie-irdaapplet.control b/core/applets/irdaapplet/opie-irdaapplet.control
index 5b901de..2bf86df 100644
--- a/core/applets/irdaapplet/opie-irdaapplet.control
+++ b/core/applets/irdaapplet/opie-irdaapplet.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: opie-base ($QPE_VERSION), libopieobex
+Depends: opie-base ($QPE_VERSION), libopie1obex
 Description: Irda Applet
diff --git a/core/applets/obex/libopieobex.control b/core/applets/obex/libopieobex.control
index d74b51c..4c13b69 100644
--- a/core/applets/obex/libopieobex.control
+++ b/core/applets/obex/libopieobex.control
@@ -1,2 +1,2 @@
-Files: plugins/obex/libopieobex.so* 
+Files: plugins/obex/libopie1obex.so* 
 Priority: optional
diff --git a/core/apps/embeddedkonsole/opie-embeddedkonsole.control b/core/apps/embeddedkonsole/opie-embeddedkonsole.control
index b9719ba..88fb84b 100644
--- a/core/apps/embeddedkonsole/opie-embeddedkonsole.control
+++ b/core/apps/embeddedkonsole/opie-embeddedkonsole.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base ($QPE_VERSION), libopie ($QPE_VERSION)
+Depends: opie-base ($QPE_VERSION), libopie1 ($QPE_VERSION)
 Description: KDE's konsole (shell terminal)
diff --git a/core/apps/textedit/opie-textedit.control b/core/apps/textedit/opie-textedit.control
index 0454edc..8d5089c 100644
--- a/core/apps/textedit/opie-textedit.control
+++ b/core/apps/textedit/opie-textedit.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base ($QPE_VERSION), libopie ($QPE_VERSION)
+Depends: opie-base ($QPE_VERSION), libopie1 ($QPE_VERSION)
 Description: Text Editor
diff --git a/core/launcher/opie-taskbar.control b/core/launcher/opie-taskbar.control
index 8bf2113..95582c3 100644
--- a/core/launcher/opie-taskbar.control
+++ b/core/launcher/opie-taskbar.control
@@ -1,2 +1,2 @@
-Files: bin/qpe apps/Settings/Calibrate.desktop pics/launcher pics/devicebuttons/*.png plugins/applets/libsuspendapplet.so* plugins/applets/libhomeapplet.so* plugins/applets/liblogoutapplet.so*
+Files: bin/qpe apps/Settings/Calibrate.desktop pics/launcher pics/devicebuttons/*.png plugins/applets/libsuspendapplet.so* plugins/applets/libhomeapplet.so* plugins/applets/liblogoutapplet.so* root/etc/init.d/opie
 Priority: required
@@ -5,5 +5,4 @@ Maintainer: Project Opie <opie@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: qt-embedded (>=$QTE_VERSION)
+Version: $QPE_VERSION-$SUB_VERSION.2
+Depends: qt-embedded (>=$QTE_VERSION), opie-common, libqpe1, libopie11
 Description: Launcher for Opie
- The "finder" or "explorer", or whatever you want to call it.
diff --git a/core/launcher/opie-taskbar.postinst b/core/launcher/opie-taskbar.postinst
new file mode 100644
index 0000000..483985b
--- a/dev/null
+++ b/core/launcher/opie-taskbar.postinst
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+ln -sf ../init.d/opie /etc/rc0.d/K98opie
+ln -sf ../init.d/opie /etc/rc1.d/K98opie
+ln -sf ../init.d/opie /etc/rc6.d/K98opie
+ln -sf ../init.d/opie /etc/rc2.d/S98opie
+ln -sf ../init.d/opie /etc/rc3.d/S98opie
+ln -sf ../init.d/opie /etc/rc4.d/S98opie
+ln -sf ../init.d/opie /etc/rc5.d/S98opie
+
+exit 0
diff --git a/core/launcher/opie-taskbar.prerm b/core/launcher/opie-taskbar.prerm
new file mode 100755
index 0000000..664160b
--- a/dev/null
+++ b/core/launcher/opie-taskbar.prerm
@@ -0,0 +1,5 @@
+#/bin/sh
+
+find /etc -name [SK][0-9][0-9]opie | xargs rm -f
+
+exit 0
diff --git a/core/multimedia/opieplayer/opie-mediaplayer.control b/core/multimedia/opieplayer/opie-mediaplayer.control
index da193c0..0eea09d 100644
--- a/core/multimedia/opieplayer/opie-mediaplayer.control
+++ b/core/multimedia/opieplayer/opie-mediaplayer.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base ($QPE_VERSION), libopie ($QPE_VERSION)
+Depends: opie-base ($QPE_VERSION), libopie1 ($QPE_VERSION)
 Description: The Opie media player
diff --git a/core/opie-login/opie-login.control b/core/opie-login/opie-login.control
index 16f82f0..0bf29f8 100644
--- a/core/opie-login/opie-login.control
+++ b/core/opie-login/opie-login.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base ($QPE_VERSION), libopie
+Depends: opie-base ($QPE_VERSION), libopie1
 Description: Multiuser login for OPIE
diff --git a/core/pim/addressbook/opie-addressbook.control b/core/pim/addressbook/opie-addressbook.control
index f8fd7aa..cc7f580 100644
--- a/core/pim/addressbook/opie-addressbook.control
+++ b/core/pim/addressbook/opie-addressbook.control
@@ -7,3 +7,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base ($QPE_VERSION), libopie ($QPE_VERSION)
+Depends: opie-base ($QPE_VERSION), libopie1 ($QPE_VERSION)
 Description: Contacts
diff --git a/core/pim/datebook/opie-datebook.control b/core/pim/datebook/opie-datebook.control
index cb2dd6a..de2673f 100644
--- a/core/pim/datebook/opie-datebook.control
+++ b/core/pim/datebook/opie-datebook.control
@@ -7,3 +7,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base ($QPE_VERSION), libopie ($QPE_VERSION)
+Depends: opie-base ($QPE_VERSION), libopie1 ($QPE_VERSION)
 Description: A datebook/appointment manager
diff --git a/core/pim/today/opie-today.control b/core/pim/today/opie-today.control
index acdcf8e..a514c3e 100644
--- a/core/pim/today/opie-today.control
+++ b/core/pim/today/opie-today.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: 0.6-$SUB_VERSION
-Depends: opie-base ($QPE_VERSION), libopie ($QPE_VERSION)
+Depends: opie-base ($QPE_VERSION), libopie1 ($QPE_VERSION)
 License: GPL
diff --git a/core/pim/today/task-opie-today.control b/core/pim/today/task-opie-today.control
index 07d6ba5..780c08a 100644
--- a/core/pim/today/task-opie-today.control
+++ b/core/pim/today/task-opie-today.control
@@ -5,3 +5,3 @@ Architecture: arm
 Version: 0.5-$SUB_VERSION
-Depends: opie-base ($QPE_VERSION), libopie ($QPE_VERSION), opie-today, opie-today-datebookplugin, opie-today-todolistplugin, opie-today-mailplugin
+Depends: opie-base ($QPE_VERSION), libopie1 ($QPE_VERSION), opie-today, opie-today-datebookplugin, opie-today-todolistplugin, opie-today-mailplugin
 License: GPL
diff --git a/core/pim/todo/opie-todo.control b/core/pim/todo/opie-todo.control
index a78228d..d2b705a 100644
--- a/core/pim/todo/opie-todo.control
+++ b/core/pim/todo/opie-todo.control
@@ -6,3 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base ($QPE_VERSION), libopie ($QPE_VERSION)
+Depends: opie-base ($QPE_VERSION), libopie1 ($QPE_VERSION)
 Description: TODO-list manager