org.openmoko.dev: e8be36f576c5963814c499e6eee485058f083844

oe at monotone.openmoko.org oe at monotone.openmoko.org
Tue May 13 00:37:45 CEST 2008 

revision:            e8be36f576c5963814c499e6eee485058f083844
date:                2008-05-12T15:15:07
author:              xora at openembedded.org
branch:              org.openmoko.dev
changelog:
merge of '8314e13f4942b17f2a48fbdce60f3981bd2fe0fe'
     and 'cefb5c0c9cd6550af279bb91c750045e3780a37e'

manifest:
format_version "1"

new_manifest [b5962d64e2963b8e33cb89837edfae7c18f26cce]

old_revision [8314e13f4942b17f2a48fbdce60f3981bd2fe0fe]

patch "conf/distro/include/preferred-om-2008-versions.inc"
 from [1fa5768d601b1fc24f2f64c740c2e5fc96c4fce3]
   to [9b85919d2817742c0517937716a9536cbe0a6590]

patch "conf/distro/include/sane-srcdates.inc"
 from [e993ffd4e275abdc019bd768b83fe75481e9f12a]
   to [ebceb9691861019eeb4ec9b66196bf65466e1e24]

patch "conf/distro/include/sane-srcrevs.inc"
 from [c38f6d70e009edbe4857bc79b71f49bfc30c49b3]
   to [5fb6f091a1aa6cb0750d982457e0279654a8435e]

patch "packages/efl1/epsilon_cvs.bb"
 from [06a4ccc0ac1208566731c847fc2ac20246de3ec5]
   to [17cdd9bae3d37e28856c52115c8249de46b9188f]

patch "packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb"
 from [2db188138c7ab21ffb50b9b6d7df46c98653ea2f]
   to [d4777e7c06f7a7e8e0d672a2e1aff94ca82a7fe9]

old_revision [cefb5c0c9cd6550af279bb91c750045e3780a37e]

patch "packages/openmoko-projects/illume-theme_svn.bb"
 from [1b8f6932f93b1ca178de665cfc71a366cdb05123]
   to [ef0605f817f9a7c89cd4e93d673515af3c4ab120]
-------------- next part --------------
#
#
# patch "conf/distro/include/preferred-om-2008-versions.inc"
#  from [1fa5768d601b1fc24f2f64c740c2e5fc96c4fce3]
#    to [9b85919d2817742c0517937716a9536cbe0a6590]
# 
# patch "conf/distro/include/sane-srcdates.inc"
#  from [e993ffd4e275abdc019bd768b83fe75481e9f12a]
#    to [ebceb9691861019eeb4ec9b66196bf65466e1e24]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [c38f6d70e009edbe4857bc79b71f49bfc30c49b3]
#    to [5fb6f091a1aa6cb0750d982457e0279654a8435e]
# 
# patch "packages/efl1/epsilon_cvs.bb"
#  from [06a4ccc0ac1208566731c847fc2ac20246de3ec5]
#    to [17cdd9bae3d37e28856c52115c8249de46b9188f]
# 
# patch "packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb"
#  from [2db188138c7ab21ffb50b9b6d7df46c98653ea2f]
#    to [d4777e7c06f7a7e8e0d672a2e1aff94ca82a7fe9]
#
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc	1fa5768d601b1fc24f2f64c740c2e5fc96c4fce3
+++ conf/distro/include/preferred-om-2008-versions.inc	9b85919d2817742c0517937716a9536cbe0a6590
@@ -59,8 +59,8 @@ PREFERRED_VERSION_avahi ?= "0.6.22"
 PREFERRED_VERSION_automake ?= "1.9.6"
 PREFERRED_VERSION_automake-native ?= "1.9.6"
 PREFERRED_VERSION_avahi ?= "0.6.22"
-PREFERRED_VERSION_avahi-python ?= "0.6.22"
-PREFERRED_VERSION_avahi-ui ?= "0.6.22"
+PREFERRED_VERSION_avahi-python ?= "0.6.21"
+PREFERRED_VERSION_avahi-ui ?= "0.6.21"
 PREFERRED_VERSION_avetanabt ?= "20060413"
 PREFERRED_VERSION_bacula-client ?= "1.38.11"
 PREFERRED_VERSION_balsa ?= "2.0.17"
@@ -117,7 +117,7 @@ PREFERRED_VERSION_btxml ?= "1.0"
 PREFERRED_VERSION_btsco ?= "0.42"
 PREFERRED_VERSION_btsco-module ?= "0.42"
 PREFERRED_VERSION_btxml ?= "1.0"
-PREFERRED_VERSION_busybox = "1.9.1"
+PREFERRED_VERSION_busybox = "1.9.2"
 PREFERRED_VERSION_busybox-static ?= "1.2.1"
 PREFERRED_VERSION_bvi ?= "1.3.1"
 PREFERRED_VERSION_bwmon ?= "1.3"
@@ -201,8 +201,8 @@ PREFERRED_VERSION_cups ?= "1.2.12"
 PREFERRED_VERSION_ctrlproxy ?= "2.6.2"
 PREFERRED_VERSION_cumulus ?= "1.2.1"
 PREFERRED_VERSION_cups ?= "1.2.12"
-PREFERRED_VERSION_curl ?= "7.16.4"
-PREFERRED_VERSION_curl-native ?= "7.16.4"
+PREFERRED_VERSION_curl ?= "7.18.0"
+PREFERRED_VERSION_curl-native ?= "7.18.0"
 PREFERRED_VERSION_custominput ?= "1.1.0"
 PREFERRED_VERSION_cvs ?= "1.12.9"
 PREFERRED_VERSION_cxcrypt ?= "1.0"
