From 3b028424ec8cbda88fa189ddc7452dc5264789e9 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 28 Jun 2005 18:37:07 +0000 Subject: 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 --- packages/meta/opie-collections.inc | 31 +++------------------- packages/meta/opie-image.bb | 2 +- packages/opie-taskbar/opie-taskbar/akita/qpe.conf | 4 +-- packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf | 4 +-- packages/opie-taskbar/opie-taskbar/qpe.conf | 4 +-- packages/opie-taskbar/opie-taskbar/simpad/qpe.conf | 4 +-- packages/opie-taskbar/opie-taskbar/spitz/qpe.conf | 4 +-- packages/opie-taskbar/opie-taskbar/tosa/qpe.conf | 4 +-- packages/opie-taskbar/opie-taskbar_cvs.bb | 2 +- packages/opie-ttf-support/files/fontdir | 0 .../opie-ttf-support/opie-ttf-support_1.0.0.bb | 0 packages/python/python-2.4.1-manifest.inc | 8 +++--- packages/python/python-pyxml_0.8.3.bb | 13 --------- packages/python/python-pyxml_0.8.4.bb | 0 packages/python/python_2.4.1.bb | 2 +- 15 files changed, 23 insertions(+), 59 deletions(-) create mode 100644 packages/opie-ttf-support/files/fontdir create mode 100644 packages/opie-ttf-support/opie-ttf-support_1.0.0.bb delete mode 100644 packages/python/python-pyxml_0.8.3.bb create mode 100644 packages/python/python-pyxml_0.8.4.bb (limited to 'packages') 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 @@ -2,37 +2,14 @@ # A collection of dependencies for images including Opie or parts of it. # -# -# 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 diff --git a/packages/opie-taskbar/opie-taskbar/akita/qpe.conf b/packages/opie-taskbar/opie-taskbar/akita/qpe.conf index a951c680b5..9d93ed5297 100644 --- a/packages/opie-taskbar/opie-taskbar/akita/qpe.conf +++ b/packages/opie-taskbar/opie-taskbar/akita/qpe.conf @@ -2,10 +2,10 @@ useBigPixmaps = 1 SmallIconSize = 32 BigIconSize = 48 -FontFamily = smoothsans +FontFamily = DejaVuSans FontStyle = Regular FontSize = 14 -FixedFontFamily = smoothmono +FixedFontFamily = DejaVuMono FixedFontStyle = Regular FixedFontSize = 14 Background = #d5d0de diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf b/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf index a951c680b5..9d93ed5297 100644 --- a/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf +++ b/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf @@ -2,10 +2,10 @@ useBigPixmaps = 1 SmallIconSize = 32 BigIconSize = 48 -FontFamily = smoothsans +FontFamily = DejaVuSans FontStyle = Regular FontSize = 14 -FixedFontFamily = smoothmono +FixedFontFamily = DejaVuMono FixedFontStyle = Regular FixedFontSize = 14 Background = #d5d0de diff --git a/packages/opie-taskbar/opie-taskbar/qpe.conf b/packages/opie-taskbar/opie-taskbar/qpe.conf index 947f36a471..2388302613 100644 --- a/packages/opie-taskbar/opie-taskbar/qpe.conf +++ b/packages/opie-taskbar/opie-taskbar/qpe.conf @@ -1,8 +1,8 @@ [Appearance] -FontFamily = smoothsans +FontFamily = DejaVuSans FontStyle = Regular FontSize = 9 -FixedFontFamily = smoothmono +FixedFontFamily = DejaVuMono FixedFontStyle = Regular FixedFontSize = 9 Background = #d5d0de diff --git a/packages/opie-taskbar/opie-taskbar/simpad/qpe.conf b/packages/opie-taskbar/opie-taskbar/simpad/qpe.conf index ec982c02d2..6a060acbbd 100644 --- a/packages/opie-taskbar/opie-taskbar/simpad/qpe.conf +++ b/packages/opie-taskbar/opie-taskbar/simpad/qpe.conf @@ -1,8 +1,8 @@ [Appearance] -FontFamily = smoothsans +FontFamily = DejaVuSans FontStyle = Regular FontSize = 12 -FixedFontFamily = smoothmono +FixedFontFamily = DejaVuMono FixedFontStyle = Regular FixedFontSize = 12 Background = #d5d0de diff --git a/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf b/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf index a951c680b5..9d93ed5297 100644 --- a/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf +++ b/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf @@ -2,10 +2,10 @@ useBigPixmaps = 1 SmallIconSize = 32 BigIconSize = 48 -FontFamily = smoothsans +FontFamily = DejaVuSans FontStyle = Regular FontSize = 14 -FixedFontFamily = smoothmono +FixedFontFamily = DejaVuMono FixedFontStyle = Regular FixedFontSize = 14 Background = #d5d0de diff --git a/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf b/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf index a951c680b5..9d93ed5297 100644 --- a/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf +++ b/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf @@ -2,10 +2,10 @@ useBigPixmaps = 1 SmallIconSize = 32 BigIconSize = 48 -FontFamily = smoothsans +FontFamily = DejaVuSans FontStyle = Regular FontSize = 14 -FixedFontFamily = smoothmono +FixedFontFamily = DejaVuMono FixedFontStyle = Regular FixedFontSize = 14 Background = #d5d0de diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index 39004fe8ed..06f51414e6 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,7 +1,7 @@ include ${PN}.inc PV = "1.2.0+cvs-${CVSDATE}" -PR = "r2" +PR = "r3" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ diff --git a/packages/opie-ttf-support/files/fontdir b/packages/opie-ttf-support/files/fontdir new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/opie-ttf-support/opie-ttf-support_1.0.0.bb b/packages/opie-ttf-support/opie-ttf-support_1.0.0.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/python/python-2.4.1-manifest.inc b/packages/python/python-2.4.1-manifest.inc index 77aea0052b..df5bd07dca 100644 --- a/packages/python/python-2.4.1-manifest.inc +++ b/packages/python/python-2.4.1-manifest.inc @@ -1,5 +1,5 @@ ######################################################################################################################## -### AUTO-GENERATED by '/usr/users4/abvs/mickey/work/sdk/buildroot-oz/packages/python/generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer ] on Fri Jun 3 11:49:16 2005 +### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer ] on Mon Jun 27 22:39:53 2005 ### ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy ### @@ -36,9 +36,9 @@ RDEPENDS_python-pickle="python-core python-codecs python-re" FILES_python-pickle="${libdir}/python2.4/pickle.* ${libdir}/python2.4/shelve.* ${libdir}/python2.4/lib-dynload/cPickle.so " DESCRIPTION_python-datetime="Python Calendar and Time support" -PR_python-datetime="ml3" -RDEPENDS_python-datetime="python-core" -FILES_python-datetime="${libdir}/python2.4/calendar.* ${libdir}/python2.4/lib-dynload/datetime.so " +PR_python-datetime="ml4" +RDEPENDS_python-datetime="python-core python-locale" +FILES_python-datetime="${libdir}/python2.4/_strptime.* ${libdir}/python2.4/calendar.* ${libdir}/python2.4/lib-dynload/datetime.so " DESCRIPTION_python-core="Python Interpreter and core modules (needed!)" PR_python-core="ml3" diff --git a/packages/python/python-pyxml_0.8.3.bb b/packages/python/python-pyxml_0.8.3.bb deleted file mode 100644 index d393226790..0000000000 --- a/packages/python/python-pyxml_0.8.3.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "A sophisticated XML Processing Package for Python" -SECTION = "devel/python" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer " -LICENSE = "PSF" -RDEPENDS = "python-core python-xml python-netclient" -SRCNAME = "pyxml" - -SRC_URI = "${SOURCEFORGE_MIRROR}/pyxml/PyXML-${PV}.tar.gz" -S = "${WORKDIR}/PyXML-${PV}" - -inherit distutils - diff --git a/packages/python/python-pyxml_0.8.4.bb b/packages/python/python-pyxml_0.8.4.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/python/python_2.4.1.bb b/packages/python/python_2.4.1.bb index 0777df8631..89b0d64e2f 100644 --- a/packages/python/python_2.4.1.bb +++ b/packages/python/python_2.4.1.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " PROVIDES = "python python-core" DEPENDS = "python-native zlib gdbm openssl" -PR = "ml3" +PR = "ml4" PYTHON_MAJMIN = "2.4" -- cgit v1.2.3