[oe-commits] org.oe.dev merge of '5c57f792fa4408bfd1d31632734168b1434d7100'

[jeremy_laine commit]

merge of '5c57f792fa4408bfd1d31632734168b1434d7100'
     and 'de01edf0c06eb0cc6e3c6b19195f32bc67519b19'

Author: jeremy_laine at openembedded.org
Branch: org.openembedded.dev
Revision: ed644d93511a8c52d17ad248a1866e866038da60
ViewMTN: http://monotone.openembedded.org/revision/info/ed644d93511a8c52d17ad248a1866e866038da60
Files:
1
packages/efl1/imlib2
packages/efl1/imlib2/remove-local-includes.patch
packages/atmelwlandriver
packages/nonworking/atmelwlandriver
packages/centericq
packages/nonworking/centericq
packages/uicmoc/uicmoc4-native.inc
Diffs:

#
# mt diff -r5c57f792fa4408bfd1d31632734168b1434d7100 -red644d93511a8c52d17ad248a1866e866038da60
#
#
#
# delete "packages/efl1/imlib2"
# 
# delete "packages/efl1/imlib2/remove-local-includes.patch"
# 
# rename "packages/atmelwlandriver"
#     to "packages/nonworking/atmelwlandriver"
# 
# rename "packages/centericq"
#     to "packages/nonworking/centericq"
#


#
# mt diff -rde01edf0c06eb0cc6e3c6b19195f32bc67519b19 -red644d93511a8c52d17ad248a1866e866038da60
#
#
#
# patch "packages/uicmoc/uicmoc4-native.inc"
#  from [43b29564d0db12acbaa8e5e0a2ea0bc58d39a58d]
#    to [4c402959a827e4fca268fdf66ffb1970c81dfd02]
#
============================================================
--- packages/uicmoc/uicmoc4-native.inc	43b29564d0db12acbaa8e5e0a2ea0bc58d39a58d
+++ packages/uicmoc/uicmoc4-native.inc	4c402959a827e4fca268fdf66ffb1970c81dfd02
@@ -46,6 +46,7 @@ TOBUILD = "\
   src/gui \
   src/tools/uic3 \
   tools/linguist/lrelease \
+  tools/linguist/lupdate \
 "
 
 do_compile() {
@@ -62,6 +63,7 @@ do_stage() {
     install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34
     install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4
     install -m 0755 bin/lrelease ${STAGING_BINDIR}/lrelease4
+    install -m 0755 bin/lupdate ${STAGING_BINDIR}/lupdate4
     install -d ${STAGING_DIR_NATIVE}/qt4/
     install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR_NATIVE}/qt4/
 }