[oe-commits] org.oe.dev illume: sync to org.openmoko.asu.dev

[jluebbe commit]

illume: sync to org.openmoko.asu.dev

Author: jluebbe at openembedded.org
Branch: org.openembedded.dev
Revision: ea746cf25d23e0cf0ac8e3f8fd120a3d2b3cb7af
ViewMTN: http://monotone.openembedded.org/revision/info/ea746cf25d23e0cf0ac8e3f8fd120a3d2b3cb7af
Files:
1
packages/openmoko-projects/illume/keyboard.patch
conf/distro/include/sane-srcrevs.inc
packages/openmoko-projects/illume-theme_svn.bb
packages/openmoko-projects/illume_svn.bb
Diffs:

#
# mt diff -rab67136770cfd4c66edd2982006f5c09325ec6d2 -rea746cf25d23e0cf0ac8e3f8fd120a3d2b3cb7af
#
#
#
# delete "packages/openmoko-projects/illume/keyboard.patch"
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [d8f2f4e91dcd8f0d0cd6a261d2dea5fb517e2341]
#    to [6cfbf1c69e6043217ec87734e2314b527091aeec]
# 
# patch "packages/openmoko-projects/illume-theme_svn.bb"
#  from [1b8f6932f93b1ca178de665cfc71a366cdb05123]
#    to [3062f9f6fca999155ef2d80cfba1df0c3becadba]
# 
# patch "packages/openmoko-projects/illume_svn.bb"
#  from [41d78bc73011aab120638b3ff084513fbbeeeb4e]
#    to [41cb95294e1a667cc99602223ca04eb2f2fe895a]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc	d8f2f4e91dcd8f0d0cd6a261d2dea5fb517e2341
+++ conf/distro/include/sane-srcrevs.inc	6cfbf1c69e6043217ec87734e2314b527091aeec
@@ -48,8 +48,8 @@ SRCREV_pn-hildon-1 ?= "14429"
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
-SRCREV_pn-illume ?= "58"
-SRCREV_pn-illume-theme ?= "58"
+SRCREV_pn-illume ?= "124"
+SRCREV_pn-illume-theme ?= "124"
 SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
 SRCREV_pn-libcalenabler2 ?= "1410"
============================================================
--- packages/openmoko-projects/illume-theme_svn.bb	1b8f6932f93b1ca178de665cfc71a366cdb05123
+++ packages/openmoko-projects/illume-theme_svn.bb	3062f9f6fca999155ef2d80cfba1df0c3becadba
@@ -4,27 +4,22 @@ PV = "0.0+svnr${SRCREV}"
 
 PACKAGE_ARCH="all"
 PV = "0.0+svnr${SRCREV}"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=illume;proto=https"
 S = "${WORKDIR}/illume"
 
-python do_unpack_append() {
-	bb.note("Unpacking to %s" % os.getcwd())
-	os.system("cd illume; tar -xz --no-same-owner -f misc-data/untar-me-from-root.tar.gz")
-}
-
 CONFFILES_${PN} = "${sysconfdir}/enlightenment/default_profile"
 FILES_${PN} = "${sysconfdir}/enlightenment ${datadir}/enlightenment"
 
 do_install() {
     install -d ${D}${sysconfdir}/enlightenment
     install -d ${D}${datadir}/enlightenment/data/themes/
-    install -d ${D}${datadir}/enlightenment/data/config/
+    install -d ${D}${datadir}/enlightenment/data/init/
 
     # Make illume the default profile
     echo 'E_PROFILE="-profile illume"' > ${D}${sysconfdir}/enlightenment/default_profile
 
     install -m 0644 ${S}/misc-data/illume.edj ${D}${datadir}/enlightenment/data/themes/
-    cp -pPR ${S}/.e/e/config/default ${D}${datadir}/enlightenment/data/config/illume
+    install -m 0644 ${S}/misc-data/illume_init.edj ${D}${datadir}/enlightenment/data/init/
 }
============================================================
--- packages/openmoko-projects/illume_svn.bb	41d78bc73011aab120638b3ff084513fbbeeeb4e
+++ packages/openmoko-projects/illume_svn.bb	41cb95294e1a667cc99602223ca04eb2f2fe895a
@@ -4,10 +4,9 @@ PV = "0.0+svnr${SRCREV}"
 DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native"
 RRECOMMENDS = "wamerican"
 PV = "0.0+svnr${SRCREV}"
-PR = "r3"
+PR = "r6"
 
-SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https \
-           file://keyboard.patch;patch=1;pnum=0;minrev=17;maxrev=20"
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https"
 
 S = "${WORKDIR}/${PN}"
 
@@ -21,5 +20,6 @@ FILES_${PN} = "${libdir}/enlightenment/m
 FILES_${PN} = "${libdir}/enlightenment/modules/*/*.edj \
                ${libdir}/enlightenment/modules/*/*.desktop \
                ${libdir}/enlightenment/modules/*/*/* \
+               ${datadir}/enlightenment/data/config/*/* \
                ${datadir}/${PN} "
 FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/"