From 3b028424ec8cbda88fa189ddc7452dc5264789e9 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
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/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 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'packages/opie-taskbar')

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 \
-- 
cgit v1.2.3