org.openmoko.april-update: 94249c357fa09584290f9a396c40981a6bb6066a

oe at monotone.openmoko.org oe at monotone.openmoko.org
Thu May 15 17:34:02 CEST 2008


revision:            94249c357fa09584290f9a396c40981a6bb6066a
date:                2008-05-15T14:47:02
author:              xora at openembedded.org
branch:              org.openmoko.april-update
changelog:
illume_svn.bb, illume-theme_svn.bb : update from raster moves the config
from -theme into main package


manifest:
format_version "1"

new_manifest [e0b3f7061446b4f40ec618b0907aa16d5585856e]

old_revision [8e4a84d1e1b52b71b965298f0ab39d758c3023fb]

patch "conf/distro/include/sane-srcrevs.inc"
 from [307095aa34a51a1959a2e3fd67021cad6e4842be]
   to [dd436041bb8317b26c1b392996f01810d45d5ca1]

patch "packages/openmoko-projects/illume-theme_svn.bb"
 from [59cae986e3e5bcdc70e846e805959f7e314d8e59]
   to [a5b248c743b547dd436dd3ee40850b98a7f125e6]

patch "packages/openmoko-projects/illume_svn.bb"
 from [9464d26b8d3a26fa754680912954af89c3a60349]
   to [66708cb62acecffd8b209d19e26f409da72d6108]
-------------- next part --------------
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [307095aa34a51a1959a2e3fd67021cad6e4842be]
#    to [dd436041bb8317b26c1b392996f01810d45d5ca1]
# 
# patch "packages/openmoko-projects/illume-theme_svn.bb"
#  from [59cae986e3e5bcdc70e846e805959f7e314d8e59]
#    to [a5b248c743b547dd436dd3ee40850b98a7f125e6]
# 
# patch "packages/openmoko-projects/illume_svn.bb"
#  from [9464d26b8d3a26fa754680912954af89c3a60349]
#    to [66708cb62acecffd8b209d19e26f409da72d6108]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc	307095aa34a51a1959a2e3fd67021cad6e4842be
+++ conf/distro/include/sane-srcrevs.inc	dd436041bb8317b26c1b392996f01810d45d5ca1
@@ -42,8 +42,8 @@ SRCREV_pn-hildon-1 ?= "14429"
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
-SRCREV_pn-illume ?= "71"
-SRCREV_pn-illume-theme ?= "71"
+SRCREV_pn-illume ?= "76"
+SRCREV_pn-illume-theme ?= "76"
 SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
 SRCREV_pn-libcalenabler2 ?= "1410"
============================================================
--- packages/openmoko-projects/illume-theme_svn.bb	59cae986e3e5bcdc70e846e805959f7e314d8e59
+++ packages/openmoko-projects/illume-theme_svn.bb	a5b248c743b547dd436dd3ee40850b98a7f125e6
@@ -4,35 +4,20 @@ PV = "0.0+svnr${SRCPV}"
 
 PACKAGE_ARCH="all"
 PV = "0.0+svnr${SRCPV}"
-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())
-
-	# support both pre and post r71 illume theme files
-	if os.path.exists("illume/misc-data/untar-me-from-root.tar.gz"):
-	    os.system("cd illume; tar -xz --no-same-owner -f misc-data/untar-me-from-root.tar.gz")
-	elif os.path.exists("illume/misc-data/illume-cfg.tar.gz"):
-	    os.system("cd illume; tar -xz --no-same-owner -f misc-data/illume-cfg.tar.gz")
-	else:
-	    assert False
-}
-
 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/
 
     # 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 || true
-    cp -pPR ${S}/.e/e/config/illume  ${D}${datadir}/enlightenment/data/config/illume || true
 }
============================================================
--- packages/openmoko-projects/illume_svn.bb	9464d26b8d3a26fa754680912954af89c3a60349
+++ packages/openmoko-projects/illume_svn.bb	66708cb62acecffd8b209d19e26f409da72d6108
@@ -4,7 +4,7 @@ PV = "0.0+svnr${SRCPV}"
 DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native"
 RRECOMMENDS = "wamerican"
 PV = "0.0+svnr${SRCPV}"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https \
            file://keyboard.patch;patch=1;pnum=0;minrev=17;maxrev=20"
@@ -21,5 +21,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/"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080515/1913721b/attachment.htm 


More information about the commitlog mailing list