[oe-commits] org.oe.dev slcalc: add icon with correct pi value (close oebug 4168) courtesy of Jeffery MacEachern

[xjqian commit]

slcalc: add icon with correct pi value (close oebug 4168) courtesy of Jeffery MacEachern

Author: xjqian at openembedded.org
Branch: org.openembedded.dev
Revision: fce17938e34fd9e691164d66a415058a9a934187
ViewMTN: http://monotone.openembedded.org/revision/info/fce17938e34fd9e691164d66a415058a9a934187
Files:
1
packages/slcalc/files
packages/slcalc/files/slcalc.png
packages/slcalc/files/slcalc2.png
packages/slcalc/slcalc_1.2.1.bb
mtn:manual_merge
true
Diffs:

#
# mt diff -rcc8daafda388ec1e484dc2e68e1599944893bc76 -rfce17938e34fd9e691164d66a415058a9a934187
#
#
#
# add_dir "packages/slcalc/files"
# 
# add_file "packages/slcalc/files/slcalc.png"
#  content [aaf9140271fc816bb3414ba68c16cf1930096ce3]
# 
# add_file "packages/slcalc/files/slcalc2.png"
#  content [808e869b4babbd39dbac87aaa3073d4558a3e68f]
# 
# patch "packages/slcalc/slcalc_1.2.1.bb"
#  from [a842821dff7bb097fffed6b8cb5091c0dad1ec71]
#    to [86b9baeb4be2153b6290369fc4312ff67f12e964]
# 
#   set "packages/slcalc/files/slcalc.png"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/slcalc/files/slcalc2.png"
#  attr "mtn:manual_merge"
# value "true"
#
============================================================
# packages/slcalc/files/slcalc.png is binary
============================================================
# packages/slcalc/files/slcalc2.png is binary
============================================================
--- packages/slcalc/slcalc_1.2.1.bb	a842821dff7bb097fffed6b8cb5091c0dad1ec71
+++ packages/slcalc/slcalc_1.2.1.bb	86b9baeb4be2153b6290369fc4312ff67f12e964
@@ -2,12 +2,13 @@ LICENSE = "GPL"
 HOMEPAGE = "http://homepage3.nifty.com/cam/slcalc.htm"
 SECTION = "opie/applications"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 APPTYPE = "binary"
 APPDESKTOP = "${S}"
 
-SRC_URI = "http://homepage3.nifty.com/cam/slcalc_1.2.1_arm.tar.gz"
+SRC_URI = "http://homepage3.nifty.com/cam/slcalc_1.2.1_arm.tar.gz \
+           file://slcalc2.png"
 
 inherit opie
 
@@ -15,5 +16,5 @@ do_install() {
 
 do_install() {
 	install -d ${D}${palmtopdir}/pics
-	install -m 0644 slcalc2.png ${D}${palmtopdir}/pics/slcalc.png
+	install -m 0644 ${WORKDIR}/slcalc2.png ${D}${palmtopdir}/pics/slcalc.png
 }