summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/cardmon/opie-cardmon.control2
-rw-r--r--core/applets/irdaapplet/opie-irdaapplet.control2
-rw-r--r--core/applets/obex/libopieobex.control2
-rw-r--r--core/apps/embeddedkonsole/opie-embeddedkonsole.control2
-rw-r--r--core/apps/textedit/opie-textedit.control2
-rw-r--r--core/launcher/opie-taskbar.control7
-rw-r--r--core/launcher/opie-taskbar.postinst11
-rwxr-xr-xcore/launcher/opie-taskbar.prerm5
-rw-r--r--core/multimedia/opieplayer/opie-mediaplayer.control2
-rw-r--r--core/opie-login/opie-login.control2
-rw-r--r--core/pim/addressbook/opie-addressbook.control2
-rw-r--r--core/pim/datebook/opie-datebook.control2
-rw-r--r--core/pim/today/opie-today.control2
-rw-r--r--core/pim/today/task-opie-today.control2
-rw-r--r--core/pim/todo/opie-todo.control2
-rw-r--r--libopie/libopie1.control10
-rwxr-xr-xlibopie/libopie1.postinst4
-rw-r--r--library/libqpe1.control8
-rwxr-xr-xlibrary/libqpe1.postinst4
-rw-r--r--library/opie-base.control9
-rw-r--r--library/opie-common.control7
-rw-r--r--noncore/apps/checkbook/opie-checkbook.control2
-rw-r--r--noncore/apps/opie-console/opie-console.control2
-rw-r--r--noncore/graphics/drawpad/opie-drawpad.control2
-rw-r--r--noncore/multimedia/opieplayer2/opie-mediaplayer2.control2
-rw-r--r--noncore/net/opieirc/opie-irc.control2
-rw-r--r--noncore/net/opietooth/applet/opie-bluetoothapplet.control2
-rw-r--r--noncore/net/opietooth/lib/libopietooth.control4
-rw-r--r--noncore/net/opietooth/manager/opie-bluetoothmanager.control2
-rw-r--r--noncore/settings/appearance2/opie-appearance.control2
-rw-r--r--noncore/settings/netsystemtime/opie-systemtime.control2
-rw-r--r--noncore/settings/sysinfo/opie-sysinfo.control2
-rw-r--r--noncore/unsupported/mail2/bend/opie-mailapplet.control2
-rw-r--r--noncore/unsupported/mail2/opie-mail2.control2
-rw-r--r--pics/opie-pics.control4
-rw-r--r--qt/libqt2-emb-fonts.control8
-rw-r--r--qt/libqt2-emb.control12
-rwxr-xr-xqt/libqt2-emb.postinst4
38 files changed, 107 insertions, 38 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
@@ -1,9 +1,9 @@
Files: plugins/applets/libcardmonapplet.so* pics/cardmon/*.png sounds/cardmon/*.wav
Priority: optional
Section: opie/taskbar
Maintainer: Maximilian Reiß <max.reiss@gmx.de>
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
SD/MMC/CF/PCMCIA Card Monitor applet for the Opie environment taskbar.
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
@@ -1,9 +1,9 @@
Files: plugins/applets/libirdaapplet.so* pics/irdaapplet/* sounds/irdaapplet/*.wav
Priority: optional
Section: opie/system
Maintainer: David Woodhouse <dwmw2@infradead.org>
Architecture: arm
Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: opie-base ($QPE_VERSION), libopieobex
+Depends: opie-base ($QPE_VERSION), libopie1obex
Description: Irda Applet
An IrDA taskbar applet for the Opie environment
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,9 +1,9 @@
-Files: plugins/obex/libopieobex.so*
+Files: plugins/obex/libopie1obex.so*
Priority: optional
Section: opie/system
Maintainer: Holger Freyther <zecke@handhelds.org>
Architecture: arm
Version: $QPE_VERSION-$SUB_VERSION.1
Depends: opie-base ($QPE_VERSION), openobex
Description: Irda obex lib
\ No newline at end of file
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
@@ -1,9 +1,9 @@
Files: bin/embeddedkonsole apps/Applications/embeddedkonsole.desktop pics/konsole etc/keytabs/*
Priority: optional
Section: opie/applications
Maintainer: L.J. Potter <ljp@llornkcor.com>
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)
Ported to the Opie environment.
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
@@ -1,9 +1,9 @@
Files: bin/textedit apps/1Pim/textedit.desktop pics/textedit
Priority: optional
Section: opie/applications
Maintainer: L. J. Potter <llornkcor@handhelds.org>
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
The text editor for the Opie environment.
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,9 +1,8 @@
-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
Section: opie/system
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
@@ -1,9 +1,9 @@
Files: bin/opieplayer pics/opieplayer apps/Applications/opieplayer.desktop pics/opieplayer2/skins/default
Priority: optional
Section: opie/applications
Maintainer: L.J.Potter <ljp@llornkcor.com>
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
The mediaplayer for Opie. It plays mp3, mpeg, and wav.
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
@@ -1,9 +1,9 @@
Files: bin/opie-login share/opie-login/opie-session share/opie-login/pre-session share/opie-login/post-session
Priority: optional
Section: opie/system
Maintainer: Project Opie <opie@handhelds.org>
Architecture: arm
Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base ($QPE_VERSION), libopie
+Depends: opie-base ($QPE_VERSION), libopie1
Description: Multiuser login for OPIE
A xdm/kdm equivalent 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
@@ -1,10 +1,10 @@
Files: bin/addressbook apps/1Pim/addressbook.desktop pics/addressbook/*.png
Priority: optional
Section: opie/applications
Conflicts: qpe-tkcaddressbook
Maintainer: Stefan Eilers <eilers.stefan@epost.de>
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
A simple addressbook for the Opie environment.
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
@@ -1,10 +1,10 @@
Files: bin/datebook apps/1Pim/datebook.desktop pics/datebook
Priority: optional
Section: opie/applications
Conflicts: qpe-tkccalendar
Maintainer: Warwick Allison <warwick@trolltech.com>
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
A datebook/appointment manager for the Opie environment.
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
@@ -1,16 +1,16 @@
Files: bin/today apps/1Pim/today.desktop pics/today/*
Priority: optional
Section: opie/applications
Maintainer: Maximilian Reiß <harlekin@handhelds.org>
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
Description: today screen
This today screen app gives an overview of appointments
and todos.
It also shows incoming and outgoing mails from opiemail.
When using Opie (opie.handhelds.org) today can be autostarted
on resume.
It is highly configurable.
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
@@ -1,10 +1,10 @@
Priority: optional
Section: opie/applications
Maintainer: Maximilian Reiß <harlekin@handhelds.org>
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
Description: Task for basic today setup
includes datebook, todolist and mail plugin
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
@@ -1,9 +1,9 @@
Files: bin/todolist apps/1Pim/todo.desktop pics/todo
Priority: optional
Section: opie/applications
Maintainer: Holger 'zecke' Freyther <zecke@handhelds.org>
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
A Todo-list manager for the Opie environment.
diff --git a/libopie/libopie1.control b/libopie/libopie1.control
new file mode 100644
index 0000000..07aafb2
--- a/dev/null
+++ b/libopie/libopie1.control
@@ -0,0 +1,10 @@
+Files: $QTDIR/lib/libopie.so.1.0.0 $QTDIR/lib/libopie.so.1.0 $QTDIR/lib/libopie.so.1
+Priority: optional
+Section: opie/system
+Maintainer: -
+Architecture: arm
+Version: $QPE_VERSION-$SUB_VERSION.1
+Depends: qt-embedded (>=$QTE_VERSION)
+Provides: libopie
+Replaces: libopie
+Description: Opie library
diff --git a/libopie/libopie1.postinst b/libopie/libopie1.postinst
new file mode 100755
index 0000000..50d922c
--- a/dev/null
+++ b/libopie/libopie1.postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -x ldconfig ] && ldconfig
+exit 0
diff --git a/library/libqpe1.control b/library/libqpe1.control
new file mode 100644
index 0000000..8b0e437
--- a/dev/null
+++ b/library/libqpe1.control
@@ -0,0 +1,8 @@
+Files: $OPIEDIR/lib/libqpe.so.1 $OPIEDIR/lib/libqpe.so.1.5 $OPIEDIR/lib/libqpe.so.1.5.0
+Priority: required
+Section: opie/system
+Maintainer: Project Opie <opie@handhelds.org>
+Architecture: arm
+Version: $QPE_VERSION-$SUB_VERSION.1
+Depends: qt-embedded (>=$QTE_VERSION)
+Description: libqpe, base qtopia/opie library.
diff --git a/library/libqpe1.postinst b/library/libqpe1.postinst
new file mode 100755
index 0000000..50d922c
--- a/dev/null
+++ b/library/libqpe1.postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -x ldconfig ] && ldconfig
+exit 0
diff --git a/library/opie-base.control b/library/opie-base.control
index 8a9fdf6..4d0b015 100644
--- a/library/opie-base.control
+++ b/library/opie-base.control
@@ -1,12 +1,9 @@
-Files: etc/colors root/etc/init.d/opie bin/opie-reorgfiles $QTDIR/lib/libqpe.so.1 $QTDIR/lib/libqpe.so.1.5 $QTDIR/lib/libqpe.so.1.5.0 apps/*/.directory etc/mime.types apps/Settings/quit.desktop pics/logo/*
Priority: required
Section: opie/system
Maintainer: Project Opie <opie@handhelds.org>
Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION.2
+Version: $QPE_VERSION-$SUB_VERSION.3
Provides: qpe-base
Conflicts: qpe-base
-Depends: qt-embedded (>=$QTE_VERSION), qt-embedded-rotation, opie-qcop, opie-taskbar, opie-sounds, apmd, opie-pics, libopie, timezones
-Description: Base Opie environment
- A complete GUI environment for handhelds.
- You will probably want to install one of the opie-i18n-* packages.
+Depends: qt-embedded (>=$QTE_VERSION), qt-embedded-rotation, opie-common, libqpe1, libopie11, opie-qcop, opie-taskbar, opie-sounds, apmd, opie-pics, timezones
+Description: opie-base virtual package
diff --git a/library/opie-common.control b/library/opie-common.control
new file mode 100644
index 0000000..8afbb82
--- a/dev/null
+++ b/library/opie-common.control
@@ -0,0 +1,7 @@
+Files: etc/colors root/etc/init.d/opie bin/opie-reorgfiles apps/*/.directory etc/mime.types apps/Settings/quit.desktop pics/logo/*
+Priority: required
+Section: opie/system
+Maintainer: Project Opie <opie@handhelds.org>
+Architecture: arm
+Version: $QPE_VERSION-$SUB_VERSION.1
+Description: Core opie files
diff --git a/noncore/apps/checkbook/opie-checkbook.control b/noncore/apps/checkbook/opie-checkbook.control
index 817426c..e15200c 100644
--- a/noncore/apps/checkbook/opie-checkbook.control
+++ b/noncore/apps/checkbook/opie-checkbook.control
@@ -1,9 +1,9 @@
Files: bin/checkbook apps/Applications/checkbook.desktop pics/checkbook
Priority: optional
Section: applications
Maintainer: Dan Williams <drw@handhelds.org>
Architecture: arm
Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base ($QPE_VERSION), libopie ($QPE_VERSION)
+Depends: opie-base ($QPE_VERSION), libopie1 ($QPE_VERSION)
Description: Checkbook keeping program.
The checkbook accounting program for the Opie environment.
diff --git a/noncore/apps/opie-console/opie-console.control b/noncore/apps/opie-console/opie-console.control
index 8541d22..34bf681 100644
--- a/noncore/apps/opie-console/opie-console.control
+++ b/noncore/apps/opie-console/opie-console.control
@@ -1,10 +1,10 @@
Files: bin/opie-console apps/Applications/opie-console.desktop pics/console/* etc/keytabs/default.Keytab bin/sz bin/rz
Priority: optional
Section: opie/applications
Maintainer: Opie team <opie@handhelds.org>
Architecture: arm
Version: 0.6-$SUB_VERSION
-Depends: qpe-base ($QPE_VERSION), libopie ($QPE_VERSION), opie-console-help-en
+Depends: qpe-base ($QPE_VERSION), libopie1 ($QPE_VERSION), opie-console-help-en
License: GPL
Description: Opie terminal app
diff --git a/noncore/graphics/drawpad/opie-drawpad.control b/noncore/graphics/drawpad/opie-drawpad.control
index 11e56e0..77c8649 100644
--- a/noncore/graphics/drawpad/opie-drawpad.control
+++ b/noncore/graphics/drawpad/opie-drawpad.control
@@ -1,11 +1,11 @@
Files: bin/drawpad apps/1Pim/drawpad.desktop pics/drawpad
Priority: optional
Section: opie/applications
Maintainer: Sébastien Prud'homme <prudhomme@laposte.net>
Architecture: arm
Version: $QPE_VERSION-$SUB_VERSION-0.9.5
-Depends: opie-base ($QPE_VERSION), libopie ($QPE_VERSION)
+Depends: opie-base ($QPE_VERSION), libopie1 ($QPE_VERSION)
Description: A note taking program with basic draw tools
DrawPad is an easy note taking program for Zaurus. It can also
be used to draw simple images. DrawPad was developed for the Opie
project, an alternative to the standard Zaurus environment.
diff --git a/noncore/multimedia/opieplayer2/opie-mediaplayer2.control b/noncore/multimedia/opieplayer2/opie-mediaplayer2.control
index d9aede8..8e7298b 100644
--- a/noncore/multimedia/opieplayer2/opie-mediaplayer2.control
+++ b/noncore/multimedia/opieplayer2/opie-mediaplayer2.control
@@ -1,10 +1,10 @@
Files: bin/opieplayer2 apps/Applications/mediaplayer.desktop pics/opieplayer2/add_to_playlist.png pics/opieplayer2/cut.png pics/opieplayer2/delete.png pics/opieplayer2/down.png pics/opieplayer2/loop.png pics/opieplayer2/MPEGPlayer.png pics/opieplayer2/musicfile.png pics/opieplayer2/playlist2.png pics/opieplayer2/play.png pics/opieplayer2/remove_from_playlist.png pics/opieplayer2/shuffle.png pics/opieplayer2/up.png pics/opieplayer2/videofile.png pics/opieplayer2/skins/default
Priority: optional
Section: opie/applications
Maintainer: L.J.Potter <ljp@llornkcor.com>, Maximilian Reiss <harlekin@handhelds.org>
Architecture: arm
Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base ($QPE_VERSION), libopie ($QPE_VERSION), zlib1g
+Depends: opie-base ($QPE_VERSION), libopie1 ($QPE_VERSION), zlib1g
Description: The Opie media player
The mediaplayer for Opie. It plays mp3, mpeg, wav, ogg, quicktime, divx and
more. Also it is streaming capable.
diff --git a/noncore/net/opieirc/opie-irc.control b/noncore/net/opieirc/opie-irc.control
index b0cdfde..29e672f 100644
--- a/noncore/net/opieirc/opie-irc.control
+++ b/noncore/net/opieirc/opie-irc.control
@@ -1,8 +1,8 @@
Files: bin/opieirc pics/opieirc apps/Applications/opieirc.desktop help/en/html/opieirc.html help/en/html/opieirc
Priority: optional
Section: Communications
Maintainer: Wenzel Jakob <root@wazlaf.de>
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 IRC client lets you chat on your favorite IRC server using your handheld computer
diff --git a/noncore/net/opietooth/applet/opie-bluetoothapplet.control b/noncore/net/opietooth/applet/opie-bluetoothapplet.control
index 6f1addf..4e045f7 100644
--- a/noncore/net/opietooth/applet/opie-bluetoothapplet.control
+++ b/noncore/net/opietooth/applet/opie-bluetoothapplet.control
@@ -1,9 +1,9 @@
Files: plugins/applets/libbluetoothapplet.so* pics/bluetoothapplet/*
Priority: optional
Section: opie/system
Maintainer: Maximilian Reiss <max.reiss@gmx.de>
Architecture: arm
Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: opie-base ($QPE_VERSION), libopietooth
+Depends: opie-base ($QPE_VERSION), libopie1tooth
Description: Bluetooth Applet
An bluetooth taskbar applet for the Opie environment
diff --git a/noncore/net/opietooth/lib/libopietooth.control b/noncore/net/opietooth/lib/libopietooth.control
index d35b119..bdc43b1 100644
--- a/noncore/net/opietooth/lib/libopietooth.control
+++ b/noncore/net/opietooth/lib/libopietooth.control
@@ -1,8 +1,8 @@
-Files: $QTDIR/lib/libopietooth.so.1.0.0 $QTDIR/lib/libopietooth.so.1.0 $QTDIR/lib/libopietooth.so.1
+Files: $QTDIR/lib/libopie11tooth.so.1.0.0 $QTDIR/lib/libopie11tooth.so.1.0 $QTDIR/lib/libopie11tooth.so.1
Priority: optional
Section: opie/system
Maintainer: Maximilian Reiß <max.reiss@gmx.de>
Architecture: arm
Version: $QPE_VERSION-$SUB_VERSION
-Depends: qt-embedded (>=$QTE_VERSION), libopie, task-bluez
+Depends: qt-embedded (>=$QTE_VERSION), libopie11, task-bluez
Description: Opie bluetooth library
diff --git a/noncore/net/opietooth/manager/opie-bluetoothmanager.control b/noncore/net/opietooth/manager/opie-bluetoothmanager.control
index 1ed5ef7..9b77d07 100644
--- a/noncore/net/opietooth/manager/opie-bluetoothmanager.control
+++ b/noncore/net/opietooth/manager/opie-bluetoothmanager.control
@@ -1,10 +1,10 @@
Files: bin/bluetooth-manager apps/Settings/bluetooth-manager.desktop pics/opietooth/*
Priority: optional
Section: opie/applications
Maintainer: Maximilian Reiß <max.reiss@gmx.de>
Architecture: arm
Version: 0.5.4-$SUB_VERSION
-Depends: opie-base ($QPE_VERSION), libopietooth, opie-bluepin
+Depends: opie-base ($QPE_VERSION), libopie1tooth, opie-bluepin
License: GPL
Description: Bluetooth Manager application
diff --git a/noncore/settings/appearance2/opie-appearance.control b/noncore/settings/appearance2/opie-appearance.control
index d271cb4..31775fb 100644
--- a/noncore/settings/appearance2/opie-appearance.control
+++ b/noncore/settings/appearance2/opie-appearance.control
@@ -1,9 +1,9 @@
Files: bin/appearance apps/Settings/Appearance.desktop pics/appearance
Priority: optional
Section: opie/settings
Maintainer: Dan Williams <wiliamsdr@acm.org>
Architecture: arm
Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base ($QPE_VERSION), libopie ($QPE_VERSION)
+Depends: opie-base ($QPE_VERSION), libopie1 ($QPE_VERSION)
Description: Appearance settings dialog
For the Opie environment.
diff --git a/noncore/settings/netsystemtime/opie-systemtime.control b/noncore/settings/netsystemtime/opie-systemtime.control
index a9a028d..644c3a0 100644
--- a/noncore/settings/netsystemtime/opie-systemtime.control
+++ b/noncore/settings/netsystemtime/opie-systemtime.control
@@ -1,11 +1,11 @@
Packagename: opie-systemtime
Files: bin/systemtime apps/Settings/netsystemtime.desktop etc/ntpservers
Priority: optional
Section: opie/settings
Provides: opie-netsystemtime
Maintainer: Patrick S. Vogt <tille@handhelds.org>
Architecture: arm
Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base ($QPE_VERSION), ntpdate, libopie
+Depends: opie-base ($QPE_VERSION), ntpdate, libopie1
Description: ntp (Network Time Protocol) gui
This utility syncs system time with a atomic timerserver via internet
diff --git a/noncore/settings/sysinfo/opie-sysinfo.control b/noncore/settings/sysinfo/opie-sysinfo.control
index 4a6855d..78c9069 100644
--- a/noncore/settings/sysinfo/opie-sysinfo.control
+++ b/noncore/settings/sysinfo/opie-sysinfo.control
@@ -1,9 +1,9 @@
Files: bin/sysinfo apps/Applications/sysinfo.desktop pics/sysinfo
Priority: optional
Section: opie/applications
Maintainer: Dan Williams <williamsdr@acm.org>
Architecture: arm
Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base ($QPE_VERSION), libopie ($QPE_VERSION)
+Depends: opie-base ($QPE_VERSION), libopie1 ($QPE_VERSION)
Description: System Information dialog
For the Opie environment.
diff --git a/noncore/unsupported/mail2/bend/opie-mailapplet.control b/noncore/unsupported/mail2/bend/opie-mailapplet.control
index 9a8b5c6..ec6a6f3 100644
--- a/noncore/unsupported/mail2/bend/opie-mailapplet.control
+++ b/noncore/unsupported/mail2/bend/opie-mailapplet.control
@@ -1,9 +1,9 @@
Files: plugins/applets/libbend.so*
Priority: optional
Section: opie/applications
Maintainer: Constantin Bergemann <cbergemann@lisa.de>
Architecture: arm
Version: 0.0.9-$SUB_VERSION
-Depends: opie-base libopie opie-mail2
+Depends: opie-base libopie1 opie-mail2
Description: A Biff-Like mailchecker
License: LGPL
diff --git a/noncore/unsupported/mail2/opie-mail2.control b/noncore/unsupported/mail2/opie-mail2.control
index a323a4c..b6bbff8 100644
--- a/noncore/unsupported/mail2/opie-mail2.control
+++ b/noncore/unsupported/mail2/opie-mail2.control
@@ -1,9 +1,9 @@
Files: bin/mail $QTDIR/lib/libmail.so* apps/1Pim/mail.desktop pics/mail/*.png sounds/mail/*.wav
Priority: optional
Section: opie/applications
Maintainer: Constantin Bergemann <cbergemann@lisa.de>
Architecture: arm
Version: 0.0.9-$SUB_VERSION
-Depends: opie-base, libopie
+Depends: opie-base, libopie1
Description: An IMAP mail client
License: LGPL
diff --git a/pics/opie-pics.control b/pics/opie-pics.control
index 150d2e7..178b5ce 100644
--- a/pics/opie-pics.control
+++ b/pics/opie-pics.control
@@ -1,8 +1,8 @@
-Files: pics/??*.*
+Files: pics/??*.* pics/opie/*
Priority: required
Section: opie/system
Maintainer: Project Opie <opie@handhelds.org>
Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION.1
+Version: $QPE_VERSION-$SUB_VERSION.2
Description: a few unassigned for Opie environment
These icons are available to all Opie application.
diff --git a/qt/libqt2-emb-fonts.control b/qt/libqt2-emb-fonts.control
new file mode 100644
index 0000000..9dd45ca
--- a/dev/null
+++ b/qt/libqt2-emb-fonts.control
@@ -0,0 +1,8 @@
+Files: $QTDIR/lib/fonts/helvetica_*_{50,50i,75,75i}.* $QTDIR/lib/fonts/helvetica_*_t*5* $QTDIR/lib/fonts/fixed_*_50.* $QTDIR/lib/fonts/fixed_*_t*5* $QTDIR/lib/fonts/micro_*{50,50_t15,50_t5}.* $QTDIR/lib/fonts/smallsmooth_*{50,50_t15,50_t5}.* $QTDIR/lib/fonts/smoothtimes_{170,100}_{50,50_t15,50_t5}.* $QTDIR/lib/fonts/fontdir $QTDIR/lib/fonts/helvetica_*t10* $QTDIR/lib/fonts/fixed_*t10* $QTDIR/lib/fonts/micro_*t10* $QTDIR/lib/fonts/smallsmooth_*t10* $QTDIR/lib/fonts/smoothtimes_{170,100}_50*t10*
+Priority: required
+Section: opie/system
+Maintainer: Opie Team <opie@handhelds.org>
+Architecture: arm
+Depends: libqt2-emb
+Version: $QTE_VERSION-$QTE_REVISION
+Description: Qt/Embedded fonts - 0,90,180,270 rotation
diff --git a/qt/libqt2-emb.control b/qt/libqt2-emb.control
new file mode 100644
index 0000000..14a4458
--- a/dev/null
+++ b/qt/libqt2-emb.control
@@ -0,0 +1,12 @@
+Files: $QTDIR/lib/libqte.so.$QTE_VERSION $QTDIR/lib/libqte.so.2.3 $QTDIR/lib/libqte.so.2
+Priority: required
+Section: opie/system
+Maintainer: Robert Griebl <sandman@handhelds.org>
+Architecture: arm
+Version: $QTE_VERSION-$QTE_REVISION.1
+Depends: libjpeg62, libpng3, zlib1g
+Provides: qt-embedded
+Replaces: qt-embedded
+Description: Qt/Embedded environment
+ A complete windowing system and GUI toolkit for handhelds.
+ See "QPE" for applications.
diff --git a/qt/libqt2-emb.postinst b/qt/libqt2-emb.postinst
new file mode 100755
index 0000000..50d922c
--- a/dev/null
+++ b/qt/libqt2-emb.postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -x ldconfig ] && ldconfig
+exit 0