Finally and hopefully, dependencies are correct. Comments ?

Fixed missing include in euroconv.pro

12 files changed, 14 insertions, 11 deletions

diff --git a/core/launcher/opie-taskbar.control b/core/launcher/opie-taskbar.control
index b7172ef..abe5fb8 100644
--- a/core/launcher/opie-taskbar.control
+++ b/core/launcher/opie-taskbar.control
@@ -1,8 +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* root/etc/init.d/opie
 Priority: required
 Section: opie/system
 Maintainer: Project Opie <opie@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.3
-Depends: libqt2-emb (>=$QTE_VERSION), libqt2-emb-fonts (>=$QTE_VERSION), opie-common, libqpe1, libopie1, opie-qcop, opie-sounds, apmd, opie-pics, timezones
+Depends: opie-base
 Description: Launcher for Opie
diff --git a/libopie/libopie1.control b/libopie/libopie1.control
index f98efd6..9be98bb 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: Opie Team <opie@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: libqt2-emb (>=$QTE_VERSION)
+Depends: libqt2-emb (>=$QTE_VERSION), libqpe1
 Provides: libopie
 Replaces: libopie
 Description: Opie library
diff --git a/library/opie-common.control b/library/opie-common.control
index ff0e36c..c2534c4 100644
--- a/library/opie-common.control
+++ b/library/opie-common.control
@@ -1,9 +1,9 @@
 Files: etc/colors 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.2
-Provides: opie-base, qpe-base
+Depends: libqpe1
 Replaces: opie-base
 Description: Core opie files
diff --git a/library/task-opie-applets.control b/library/task-opie-applets.control
index 7921b45..7608f9b 100644
--- a/library/task-opie-applets.control
+++ b/library/task-opie-applets.control
@@ -1,9 +1,9 @@
 Files: 
 Priority: optional
 Section: opie/applications
 Maintainer: Maximilian Reiss <max.reiss@gmx.de>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-batteryapplet, opie-clockapplet, opie-vmemo, opie-volumeapplet, opie-screenshotapplet, opie-pickboard, opie-multikey, opie-jumpx, opie-handwriting, opie-dvorak, opie-unikeyboard
+Depends: task-opie-minimal, opie-batteryapplet, opie-clockapplet, opie-vmemo, opie-volumeapplet, opie-screenshotapplet, opie-pickboard, opie-multikey, opie-jumpx, opie-handwriting, opie-dvorak, opie-unikeyboard
 Description: Opie taskbar applets
  All applets for the taskbar
diff --git a/library/task-opie-apps.control b/library/task-opie-apps.control
index b2bacf4..242a8cc 100644
--- a/library/task-opie-apps.control
+++ b/library/task-opie-apps.control
@@ -1,9 +1,9 @@
 Files: 
 Priority: optional
 Section: opie/applications
 Maintainer: Maximilian Reiss <max.reiss@gmx.de>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: task-opie, task-opie-pim, opie-advancedfm, opie-calculator, opie-citytime, opie-clock, opie-embeddedkonsole, opie-filebrowser, opie-libmadplugin, opie-libmpeg3plugin, opie-mail2, opie-mediaplayer, opie-qpdf, opie-showimg, opie-sounds, opie-sheet, opie-sysinfo, opie-systemtime, opie-tableviewer, opie-textedit, opie-wavplugin, timezones
+Depends: task-opie-pim, opie-advancedfm, opie-calculator, opie-citytime, opie-clock, opie-embeddedkonsole, opie-filebrowser, opie-libmadplugin, opie-libmpeg3plugin, opie-mail2, opie-mediaplayer, opie-qpdf, opie-showimg, opie-sounds, opie-sheet, opie-sysinfo, opie-systemtime, opie-tableviewer, opie-textedit, opie-wavplugin, timezones
 Description: Opie apps
  Most applications.
diff --git a/library/task-opie-complete.control b/library/task-opie-complete.control
index cfe5348..55b54fc 100644
--- a/library/task-opie-complete.control
+++ b/library/task-opie-complete.control
@@ -1,9 +1,9 @@
 Files: 
 Priority: optional
 Section: opie/applications
 Maintainer: Maximilian Reiss <max.reiss@gmx.de>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: task-opie, task-opie-apps, task-opie-settings, task-opie-games, task-opie-applets
+Depends: task-opie-apps, task-opie-settings, task-opie-games, task-opie-applets
 Description: All of Opie
  All apps that are in the feed.
diff --git a/library/task-opie-games.control b/library/task-opie-games.control
index 9695a40..8079ea0 100644
--- a/library/task-opie-games.control
+++ b/library/task-opie-games.control
@@ -1,9 +1,9 @@
 Files: 
 Priority: optional
 Section: opie/games
 Maintainer: Maximilian Reiss <max.reiss@gmx.de>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-fifteen, opie-go, opie-kbill, opie-kcheckers, opie-kpacman, opie-minesweep, opie-parashoot, opie-qasteroids, opie-snake, opie-solitaire, opie-tetrix, opie-tictac, opie-wordgame
