[oe-commits] org.oe.dev xoo: merge in gta01 skin from openmoko svn

koen commit openembedded-commits at lists.openembedded.org
Thu Feb 15 10:02:55 UTC 2007


xoo: merge in gta01 skin from openmoko svn

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 27361f2a0b1eebdce6a9d0830236764c47824c0d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=27361f2a0b1eebdce6a9d0830236764c47824c0d
Files:
1
packages/xoo/files
packages/xoo/files/gta01.png
packages/xoo/files/gta01.xml
packages/xoo/xoo_svn.bb
mtn:manual_merge
true
Diffs:

#
# mt diff -re2d1eaa10100af4090d1cfaddc57a07031c5fd0a -r27361f2a0b1eebdce6a9d0830236764c47824c0d
#
# 
# 
# add_dir "packages/xoo/files"
# 
# add_file "packages/xoo/files/gta01.png"
#  content [a7b7a04ee91e49b640ad8046a3892269775977a8]
# 
# add_file "packages/xoo/files/gta01.xml"
#  content [55a510a3812685cac3bd47034c02c11c1d3f2e51]
# 
# patch "packages/xoo/xoo_svn.bb"
#  from [f3aa6afe428039968a340e60261a7120c6f7fc17]
#    to [6bf0f87d01b48ae41e72e43d16dbeb8fc859454c]
# 
#   set "packages/xoo/files/gta01.png"
#  attr "mtn:manual_merge"
# value "true"
# 
============================================================
# packages/xoo/files/gta01.png is binary
============================================================
--- packages/xoo/files/gta01.xml	55a510a3812685cac3bd47034c02c11c1d3f2e51
+++ packages/xoo/files/gta01.xml	55a510a3812685cac3bd47034c02c11c1d3f2e51
@@ -0,0 +1,7 @@
+<skin>
+  <device
+    img="gta01.png"
+    width="680" height="689"
+    display_width="480" display_height="640" display_depth="16"
+    display_x="98" display_y="22" />
+</skin>
============================================================
--- packages/xoo/xoo_svn.bb	f3aa6afe428039968a340e60261a7120c6f7fc17
+++ packages/xoo/xoo_svn.bb	6bf0f87d01b48ae41e72e43d16dbeb8fc859454c
@@ -7,7 +7,16 @@ PR = "r1"
 PV = "0.7+svn${SRCDATE}"
 PR = "r1"
 
-SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=Xoo;proto=http"
+SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=Xoo;proto=http \
+           file://*.png \
+           file://*.xml"
 S = "${WORKDIR}/Xoo"
 
 inherit autotools
+
+do_install_append() {
+	for i in ${WORKDIR}/*.png ${WORKDIR}/*.xml; do
+		install -m 0644 $i ${D}${datadir}/${PN}/
+	done
+}
+






More information about the Openembedded-commits mailing list