Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/30 19:13:10+02:00 uni-frankfurt.de!mickeyl
opie: use hires icons on spitz and akita

2005/03/30 19:11:27+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/03/30 19:11:08+02:00 uni-frankfurt.de!mickeyl
use appropriate qpe.conf for spitz and akita

BKrev: 424ae4cdCeuqdwZR6gKsPLtBPvrvdg

6 files changed, 53 insertions, 2 deletions

diff --git a/packages/opie-pics/opie-pics.inc b/packages/opie-pics/opie-pics.inc
index e69de29bb2..ceca75f943 100644
--- a/packages/opie-pics/opie-pics.inc
+++ b/packages/opie-pics/opie-pics.inc
@@ -0,0 +1,32 @@
+DESCRIPTION = "Common Opie pictures usable from all applications"
+SECTION = "opie/base"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+S = "${WORKDIR}"
+
+SHIP_INLINE_PICS = "yes"
+INLINE_PICS = "pics/inline"
+INLINE_PICS_tosa  = "pics-hires/inline"
+INLINE_PICS_c7x0  = "pics-hires/inline"
+INLINE_PICS_spitz = "pics-hires/inline"
+INLINE_PICS_akita = "pics-hires/inline"
+
+do_install() {
+	install -d ${D}${palmtopdir}/pics/addressbook/
+	install -d ${D}${palmtopdir}/pics/datebook/
+	install -d ${D}${palmtopdir}/pics/todo/
+	install -m 0664 pics/*.png ${D}${palmtopdir}/pics/
+	install -m 0664 pics/addressbook/*.png ${D}${palmtopdir}/pics/addressbook/
+	install -m 0664 pics/datebook/*.png ${D}${palmtopdir}/pics/datebook/
+	install -m 0664 pics/todo/*.png ${D}${palmtopdir}/pics/todo/	
+
+	if [ "${SHIP_INLINE_PICS}" == "yes" ]; then
+		install -m 0664 ${INLINE_PICS}/*.png ${D}${palmtopdir}/pics/
+	fi
+}
+
+FILES_${PN} = "${palmtopdir}"
+PACKAGE_ARCH = "${MACHINE}"
+
diff --git a/packages/opie-pics/opie-pics_1.2.0.bb b/packages/opie-pics/opie-pics_1.2.0.bb
index 58bee58e12..d1605d23c7 100644
--- a/packages/opie-pics/opie-pics_1.2.0.bb
+++ b/packages/opie-pics/opie-pics_1.2.0.bb
@@ -1,7 +1,7 @@
 include ${PN}.inc
     
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics-hires"
diff --git a/packages/opie-taskbar/opie-taskbar/akita/qpe.conf b/packages/opie-taskbar/opie-taskbar/akita/qpe.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-taskbar/opie-taskbar/akita/qpe.conf
diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf b/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf
index dae45c2bbe..fa0b406de7 100644
--- a/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf
+++ b/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf
@@ -4,7 +4,7 @@ SmallIconSize = 24
 BigIconSize = 48
 FontFamily = smoothsans
 FontStyle = Regular
-FontSize = 12
+FontSize = 14
 Background = #d5d0de
 Base = #ffffff
 Button = #e3e3e3
diff --git a/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf b/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf
diff --git a/packages/opie-taskbar/opie-taskbar_1.2.0.bb b/packages/opie-taskbar/opie-taskbar_1.2.0.bb
index e69de29bb2..760fc81a74 100644
--- a/packages/opie-taskbar/opie-taskbar_1.2.0.bb
+++ b/packages/opie-taskbar/opie-taskbar_1.2.0.bb
@@ -0,0 +1,19 @@
+include ${PN}.inc
+    
+ 
+PR = "r1"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/core/launcher \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/root \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/etc \
+	   file://nomax.patch;patch=1;pnum=3 \
+           file://server.pro \
+           file://opie-reorgfiles \
+           file://opie \
+           file://qpe.conf \
+	   file://locale.conf \
+	   file://opie_defaults"