<!-- Generator: GNU source-highlight 2.4
by Lorenzo Bettini
http://www.lorenzobettini.it
http://www.gnu.org/software/src-highlite -->
<pre><tt>#
#
# patch "packages/openmoko2/openmoko-session2.bb"
#  from [55400c33a1430f1af17b981a8763a0065d062c04]
#    to [6fe69290b46b2f786d58a307cb32b533ea009587]
# 
# patch "packages/tasks/task-openmoko-base.bb"
#  from [71e3246b0804a4c56a13031ceff61a72c5522177]
#    to [72583fbfa39f082e79d4673df5144b1684c830ca]
#
============================================================
<font color="#FF6600">--- packages/openmoko2/openmoko-session2.bb        55400c33a1430f1af17b981a8763a0065d062c04</font>
<font color="#009900">+++ packages/openmoko2/openmoko-session2.bb        6fe69290b46b2f786d58a307cb32b533ea009587</font>
<font color="#0000FF">@@ -1,7 +1,7 @@</font>
<font color="#FF6600">-DESCRIPTION = "Custom Matchbox session files for Openmoko"</font>
<font color="#009900">+ESCRIPTION = "Custom Matchbox session files for Openmoko"</font>
 LICENSE = "GPL"
 SECTION = "x11"
<font color="#FF6600">-RDEPENDS_${PN} = "matchbox-panel-2 openmoko-common2 openmoko-today2 openmoko-dialer2 openmoko-panel-memory"</font>
<font color="#009900">+RDEPENDS_${PN} = "matchbox-panel-2 openmoko-common2 openmoko-today2 openmoko-dialer2"</font>
 RCONFLICTS_${PN} = "openmoko-session matchbox-common"
 PR = "r68"
 
============================================================
<font color="#FF6600">--- packages/tasks/task-openmoko-base.bb        71e3246b0804a4c56a13031ceff61a72c5522177</font>
<font color="#009900">+++ packages/tasks/task-openmoko-base.bb        72583fbfa39f082e79d4673df5144b1684c830ca</font>
<font color="#0000FF">@@ -1,7 +1,7 @@ LICENSE = "MIT"</font>
 DESCRIPTION = "Openmoko: Base Task for the Openmoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
<font color="#FF6600">-PR = "r72"</font>
<font color="#009900">+PR = "r73"</font>
 
 inherit task
 
<font color="#0000FF">@@ -20,10 +20,11 @@ RDEPENDS_task-openmoko-base = "\</font>
   openmoko-terminal2 \
 #  openmoko-keyboard \
   openmoko-panel-battery \
<font color="#FF6600">-  openmoko-panel-bt \</font>
   openmoko-panel-clock \
   openmoko-panel-usb \
<font color="#FF6600">-  ${@base_contains('MACHINE_FEATURES', 'gps', 'openmoko-panel-gps', '',d)} \</font>
<font color="#009900">+  ${@base_contains('MACHINE_FEATURES', 'bluetooth', 'openmoko-panel-bt', '', d)} \</font>
<font color="#009900">+  ${@base_contains('MACHINE_FEATURES', 'gps', 'openmoko-panel-gps', '', d)} \</font>
<font color="#009900">+  ${@base_contains('MACHINE_FEATURES', 'wifi', 'openmoko-panel-wifi', '', d)} \</font>
   \
   openmoko-today2 \
 #  openmoko-appmanager \
</tt></pre>