<!-- Generator: GNU source-highlight 2.4
by Lorenzo Bettini
http://www.lorenzobettini.it
http://www.gnu.org/software/src-highlite -->
<pre><tt>#
#
# delete "packages/alsa/alsa-state/om-gta01/capturehandset.state"

# delete "packages/alsa/alsa-state/om-gta01/captureheadset.state"

# delete "packages/alsa/alsa-state/om-gta01/gsmbluetooth.state"

# delete "packages/alsa/alsa-state/om-gta01/gsmhandset.state"

# delete "packages/alsa/alsa-state/om-gta01/gsmheadset.state"

# delete "packages/alsa/alsa-state/om-gta01/gsmspeakerout.state"

# delete "packages/alsa/alsa-state/om-gta01/stereoout.state"

# delete "packages/alsa/alsa-state/om-gta01/voip-handset.state"

# delete "packages/alsa/alsa-state/om-gta01/voip-headset.state"

# delete "packages/alsa/alsa-state/om-gta02/gsmhandset.state"

# delete "packages/alsa/alsa-state/om-gta02/stereoout.state"

# patch "MAINTAINERS"
#  from [68b5a6f70f2d35b99a9cee6ed959cf40be50ddeb]
#    to [5556c9277c3381070987310400058abdd5f4c820]

# patch "conf/distro/include/sane-srcrevs.inc"
#  from [f33b71cab36aa10b579792376f0845d420fbaf48]
#    to [9c9051536a4888092ceeb6bacf2c2e8f7b05aa0a]

# patch "packages/alsa/alsa-state.bb"
#  from [2590f4545ccf7d78835320f929293f7d773dc9f9]
#    to [b2b06fb42b6e17fc6566d5c3cd2dd069226a5b32]

# patch "packages/openmoko-projects/enlazar_svn.bb"
#  from [3eebf6592022236be82998d5d51941aa8ccd89a2]
#    to [da06261f116197bb096f6cef1c9740f28fc8a734]

# patch "packages/openmoko2/openmoko-alsa-scenarios.bb"
#  from [eb767fd7563c9ddc41f630dbd3dd444d81f8a950]
#    to [b87a3d0e6b06598563cde82c1ac271dac1ef50da]
#
============================================================
<font color="#FF6600">--- MAINTAINERS        68b5a6f70f2d35b99a9cee6ed959cf40be50ddeb</font>
<font color="#009900">+++ MAINTAINERS        5556c9277c3381070987310400058abdd5f4c820</font>
<font color="#0000FF">@@ -165,7 +165,7 @@ Mail:       mlauer@vanille-media.de</font>
 
 Person:     Michael 'Mickey' Lauer
 Mail:       mlauer@vanille-media.de
<font color="#FF6600">-Distros:    OpenMoko, Ångström, Generic</font>
<font color="#009900">+Distros:    Openmoko, Ångström, Generic</font>
 Machines:   om-gta01, om-gta02, nokia810, x86, qemuarm, qemux86
 Interests:  Core OE infrastructure, everything Python, EFL, E17, Qt4
 Recipes:    *python*, efl/*, e17*
============================================================
<font color="#FF6600">--- conf/distro/include/sane-srcrevs.inc        f33b71cab36aa10b579792376f0845d420fbaf48</font>
<font color="#009900">+++ conf/distro/include/sane-srcrevs.inc        9c9051536a4888092ceeb6bacf2c2e8f7b05aa0a</font>
<font color="#0000FF">@@ -25,6 +25,7 @@ SRCREV_pn-eglibc-intermediate ?= "5522"</font>
 SRCREV_pn-eglibc ?= "5522"
 SRCREV_pn-eglibc-initial ?= "5522"
 SRCREV_pn-eglibc-intermediate ?= "5522"
<font color="#009900">+SRCREV_pn-enlazar = "37"</font>
 SRCREV_pn-ezxd ?= "2074"
 SRCREV_pn-elf2flt ?= "1786"
 SRCREV_pn-epiphany ?= "7837"
============================================================
<font color="#FF6600">--- packages/alsa/alsa-state.bb        2590f4545ccf7d78835320f929293f7d773dc9f9</font>
<font color="#009900">+++ packages/alsa/alsa-state.bb        b2b06fb42b6e17fc6566d5c3cd2dd069226a5b32</font>
<font color="#0000FF">@@ -7,31 +7,17 @@ RRECOMMENDS_alsa-state = "alsa-states"</font>
 DESCRIPTION = "Default ALSA configuration"
 LICENSE = "GPL"
 RRECOMMENDS_alsa-state = "alsa-states"
<font color="#FF6600">-RRECOMMENDS_${PN}_openmoko = "openmoko-alsa-scenarios"</font>
<font color="#009900">+RRECOMMENDS_${PN}_om-gta01 = "openmoko-alsa-scenarios"</font>
<font color="#009900">+RRECOMMENDS_${PN}_om-gta02 = "openmoko-alsa-scenarios"</font>
 PV = "0.1.0"
<font color="#FF6600">-PR = "r14.1"</font>
<font color="#009900">+PR = "r14.3"</font>
 
 SRC_URI = " \
   file://asoundrc \
   file://asound.state \
   file://alsa-state "
 
<font color="#FF6600">-SRC_URI_append_om-gta01 = " \</font>
<font color="#FF6600">-  file://capturehandset.state \</font>
<font color="#FF6600">-  file://captureheadset.state \</font>
<font color="#FF6600">-  file://gsmbluetooth.state \</font>
<font color="#FF6600">-  file://gsmhandset.state \</font>
<font color="#FF6600">-  file://gsmheadset.state \</font>
<font color="#FF6600">-  file://gsmspeakerout.state \</font>
<font color="#FF6600">-  file://stereoout.state \</font>
<font color="#FF6600">-  file://voip-handset.state \</font>
<font color="#FF6600">-  file://voip-headset.state"</font>
 
<font color="#FF6600">-SRC_URI_append_om-gta02 = "\</font>
<font color="#FF6600">-  file://stereoout.state \</font>
<font color="#FF6600">-  file://gsmhandset.state \</font>
<font color="#FF6600">-  "</font>
<font color="#FF6600">-</font>
 inherit update-rc.d
 
 INITSCRIPT_NAME = "alsa-state"
============================================================
<font color="#FF6600">--- packages/openmoko-projects/enlazar_svn.bb        3eebf6592022236be82998d5d51941aa8ccd89a2</font>
<font color="#009900">+++ packages/openmoko-projects/enlazar_svn.bb        da06261f116197bb096f6cef1c9740f28fc8a734</font>
<font color="#0000FF">@@ -6,6 +6,7 @@ PR = "r3"</font>
 SRCREV = "${AUTOREV}"
 PV = "0.1+svn${SRCREV}"
 PR = "r3"
<font color="#009900">+PE = "1"</font>
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/enlazar;module=trunk;proto=http"
 
============================================================
<font color="#FF6600">--- packages/openmoko2/openmoko-alsa-scenarios.bb        eb767fd7563c9ddc41f630dbd3dd444d81f8a950</font>
<font color="#009900">+++ packages/openmoko2/openmoko-alsa-scenarios.bb        b87a3d0e6b06598563cde82c1ac271dac1ef50da</font>
<font color="#0000FF">@@ -1,4 +1,4 @@</font>
<font color="#FF6600">-DESCRIPTION = "Package for the different scenarios used by OpenMoko"</font>
<font color="#009900">+DESCRIPTION = "Package for the different scenarios used by Openmoko"</font>
 SECTION = "openmoko/base"
 PV = "1.0+svnr${SRCREV}"
 PR = "r1"
</tt></pre>