opie-taskbar: Split machine (actutally, resolution) dependent files to another package.

5 files changed, 42 insertions, 16 deletions

diff --git a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
index fe71a6ab90..55a4c79e75 100644
--- a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
+++ b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
@@ -188,6 +188,7 @@ PREFERRED_VERSION_opie-systemtime = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-tableviewer = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-tabmanager = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-taskbar = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-taskbar-images = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-tetrix = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-textedit = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-theme = "${OPIE_VERSION}"
@@ -378,6 +379,7 @@ SRCDATE_opie-systemtime = "${OPIE_SRCDATE}"
 SRCDATE_opie-tableviewer = "${OPIE_SRCDATE}"
 SRCDATE_opie-tabmanager = "${OPIE_SRCDATE}"
 SRCDATE_opie-taskbar = "${OPIE_SRCDATE}"
+SRCDATE_opie-taskbar-images = "${OPIE_SRCDATE}"
 SRCDATE_opie-tetrix = "${OPIE_SRCDATE}"
 SRCDATE_opie-textedit = "${OPIE_SRCDATE}"
 SRCDATE_opie-theme = "${OPIE_SRCDATE}"
diff --git a/packages/opie-taskbar/opie-taskbar-images.inc b/packages/opie-taskbar/opie-taskbar-images.inc
new file mode 100644
index 0000000000..dafffe59f0
--- /dev/null
+++ b/packages/opie-taskbar/opie-taskbar-images.inc
@@ -0,0 +1,32 @@
+DESCRIPTION = "Opie Launcher and Taskbar"
+SECTION = "opie/base"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "opie-libqrsync opie-qss"
+APPNAME = "qpe"
+
+S = "${WORKDIR}/launcher"
+
+# Wallpaper and welcome splash
+PIXMAP_SIZE 		= ""
+PIXMAP_SIZE_c7x0 	= "-640x480"
+PIXMAP_SIZE_spitz	= "-640x480"
+PIXMAP_SIZE_akita	= "-640x480"
+PIXMAP_SIZE_tosa 	= "-480x640"
+PIXMAP_SIZE_simpad 	= "-800x600"
+PIXMAP_SIZE_asus730     = "-480x640"
+PIXMAP_SIZE_htcuniversal= "-480x640"
+PIXMAP_SIZE_hx4700      = "-480x640"
+
+#inherit opie
+
+do_install() {
+	install -d ${D}${palmtopdir}/pics/launcher
+
+	install -m 0644 ${WORKDIR}/pics/launcher/firstuse${PIXMAP_SIZE}.jpg ${D}${palmtopdir}/pics/launcher/firstuse.jpg
+	install -m 0644 ${WORKDIR}/pics/launcher/opie-background${PIXMAP_SIZE}.jpg ${D}${palmtopdir}/pics/launcher/opie-background.jpg
+}
+
+FILES_${PN} += " ${palmtopdir}/pics"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/opie-taskbar/opie-taskbar-images_cvs.bb b/packages/opie-taskbar/opie-taskbar-images_cvs.bb
new file mode 100644
index 0000000000..39a8862afc
--- /dev/null
+++ b/packages/opie-taskbar/opie-taskbar-images_cvs.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+PV = "${OPIE_CVS_PV}"
+PR = "r1.2"
+
+SRC_URI = "${HANDHELDS_CVS};module=opie/pics \
+          "
diff --git a/packages/opie-taskbar/opie-taskbar.inc b/packages/opie-taskbar/opie-taskbar.inc
index aea8ff3486..14f4ed0318 100644
--- a/packages/opie-taskbar/opie-taskbar.inc
+++ b/packages/opie-taskbar/opie-taskbar.inc
@@ -3,21 +3,11 @@ SECTION = "opie/base"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "opie-libqrsync opie-qss"
+RDEPENDS = "opie-taskbar-images"
 APPNAME = "qpe"
 
 S = "${WORKDIR}/launcher"
 
-# Wallpaper and welcome splash
-PIXMAP_SIZE 		= ""
-PIXMAP_SIZE_c7x0 	= "-640x480"
-PIXMAP_SIZE_spitz	= "-640x480"
-PIXMAP_SIZE_akita	= "-640x480"
-PIXMAP_SIZE_tosa 	= "-480x640"
-PIXMAP_SIZE_simpad 	= "-800x600"
-PIXMAP_SIZE_asus730     = "-480x640"
-PIXMAP_SIZE_htcuniversal= "-480x640"
-PIXMAP_SIZE_hx4700      = "-480x640"
-
 inherit opie
 
 do_configure_prepend() {
@@ -56,8 +46,6 @@ do_install() {
 	do
 		install -m 0644 ${WORKDIR}/pics/launcher/$p ${D}${palmtopdir}/pics/launcher/$p
 	done
-	install -m 0644 ${WORKDIR}/pics/launcher/firstuse${PIXMAP_SIZE}.jpg ${D}${palmtopdir}/pics/launcher/firstuse.jpg
-	install -m 0644 ${WORKDIR}/pics/launcher/opie-background${PIXMAP_SIZE}.jpg ${D}${palmtopdir}/pics/launcher/opie-background.jpg
 
 	install -m 0644 ${WORKDIR}/pics/logo/*.* ${D}${palmtopdir}/pics/logo/
 	install -m 0644 ${WORKDIR}/pics/RoH/star/*.png ${D}${palmtopdir}/pics/RoH/star/
@@ -70,5 +58,3 @@ do_install() {
 }
 
 FILES_opie-taskbar_append = " ${sysconfdir} ${palmtopdir}/apps ${palmtopdir}/pics"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index 7db76aa8dd..18e88bf570 100644
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 PV = "${OPIE_CVS_PV}"
-PR = "r10"
+PR = "r11"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \