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

[koen commit]

merge of '5ccab19e0abd27e8128d91da533c52656df39aa3'
     and 'a422d794d754d9fd6d61b55a92e48c2dd601ba08'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: e8cd51116809650c8c5699e3c79d301a34beb5ea
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e8cd51116809650c8c5699e3c79d301a34beb5ea
Files:
1
conf/distro/include/sane-srcdates.inc
packages/openmoko2/openmoko-session2.bb
Diffs:

#
# mt diff -r5ccab19e0abd27e8128d91da533c52656df39aa3 -re8cd51116809650c8c5699e3c79d301a34beb5ea
#
# 
# 
# patch "conf/distro/include/sane-srcdates.inc"
#  from [e8003cd4b71e0bc0e573da4ffb43083ce839581e]
#    to [32e971e44dde739c77ad99c6998763b392117882]
# 
============================================================
--- conf/distro/include/sane-srcdates.inc	e8003cd4b71e0bc0e573da4ffb43083ce839581e
+++ conf/distro/include/sane-srcdates.inc	32e971e44dde739c77ad99c6998763b392117882
@@ -13,8 +13,8 @@ SRCDATE_renderext ?= "20060814"
 SRCDATE_libxss ?= "20060814"
 SRCDATE_recordext ?= "20060814"
 SRCDATE_renderext ?= "20060814"
-SRCDATE_xcalibrate ?= "20060814"
-SRCDATE_xcalibrateext ?= "20060814"
+SRCDATE_calibrateproto ?= "20070802"                     
+SRCDATE_libxcalibrate ?= "20070802"
 SRCDATE_xxf86dgaext ?= "20060814"
 SRCDATE_xxf86vmext ?= "20060814" 
 


#
# mt diff -ra422d794d754d9fd6d61b55a92e48c2dd601ba08 -re8cd51116809650c8c5699e3c79d301a34beb5ea
#
# 
# 
# patch "packages/openmoko2/openmoko-session2.bb"
#  from [96268eb00aea83baa6ac6f978f6a6725dd61f5c1]
#    to [547b4c85468fe2a49b7ccf02bcd3340678ff487b]
# 
============================================================
--- packages/openmoko2/openmoko-session2.bb	96268eb00aea83baa6ac6f978f6a6725dd61f5c1
+++ packages/openmoko2/openmoko-session2.bb	547b4c85468fe2a49b7ccf02bcd3340678ff487b
@@ -1,9 +1,9 @@ RCONFLICTS = "openmoko-session"
 DESCRIPTION = "Custom MB session files for poky"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
 RCONFLICTS = "openmoko-session"
-PR = "r22"
+PR = "r23"
 
 SRC_URI = "file://etc"
 S = ${WORKDIR}