diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2005-06-28 18:37:07 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2005-06-28 18:37:07 +0000 |
| commit | 3b028424ec8cbda88fa189ddc7452dc5264789e9 (patch) | |
| tree | c9f41e92a4fb0e8fe1e0d585516b2a80b6b28e18 /packages/meta | |
| parent | 2040c98cc6acccbfdda8cfe7f24dd37a55447a3b (diff) | |
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/06/28 20:35:58+02:00 uni-frankfurt.de!mickeyl
opie-taskbar: adjust qpe.conf also for collie
2005/06/28 20:35:18+02:00 uni-frankfurt.de!mickeyl
opie-taskbar/qpe.conf: Bye bye QPF, hello TTF
2005/06/28 20:29:36+02:00 uni-frankfurt.de!mickeyl
add opie-ttf-support metapackage containing a fontdir. to do it the 'right way', we need a script that updates qtfontdir for TTF
2005/06/27 22:44:57+02:00 uni-frankfurt.de!mickeyl
upgrade python-pyxml to 0.8.4
2005/06/27 22:42:13+02:00 uni-frankfurt.de!mickeyl
add _strptime to python-datetime and adjust dependencies
BKrev: 42c198d3zJDZy5ODvnE9MJVZNePSsA
Diffstat (limited to 'packages/meta')
| -rw-r--r-- | packages/meta/opie-collections.inc | 31 | ||||
| -rw-r--r-- | packages/meta/opie-image.bb | 2 |
2 files changed, 5 insertions, 28 deletions
diff --git a/packages/meta/opie-collections.inc b/packages/meta/opie-collections.inc index d42716f870..a2b2e79bdb 100644 --- a/packages/meta/opie-collections.inc +++ b/packages/meta/opie-collections.inc @@ -3,37 +3,14 @@ # # -# Fonts for 240x320 displays -# - -OPIE_FONTS_SMALL = "qte-font-smoothsans-90 qte-font-smoothsans-100 qte-font-smoothsans-110 \ - qte-font-smoothmono-90 qte-font-smoothmono-100 qte-font-smoothmono-110 \ - qte-font-fixed-70 qte-font-fixed-120 qpf-font-common " - -# -# Fonts for >= 640x480 displays -# - -OPIE_FONTS_LARGE = "qte-font-smoothsans-120 qte-font-smoothsans-140 qte-font-smoothsans-180 \ - qte-font-smoothmono-120 qte-font-smoothmono-140 qte-font-smoothmono-180 " - -# # Dependencies to get the launcher up and running # -OPIE_LIBS_DEPENDS = "qte libopie2 qpf-qte qpf-font-common" -OPIE_LIBS_RDEPENDS = "${OPIE_FONTS_SMALL}" +OPIE_LIBS_DEPENDS = "qte libopie2 opie-ttf-support ttf-dejavu" +OPIE_LIBS_RDEPENDS = "opie-ttf-support ttf-dejavu-sans ttf-dejavu-sans-mono" OPIE_BASE = "opie-qcop opie-qss opie-quicklauncher opie-taskbar opie-pics opie-sounds" # -# High res displays need some additional larger fonts -# -OPIE_LIBS_RDEPENDS_append_c7x0 = " ${OPIE_FONTS_LARGE}" -OPIE_LIBS_RDEPENDS_append_tosa = " ${OPIE_FONTS_LARGE}" -OPIE_LIBS_RDEPENDS_append_spitz = " ${OPIE_FONTS_LARGE}" -OPIE_LIBS_RDEPENDS_append_akita = " ${OPIE_FONTS_LARGE}" - -# # Things for reasonable bootstrap image # @@ -49,7 +26,7 @@ OPIE_BASE_APPS = "opie-packagemanager opie-keytabs opie-console opie-clock \ OPIE_BASE_SETTINGS = "opie-light-and-power opie-appearance opie-systemtime \ opie-sysinfo opie-networksettings opie-button-settings \ - opie-icon-reload" + opie-icon-reload" OPIE_BASE_DECOS = "opie-deco-flat opie-deco-liquid opie-deco-polished" @@ -68,7 +45,7 @@ OPIE_BASE_DEPENDS_append_c7x0 = " opie-autorotateapplet" OPIE_BASE_DEPENDS_append_spitz = " opie-autorotateapplet" OPIE_BASE_DEPENDS_append_akita = " opie-autorotateapplet" -# Zaurus models can benefit from the VT and logout applets +# Keyboard models can benefit from the VT and logout applets OPIE_BASE_APPLETS_append_openzaurus = " opie-vtapplet opie-logoutapplet" OPIE_BASE_APPLETS_append_mnci = " opie-vtapplet opie-logoutapplet" diff --git a/packages/meta/opie-image.bb b/packages/meta/opie-image.bb index 517cd0dc34..63532c62b7 100644 --- a/packages/meta/opie-image.bb +++ b/packages/meta/opie-image.bb @@ -6,7 +6,7 @@ FEED_URIS_append_opensimpad = " opie##http://openzaurus.org/official/unstable/${ FEED_URIS_append_familiar = " opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie" LICENSE = "MIT" -PR = "r13" +PR = "r14" include opie-collections.inc |