7 files changed, 13 insertions, 13 deletions
diff --git a/packages/opie-taskbar/opie-taskbar/akita/qpe.conf b/packages/opie-taskbar/opie-taskbar/akita/qpe.conf
index 9d93ed5297..75b4453cfd 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 = DejaVuSans
+FontFamily = DejaVu_Sans
 FontStyle = Regular
 FontSize = 14
-FixedFontFamily = DejaVuMono
+FixedFontFamily = DejaVu_Sans_Mono
 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 9d93ed5297..75b4453cfd 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 = DejaVuSans
+FontFamily = DejaVu_Sans
 FontStyle = Regular
 FontSize = 14
-FixedFontFamily = DejaVuMono
+FixedFontFamily = DejaVu_Sans_Mono
 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 2388302613..59bb20c762 100644
--- a/packages/opie-taskbar/opie-taskbar/qpe.conf
+++ b/packages/opie-taskbar/opie-taskbar/qpe.conf
@@ -1,8 +1,8 @@
 [Appearance]
-FontFamily = DejaVuSans
+FontFamily = DejaVu_Sans
 FontStyle = Regular
 FontSize = 9
-FixedFontFamily = DejaVuMono
+FixedFontFamily = DejaVu_Sans_Mono
 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 6a060acbbd..b10d90b94e 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 = DejaVuSans
+FontFamily = DejaVu_Sans
 FontStyle = Regular
 FontSize = 12
-FixedFontFamily = DejaVuMono
+FixedFontFamily = DejaVu_Sans_Mono
 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 9d93ed5297..75b4453cfd 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 = DejaVuSans
+FontFamily = DejaVu_Sans
 FontStyle = Regular
 FontSize = 14
-FixedFontFamily = DejaVuMono
+FixedFontFamily = DejaVu_Sans_Mono
 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 9d93ed5297..75b4453cfd 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 = DejaVuSans
+FontFamily = DejaVu_Sans
 FontStyle = Regular
 FontSize = 14
-FixedFontFamily = DejaVuMono
+FixedFontFamily = DejaVu_Sans_Mono
 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 06f51414e6..80a705a08a 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 = "r3"
+PR = "r4"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \