summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-03-05 16:22:01 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-03-05 16:22:01 +0000
commit8e9b731907f73dd0488ebdc1ef9a89d0ce62c3cd (patch)
treeb4ebed6dc8d46792d704ad5b7a71647a1d731cfd
parent3686bc485ab3c4ba9e5528b3b9a2cc668cf4332a (diff)
parent8a2b8144cefd14569c2c1bfd8c84cfac593e41c1 (diff)
merge of 2d917a9725f84078c390a35764f260c9abbef0f6
and 4a411456169f13d81227a8f0f0087490f6b68814
-rw-r--r--conf/distro/slugos-packages.conf5
-rw-r--r--packages/meta/task-qpe.bb7
-rw-r--r--packages/zshopi/zshopi_0.2.bb2
3 files changed, 5 insertions, 9 deletions
diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf
index dec59f9f68..d4c10c8a88 100644
--- a/conf/distro/slugos-packages.conf
+++ b/conf/distro/slugos-packages.conf
@@ -233,13 +233,10 @@ ${PKGDIR}/packages/wget/*.bb \
${PKGDIR}/packages/wireless-tools/*.bb \
${PKGDIR}/packages/wpa-supplicant/*.bb \
${PKGDIR}/packages/wview/*.bb \
-${PKGDIR}/packages/x11/*.bb \
-${PKGDIR}/packages/xau/*.bb \
-${PKGDIR}/packages/xdmcp/*.bb \
+${PKGDIR}/packages/xlibs/*.bb \
${PKGDIR}/packages/xextensions/*.bb \
${PKGDIR}/packages/xinetd/*.bb \
${PKGDIR}/packages/xproto/*.bb \
-${PKGDIR}/packages/xtrans/*.bb \
${PKGDIR}/packages/zd1211/*.bb \
${PKGDIR}/packages/zip/*.bb \
${PKGDIR}/packages/zlib/*.bb \
diff --git a/packages/meta/task-qpe.bb b/packages/meta/task-qpe.bb
index 8e5b9c2d6c..d76c2d6366 100644
--- a/packages/meta/task-qpe.bb
+++ b/packages/meta/task-qpe.bb
@@ -122,8 +122,8 @@ RDEPENDS_task-kdepim = "\
RDEPENDS_task-qpe-emulators = "scummvm"
RDEPENDS_task-qpe-fonts = "\
- qpf-bitstream-vera \
- qpf-bitstream-vera-sans-mono \
+ qpf-bitstream-vera-large \
+ qpf-bitstream-vera-sans-mono-huge \
qpf-dejavusans \
qpf-dejavusanscondensed \
qpf-dejavusansmono \
@@ -131,8 +131,7 @@ RDEPENDS_task-qpe-fonts = "\
qpf-dejavuserifcondensed \
qpf-freemono \
qpf-freeserif \
- qpf-gentium \
- qpf-gentiumalt \
+ ttf-gentium \
qpf-hunkysans \
qpf-hunkyserif \
qpf-qte \
diff --git a/packages/zshopi/zshopi_0.2.bb b/packages/zshopi/zshopi_0.2.bb
index cf650d91d9..b393122113 100644
--- a/packages/zshopi/zshopi_0.2.bb
+++ b/packages/zshopi/zshopi_0.2.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Shopping manager"
SECTION = "opie/applications"
-DEPENDS = "sqlite"
+DEPENDS = "sqlite opie-lrelease-native"
PRIORITY = "optional"
LICENSE = "GPL"
MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"