+Depends: task-opie-minimal, opie-fifteen, opie-go, opie-kbill, opie-kcheckers, opie-kpacman, opie-minesweep, opie-parashoot, opie-qasteroids, opie-snake, opie-solitaire, opie-tetrix, opie-tictac, opie-wordgame
 Description: Opie game pack
  The full load of Opie games.
diff --git a/library/task-opie-minimal.control b/library/task-opie-minimal.control
index 94c6ff3..dcc433a 100644
--- a/library/task-opie-minimal.control
+++ b/library/task-opie-minimal.control
@@ -1,10 +1,11 @@
 Files: 
 Priority: required
 Section: opie/system
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-aqpkg, opie-taskbar, opie-opiealarm
+Depends: libqt2-emb (>=$QTE_VERSION), libqt2-emb-fonts (>=$QTE_VERSION), opie-common, libqpe1, libopie1, opie-qcop, opie-sounds, apmd, opie-pics, timezones, opie-aqpkg, opie-taskbar, opie-opiealarm
+Provides: opie-base, qpe-base
 Description: Bootstrap Opie environment(minimal)
  A complete GUI environment for handhelds. This is the _minimal_ version.
  You will probably want to install one of the opie-i18n-* packages.
diff --git a/library/task-opie-pim.control b/library/task-opie-pim.control
index d8d2937..53bef8c 100644
--- a/library/task-opie-pim.control
+++ b/library/task-opie-pim.control
@@ -1,9 +1,9 @@
 Files: 
 Priority: optional
 Section: opie/applications
 Maintainer: Maximilian Reiss <max.reiss@gmx.de>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-datebook, opie-todo, opie-addressbook, task-opie-today, opie-drawpad, opie-multikey
+Depends: task-opie-minimal, opie-datebook, opie-todo, opie-addressbook, task-opie-today, opie-drawpad, opie-multikey
 Description: Opie pim applications
  Base pack of opie pim applications. Also includes keyboard input.
diff --git a/library/task-opie-settings.control b/library/task-opie-settings.control
index a49d1f8..ffe5c3b 100644
--- a/library/task-opie-settings.control
+++ b/library/task-opie-settings.control
@@ -1,9 +1,9 @@
 Files: 
 Priority: optional
 Section: opie/applications
 Maintainer: Maximilian Reiss <max.reiss@gmx.de>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-appearance, opie-security, opie-systemtime, opie-light-and-power, opie-rotation, opie-tabmanager
+Depends: task-opie-minimal, opie-appearance, opie-security, opie-systemtime, opie-light-and-power, opie-rotation, opie-tabmanager
 Description: Opie settings app
  All settings apps
diff --git a/library/task-opie.control b/library/task-opie.control
index 0096105..6ee0714 100644
--- a/library/task-opie.control
+++ b/library/task-opie.control
@@ -1,10 +1,10 @@
 Files: 
 Priority: required
 Section: opie/system
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-aqpkg, task-opie-minimal, task-opie-pim, opie-multikey, opie-handwriting, opie-batteryapplet, opie-clockapplet, opie-volumeapplet, opie-clipboardapplet, opie-advancedfm, opie-calculator, opie-citytime, opie-clock, opie-embeddedkonsole, opie-irdaapplet, opie-launcher-settings, opie-light-and-power, opie-appearance, opie-login, opie-opiealarm, opie-qpdf, opie-showimg, opie-solitaire, opie-sysinfo, opie-textedit, opie-systemtime, opie-cardmon, opie-backup, opie-networksettings, opie-button-settings
+Depends: task-opie-pim, opie-aqpkg, opie-multikey, opie-handwriting, opie-batteryapplet, opie-clockapplet, opie-volumeapplet, opie-clipboardapplet, opie-advancedfm, opie-calculator, opie-citytime, opie-clock, opie-embeddedkonsole, opie-irdaapplet, opie-launcher-settings, opie-light-and-power, opie-appearance, opie-login, opie-opiealarm, opie-qpdf, opie-showimg, opie-solitaire, opie-sysinfo, opie-textedit, opie-systemtime, opie-cardmon, opie-backup, opie-networksettings, opie-button-settings
 Description: Bootstrap Opie environment
  A complete GUI environment for handhelds.
  You will probably want to install one of the opie-i18n-* packages.
diff --git a/noncore/tools/euroconv/euroconv.pro b/noncore/tools/euroconv/euroconv.pro
index dd2f7af..a13129e 100644
--- a/noncore/tools/euroconv/euroconv.pro
+++ b/noncore/tools/euroconv/euroconv.pro
@@ -1,12 +1,14 @@
         TEMPLATE= app
         CONFIG  = qt warn_on release
         HEADERS         = calcdisplay.h    \
                 calckeypad.h
         SOURCES         = calcdisplay.cpp  \
                 calckeypad.cpp \
                 main.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
         DESTDIR         = ${OPIEDIR}/bin
         INTERFACES= 
+
+include ( $(OPIEDIR)/include.pro )