diff options
author | Koen Kooi <koen@openembedded.org> | 2006-03-02 17:54:35 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-03-02 17:54:35 +0000 |
commit | 40ce95ca64d662c16cec3d1efabc966dda5a2610 (patch) | |
tree | c5687492fbbc7f7e46b8db8448b1da640fef9955 /packages/maemo | |
parent | 858ca7bc53e7c03eac036217486e87e36eb1e3e6 (diff) | |
parent | 966f3a94af2c83ffd2c634171fbe04917731b6f9 (diff) |
explicit_merge of '601faaded8a6427e29dc8dc43433fe9be662c96c'
and 'a67386ccbaf4538441ab5d8769e018207ab0c744'
using ancestor '9c1b32d8825be71ddfdcbe3ddfa31b4cc8bb2aa0'
to branch 'org.openembedded.dev'
Diffstat (limited to 'packages/maemo')
-rw-r--r-- | packages/maemo/hildon-fm_0.9.1-2.bb | 2 | ||||
-rw-r--r-- | packages/maemo/hildon-lgpl_0.9.14-2.bb | 2 | ||||
-rw-r--r-- | packages/maemo/osso-af-utils_0.4.bb | 2 | ||||
-rw-r--r-- | packages/maemo/xpext_1.0-5.bb | 2 | ||||
-rw-r--r-- | packages/maemo/xsp_1.0.0-8.bb | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/packages/maemo/hildon-fm_0.9.1-2.bb b/packages/maemo/hildon-fm_0.9.1-2.bb index f5346286c0..93bf0cbfa2 100644 --- a/packages/maemo/hildon-fm_0.9.1-2.bb +++ b/packages/maemo/hildon-fm_0.9.1-2.bb @@ -2,7 +2,7 @@ PR = "r1" LICENSE = "GPL/LGPL" MAINTAINER = "Koen Kooi <koen@handhelds.org>" -DEPENDS = "gtk+-2.6.4-1.osso7 outo libxi xt libpng gconf hildon-lgpl osso-thumbnail osso-gwconnect" +DEPENDS = "gtk+-2.6.4-1.osso7 outo libxi libxt libpng gconf hildon-lgpl osso-thumbnail osso-gwconnect" SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-fm/hildon-fm_${PV}.tar.gz" S = "${WORKDIR}/hildon-fm-0.9.1" diff --git a/packages/maemo/hildon-lgpl_0.9.14-2.bb b/packages/maemo/hildon-lgpl_0.9.14-2.bb index f3ef59c8dc..9656fd85b6 100644 --- a/packages/maemo/hildon-lgpl_0.9.14-2.bb +++ b/packages/maemo/hildon-lgpl_0.9.14-2.bb @@ -1,7 +1,7 @@ LICENSE = "LGPL" MAINTAINER = "Koen Kooi <koen@handhelds.org>" -DEPENDS = "gtk+-2.6.4-1.osso7 outo xtst libmatchbox libxi xt libpng gconf" +DEPENDS = "gtk+-2.6.4-1.osso7 outo libxtst libmatchbox libxi libxt libpng gconf" SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-lgpl/hildon-lgpl_${PV}.tar.gz \ file://hildon-lgpl-noWerror.patch;patch=1" diff --git a/packages/maemo/osso-af-utils_0.4.bb b/packages/maemo/osso-af-utils_0.4.bb index 070d2e0c66..54f2305b17 100644 --- a/packages/maemo/osso-af-utils_0.4.bb +++ b/packages/maemo/osso-af-utils_0.4.bb @@ -1,7 +1,7 @@ LICENSE = "LGPL" MAINTAINER= "Koen Kooi <koen@handhelds.org>" -DEPENDS = "x11 dbus libosso" +DEPENDS = "libx11 dbus libosso" SRC_URI = "http://stage.maemo.org:80/pool/maemo/ossw/source/o/osso-af-utils/osso-af-utils_${PV}-1.tar.gz" inherit autotools pkgconfig diff --git a/packages/maemo/xpext_1.0-5.bb b/packages/maemo/xpext_1.0-5.bb index cd5aec2d13..75b7903e84 100644 --- a/packages/maemo/xpext_1.0-5.bb +++ b/packages/maemo/xpext_1.0-5.bb @@ -3,7 +3,7 @@ LICENSE= "MIT" DESCRIPTION = "X Server Nokia 770 extensions library" SECTION = "x11/libs" PRIORITY = "optional" -DEPENDS = "x11 xextensions xext" +DEPENDS = "libx11 xextensions libxext" SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/${PN}/${PN}_${PV}.tar.gz \ file://auxdir.patch;patch=1;pnum=0" diff --git a/packages/maemo/xsp_1.0.0-8.bb b/packages/maemo/xsp_1.0.0-8.bb index 0c4a4c62f8..068193c6aa 100644 --- a/packages/maemo/xsp_1.0.0-8.bb +++ b/packages/maemo/xsp_1.0.0-8.bb @@ -3,7 +3,7 @@ LICENSE= "MIT" DESCRIPTION = "X Server Nokia 770 extensions library" SECTION = "x11/libs" PRIORITY = "optional" -DEPENDS = "x11 xextensions xext xpext" +DEPENDS = "libx11 xextensions libxext xpext" SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/xsp/${PN}_${PV}.tar.gz" S = "${WORKDIR}/Xsp" |