Arent dependencies fun?

10 files changed, 11 insertions, 11 deletions

diff --git a/core/apps/qcop/opie-qcop.control b/core/apps/qcop/opie-qcop.control
index 17e3985..9781948 100644
--- a/core/apps/qcop/opie-qcop.control
+++ b/core/apps/qcop/opie-qcop.control
@@ -1,9 +1,9 @@
 Files: bin/qcop
 Priority: required
 Section: opie/system
 Maintainer: Martin Jones <mjones@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: qt-embedded (>=$QTE_VERSION)
+Depends: libqt2-emb
 Description: Interprocess communication client
  Interprocess communication client for the Opie environment.
diff --git a/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control b/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control
index 89e9792..6d5e155 100644
--- a/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control
+++ b/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control
@@ -1,8 +1,8 @@
 Files: plugins/today/libtodayaddressbookplugin.so*
 Priority: optional
 Section: opie/applications
 Maintainer: Stefan Eilers <eilers.stefan@epost.de>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: qt-embedded (>=$QTE_VERSION), opie-today
+Depends: libqt2-emb, opie-today
 Description: Addressbook plugin for today shows Birthdays and Anniversaries
diff --git a/core/pim/today/plugins/datebook/opie-today-datebookplugin.control b/core/pim/today/plugins/datebook/opie-today-datebookplugin.control
index 1e501e8..8f45534 100644
--- a/core/pim/today/plugins/datebook/opie-today-datebookplugin.control
+++ b/core/pim/today/plugins/datebook/opie-today-datebookplugin.control
@@ -1,8 +1,8 @@
 Files: plugins/today/libtodaydatebookplugin.so*
 Priority: optional
 Section: opie/applications
 Maintainer: Maximilian Reiss <harlekin@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: qt-embedded (>=$QTE_VERSION), opie-today
+Depends: libqt2-emb, opie-today
 Description: Datebook plugin for today
diff --git a/core/pim/today/plugins/mail/opie-today-mailplugin.control b/core/pim/today/plugins/mail/opie-today-mailplugin.control
index 7d37d47..d7f9e98 100644
--- a/core/pim/today/plugins/mail/opie-today-mailplugin.control
+++ b/core/pim/today/plugins/mail/opie-today-mailplugin.control
@@ -1,8 +1,8 @@
 Files: plugins/today/libtodaymailplugin.so*
 Priority: optional
 Section: opie/applications
 Maintainer: Maximilian Reiss <harlekin@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: qt-embedded (>=$QTE_VERSION), opie-today
+Depends: libqt2-emb, opie-today
 Description: Mail plugin for today
diff --git a/core/pim/today/plugins/todolist/opie-today-todolistplugin.control b/core/pim/today/plugins/todolist/opie-today-todolistplugin.control
index aaa66d1..38af3b9 100644
--- a/core/pim/today/plugins/todolist/opie-today-todolistplugin.control
+++ b/core/pim/today/plugins/todolist/opie-today-todolistplugin.control
@@ -1,8 +1,8 @@
 Files: plugins/today/libtodaytodolistplugin.so*
 Priority: optional
 Section: opie/applications
 Maintainer: Maximilian Reiss <harlekin@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: qt-embedded (>=$QTE_VERSION), opie-today
+Depends: libqt2-emb, opie-today
 Description: Todolist plugin for today
diff --git a/libopie/libopie1.control b/libopie/libopie1.control
index e62f59f..f98efd6 100644
--- a/libopie/libopie1.control
+++ b/libopie/libopie1.control
@@ -1,10 +1,10 @@
 Files: $OPIEDIR/lib/libopie.so.1.0.0 $OPIEDIR/lib/libopie.so.1.0 $OPIEDIR/lib/libopie.so.1
 Priority: optional
 Section: opie/system
-Maintainer: - 
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: qt-embedded (>=$QTE_VERSION)
+Depends: libqt2-emb (>=$QTE_VERSION)
 Provides: libopie
 Replaces: libopie
 Description: Opie library
diff --git a/noncore/net/opietooth/lib/libopietooth.control b/noncore/net/opietooth/lib/libopietooth.control
index 82d7397..e5bd1db 100644
--- a/noncore/net/opietooth/lib/libopietooth.control
+++ b/noncore/net/opietooth/lib/libopietooth.control
@@ -1,8 +1,8 @@
 Files: $OPIEDIR/lib/libopietooth.so.1.0.0 $OPIEDIR/lib/libopietooth.so.1.0 $OPIEDIR/lib/libopietooth.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: libqt2-emb (>=$QTE_VERSION), libopie, task-bluez
 Description: Opie bluetooth library
diff --git a/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control b/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control
index 128b7cd..3f37a26 100644
--- a/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control
+++ b/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control
@@ -1,8 +1,8 @@
 Files: plugins/today/libtodaystocktickerplugin.so* bin/stockticker pics/stockticker/stockticker.png
 Priority: optional
 Section: opie/applications
 Maintainer: ljp <llornkcor@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: qt-embedded (>=$QTE_VERSION), opie-today
+Depends: libqt2-emb, opie-today
 Description: stockticker plugin for today
diff --git a/noncore/todayplugins/weather/opie-today-weatherplugin.control b/noncore/todayplugins/weather/opie-today-weatherplugin.control
index 34a57c5..e87872d 100644
--- a/noncore/todayplugins/weather/opie-today-weatherplugin.control
+++ b/noncore/todayplugins/weather/opie-today-weatherplugin.control
@@ -1,8 +1,8 @@
 Files: plugins/today/libtodayweatherplugin.so* pics/todayweatherplugin
 Priority: optional
 Section: opie/applications
 Maintainer: Dan Williams <williamsdr@acm.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: qt-embedded (>=$QTE_VERSION), opie-today
+Depends: libqt2-emb, opie-today
 Description: Current weather plugin for today.
diff --git a/qt/libqt2-emb.control b/qt/libqt2-emb.control
index 14a4458..450450d 100644
--- a/qt/libqt2-emb.control
+++ b/qt/libqt2-emb.control
@@ -1,12 +1,12 @@
-Files: $QTDIR/lib/libqte.so.$QTE_VERSION $QTDIR/lib/libqte.so.2.3 $QTDIR/lib/libqte.so.2
+Files: $QTDIR/lib/libqte.so.$QTE_BASEVERSION $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.