@@ -1958,7 +1958,7 @@ PREFERRED_VERSION_wpa-gui ?= "0.4.8"
 PREFERRED_VERSION_wlan-ng-utils ?= "0.2.7"
 PREFERRED_VERSION_wmctrl ?= "1.07"
 PREFERRED_VERSION_wpa-gui ?= "0.4.8"
-PREFERRED_VERSION_wpa-supplicant ?= "0.5.5"
+PREFERRED_VERSION_wpa-supplicant ?= "0.5.10"
 PREFERRED_VERSION_wpa-supplicant-nossl ?= "0.2.6"
 PREFERRED_VERSION_wpa-supplicant-ssl ?= "0.2.6"
 PREFERRED_VERSION_wrt-imagetools-native ?= "1.0"
============================================================
--- conf/distro/include/sane-srcdates.inc	e993ffd4e275abdc019bd768b83fe75481e9f12a
+++ conf/distro/include/sane-srcdates.inc	ebceb9691861019eeb4ec9b66196bf65466e1e24
@@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCDATE ?= "20080428"
+EFL_SRCDATE ?= "20080512"
 SRCDATE_edb-native ?= "${EFL_SRCDATE}"
 SRCDATE_edb ?= "${EFL_SRCDATE}"
 SRCDATE_eet-native ?= "${EFL_SRCDATE}"
============================================================
--- conf/distro/include/sane-srcrevs.inc	c38f6d70e009edbe4857bc79b71f49bfc30c49b3
+++ conf/distro/include/sane-srcrevs.inc	5fb6f091a1aa6cb0750d982457e0279654a8435e
@@ -44,8 +44,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 ?= "68"
+SRCREV_pn-illume-theme ?= "68"
 SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
 SRCREV_pn-libcalenabler2 ?= "1410"
@@ -169,7 +169,7 @@ SRCREV_pn-python-pyrtc = "4b7fd8841ab62d
 SRCREV_pn-python-gsmd = "148"
 SRCREV_pn-python-lightmediascanner = "68"
 SRCREV_pn-python-pyrtc = "4b7fd8841ab62d81fa78509ef7f9b14d2118dcae"
-SRCREV_pn-qtopia-phone-x11 ?= "fe178356c36e5f22d60c5e07477e3004a4210c33"
+SRCREV_pn-qtopia-phone-x11 ?= "341e1f0813d2b1044ca0fd2946b07d97733e2eaf"
 SRCREV_pn-s3c24xx-gpio ?= "4130"
 SRCREV_pn-serial-forward ?= "4214"
 SRCREV_pn-settings-daemon ?= "2006"
============================================================
--- packages/efl1/epsilon_cvs.bb	06a4ccc0ac1208566731c847fc2ac20246de3ec5
+++ packages/efl1/epsilon_cvs.bb	17cdd9bae3d37e28856c52115c8249de46b9188f
@@ -4,11 +4,11 @@ PV = "0.3.0.012+cvs${SRCDATE}"
 # can also depend on xine for movie thumbnails
 DEPENDS = "imlib2 epeg libpng evas ecore edje perl-native"
 PV = "0.3.0.012+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 inherit efl
 
-SRC_URI += "file://fix_alignment_error.patch;patch=1"
+SRC_URI += "file://fix_alignment_error.patch;patch=1;maxdate=20080511"
 
 # a gstreamer thumbnailer would be nice now that we have emotion using gstreamer as well
 EXTRA_OECONF = "--disable-xine"
============================================================
--- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb	2db188138c7ab21ffb50b9b6d7df46c98653ea2f
+++ packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb	d4777e7c06f7a7e8e0d672a2e1aff94ca82a7fe9
@@ -19,7 +19,7 @@ PROVIDES = "qtopia-phone"
 #setting the proper PV breaks configure
 #PV = "4.3.1+git${SRCREV}"
 
-PR = "r12"
+PR = "r13"
 SRC_URI = "git://git.openmoko.org/git/qtopia.git;protocol=git \
            file://Xsession.d/89qtopia \
            file://qtopia.sh"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080513/6d051023/attachment.htm 
-------------- next part --------------
#
#
# patch "packages/openmoko-projects/illume-theme_svn.bb"
#  from [1b8f6932f93b1ca178de665cfc71a366cdb05123]
#    to [ef0605f817f9a7c89cd4e93d673515af3c4ab120]
#
============================================================
--- packages/openmoko-projects/illume-theme_svn.bb	1b8f6932f93b1ca178de665cfc71a366cdb05123
+++ packages/openmoko-projects/illume-theme_svn.bb	ef0605f817f9a7c89cd4e93d673515af3c4ab120
@@ -4,14 +4,14 @@ PV = "0.0+svnr${SRCREV}"
 
 PACKAGE_ARCH="all"
 PV = "0.0+svnr${SRCREV}"
-PR = "r4"
+PR = "r4.01"
 
 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")
+	os.system("cd illume; tar -xz --no-same-owner -f misc-data/illume-cfg.tar.gz")
 }
 
 CONFFILES_${PN} = "${sysconfdir}/enlightenment/default_profile"
@@ -26,5 +26,4 @@ do_install() {
     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
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080513/6d051023/attachment-0001.htm

More information about the commitlog mailing list