[oe-commits] org.oe.dev opie-taskbar: Split machine (actutally, resolution) dependent files to another package.

[pfalcon commit]

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

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: f1870c83356a4eea4d43d3780ca066baa5ea8783
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f1870c83356a4eea4d43d3780ca066baa5ea8783
Files:
1
packages/opie-taskbar/opie-taskbar-images.inc
packages/opie-taskbar/opie-taskbar-images_cvs.bb
conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
packages/opie-taskbar/opie-taskbar.inc
packages/opie-taskbar/opie-taskbar_cvs.bb
Diffs:

#
# mt diff -r7314baf01ff720449ddb034e256e260501df588f -rf1870c83356a4eea4d43d3780ca066baa5ea8783
#
# 
# 
# add_file "packages/opie-taskbar/opie-taskbar-images.inc"
#  content [0005e76a7ac32919b48318914c0ffca324c71478]
# 
# add_file "packages/opie-taskbar/opie-taskbar-images_cvs.bb"
#  content [6ba1a2db7f1451e7e0d5e60558ed8f38ec09f3e0]
# 
# patch "conf/distro/include/preferred-opie-versions-1.2.3-pre.inc"
#  from [5045ef2e767e1eb852ad651743f8406528e34237]
#    to [07a52b1c21aa01167bd3a2e275bec12dab2a4797]
# 
# patch "packages/opie-taskbar/opie-taskbar.inc"
#  from [612634b0a0376dfe1e4b563804c51987a32320b0]
#    to [836d4288e39a80b3570d2a05a20653bed000f171]
# 
# patch "packages/opie-taskbar/opie-taskbar_cvs.bb"
#  from [0081cd5790b5ddf838977339678872f2b347b50c]
#    to [7fad8a57f20c48cec8e46749218aabcb5be3b54a]
# 
============================================================
--- packages/opie-taskbar/opie-taskbar-images.inc	0005e76a7ac32919b48318914c0ffca324c71478
+++ packages/opie-taskbar/opie-taskbar-images.inc	0005e76a7ac32919b48318914c0ffca324c71478
@@ -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}"
============================================================
--- packages/opie-taskbar/opie-taskbar-images_cvs.bb	6ba1a2db7f1451e7e0d5e60558ed8f38ec09f3e0
+++ packages/opie-taskbar/opie-taskbar-images_cvs.bb	6ba1a2db7f1451e7e0d5e60558ed8f38ec09f3e0
@@ -0,0 +1,6 @@
+require ${PN}.inc
+PV = "${OPIE_CVS_PV}"
+PR = "r1.2"
+
+SRC_URI = "${HANDHELDS_CVS};module=opie/pics \
+          "
============================================================
--- conf/distro/include/preferred-opie-versions-1.2.3-pre.inc	5045ef2e767e1eb852ad651743f8406528e34237
+++ conf/distro/include/preferred-opie-versions-1.2.3-pre.inc	07a52b1c21aa01167bd3a2e275bec12dab2a4797
@@ -188,6 +188,7 @@ PREFERRED_VERSION_opie-taskbar = "${OPIE
 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-taskbar = "${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}"
============================================================
--- packages/opie-taskbar/opie-taskbar.inc	612634b0a0376dfe1e4b563804c51987a32320b0
+++ packages/opie-taskbar/opie-taskbar.inc	836d4288e39a80b3570d2a05a20653bed000f171
@@ -1,23 +1,13 @@ DEPENDS = "opie-libqrsync opie-qss"
 DESCRIPTION = "Opie Launcher and Taskbar"
 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 @@ FILES_opie-taskbar_append = " ${sysconfd
 }
 
 FILES_opie-taskbar_append = " ${sysconfdir} ${palmtopdir}/apps ${palmtopdir}/pics"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
============================================================
--- packages/opie-taskbar/opie-taskbar_cvs.bb	0081cd5790b5ddf838977339678872f2b347b50c
+++ packages/opie-taskbar/opie-taskbar_cvs.bb	7fad8a57f20c48cec8e46749218aabcb5be3b54a
@@ -1,6 +1,6 @@ PV = "${OPIE_CVS_PV}"
 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 \