[oe-commits] org.oe.dev opie-taskbar-images: Added Opie backgrounds for devices with 320x320 screen.

[slapin commit]

opie-taskbar-images: Added Opie backgrounds for devices with 320x320 screen.

Author: slapin at openembedded.org
Branch: org.openembedded.dev
Revision: 80e11d2d53016f865ea2a634c725c9e643e7606b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=80e11d2d53016f865ea2a634c725c9e643e7606b
Files:
1
packages/opie-taskbar/opie-taskbar-images
packages/opie-taskbar/opie-taskbar-images/firstuse-320x320.jpg
packages/opie-taskbar/opie-taskbar-images/opie-background-320x320.jpg
packages/opie-taskbar/opie-taskbar-images.inc
packages/opie-taskbar/opie-taskbar-images_1.2.3.bb
packages/opie-taskbar/opie-taskbar-images_cvs.bb
mtn:manual_merge
true
Diffs:

#
# mt diff -rb891b4c14d7d75882c7f71824e320c0e002fdf16 -r80e11d2d53016f865ea2a634c725c9e643e7606b
#
# 
# 
# add_dir "packages/opie-taskbar/opie-taskbar-images"
# 
# add_file "packages/opie-taskbar/opie-taskbar-images/firstuse-320x320.jpg"
#  content [fa0276a0e0b6dc68a281e947c7103eba9fa39c86]
# 
# add_file "packages/opie-taskbar/opie-taskbar-images/opie-background-320x320.jpg"
#  content [3e2fc630413d05944b90a0f31f514262c20e46f6]
# 
# patch "packages/opie-taskbar/opie-taskbar-images.inc"
#  from [af9f1520fa611e94512ba6574a480e95de8a16bd]
#    to [fa74199fe1a5102d17da7ed6417c493736dc2272]
# 
# patch "packages/opie-taskbar/opie-taskbar-images_1.2.3.bb"
#  from [bc274c765ec5981754215fbdaa6f4bb4ace500e8]
#    to [d8972ce32ccf3ccd77f9e7cf60410b292cb04f45]
# 
# patch "packages/opie-taskbar/opie-taskbar-images_cvs.bb"
#  from [1bba5e8ec05293d5c7cc7bb8b1381f603bec4e86]
#    to [6e2e43b9defd2572266fc75bac6aad2cb5a06999]
# 
#   set "packages/opie-taskbar/opie-taskbar-images/firstuse-320x320.jpg"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/opie-taskbar/opie-taskbar-images/opie-background-320x320.jpg"
#  attr "mtn:manual_merge"
# value "true"
# 
============================================================
# packages/opie-taskbar/opie-taskbar-images/firstuse-320x320.jpg is binary
============================================================
# packages/opie-taskbar/opie-taskbar-images/opie-background-320x320.jpg is binary
============================================================
--- packages/opie-taskbar/opie-taskbar-images.inc	af9f1520fa611e94512ba6574a480e95de8a16bd
+++ packages/opie-taskbar/opie-taskbar-images.inc	fa74199fe1a5102d17da7ed6417c493736dc2272
@@ -18,18 +18,20 @@ PIXMAP_SIZE_hx4700      = "-480x640"
 PIXMAP_SIZE_htcuniversal= "-480x640"
 PIXMAP_SIZE_hx4700      = "-480x640"
 
-PACKAGES = "${PN}-480x640 ${PN}-640x480 ${PN}-800x600 ${PN}-600x800 ${PN}-320x240 ${PN}-240x320"
+PACKAGES = "${PN}-480x640 ${PN}-640x480 ${PN}-800x600 ${PN}-600x800 ${PN}-320x240 ${PN}-240x320 ${PN}-320x320"
 
 do_install() {
 	install -d ${D}${palmtopdir}/pics/launcher
-
+	
+	install -m 0644 ${FILESDIR}/firstuse-320x320.jpg ${D}${palmtopdir}/pics/launcher/firstuse-320x320.jpg
+	install -m 0644 ${FILESDIR}/opie-background-320x320.jpg ${D}${palmtopdir}/pics/launcher/opie-background-320x320.jpg
 	install -m 0644 ${WORKDIR}/pics/launcher/firstuse.jpg ${D}${palmtopdir}/pics/launcher/firstuse-240x320.jpg
 	install -m 0644 ${WORKDIR}/pics/launcher/opie-background.jpg ${D}${palmtopdir}/pics/launcher/opie-background-240x320.jpg
 	# TODO: those should be correct images for the resolution:
 	install -m 0644 ${WORKDIR}/pics/launcher/firstuse.jpg ${D}${palmtopdir}/pics/launcher/firstuse-320x240.jpg
 	install -m 0644 ${WORKDIR}/pics/launcher/opie-background.jpg ${D}${palmtopdir}/pics/launcher/opie-background-320x240.jpg
 
-        for res in 480x640 640x480 800x600 ; do
+        for res in 480x640 640x480 800x600; do
          install -m 0644 ${WORKDIR}/pics/launcher/firstuse-${res}.jpg ${D}${palmtopdir}/pics/launcher/firstuse-${res}.jpg
          install -m 0644 ${WORKDIR}/pics/launcher/opie-background-${res}.jpg ${D}${palmtopdir}/pics/launcher/opie-background-${res}.jpg
         done
@@ -39,7 +41,7 @@ python do_package_prepend () {
 }
 
 python do_package_prepend () {
-        reslist = ['240x320','320x240', '480x640','640x480', '800x600','600x800']
+        reslist = ['240x320','320x240', '320x320', '480x640','640x480', '800x600','600x800']
         dir = bb.data.expand('${palmtopdir}/pics/launcher/', d)
         ft = bb.data.expand('${palmtopdir}/pics/*/*-%s.*', d)
         pn = bb.data.getVar('PN', d, 1)
============================================================
--- packages/opie-taskbar/opie-taskbar-images_1.2.3.bb	bc274c765ec5981754215fbdaa6f4bb4ace500e8
+++ packages/opie-taskbar/opie-taskbar-images_1.2.3.bb	d8972ce32ccf3ccd77f9e7cf60410b292cb04f45
@@ -1,5 +1,5 @@ require ${PN}.inc
 require ${PN}.inc
-PR = "r0"
+PR = "r1"
 
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
 
============================================================
--- packages/opie-taskbar/opie-taskbar-images_cvs.bb	1bba5e8ec05293d5c7cc7bb8b1381f603bec4e86
+++ packages/opie-taskbar/opie-taskbar-images_cvs.bb	6e2e43b9defd2572266fc75bac6aad2cb5a06999
@@ -1,5 +1,5 @@ PV = "${OPIE_CVS_PV}"
 require ${PN}.inc
 PV = "${OPIE_CVS_PV}"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/pics"