[oe-commits] org.oe.dev merge of '223e77ca88fa6579d9c9b5bdb54dfa560c0088c6'

[oe commit]

merge of '223e77ca88fa6579d9c9b5bdb54dfa560c0088c6'
     and 'c9606a6d7d837ce505119656bb9b07a84b3eb636'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: e84bc5dbd18b0ae0d5a9baa272007a05d54097bd
ViewMTN: http://monotone.openembedded.org/revision/info/e84bc5dbd18b0ae0d5a9baa272007a05d54097bd
Files:
1
conf/distro/include/angstrom-2007-preferred-versions.inc
conf/distro/include/sane-srcrevs.inc
Diffs:

#
# mt diff -r223e77ca88fa6579d9c9b5bdb54dfa560c0088c6 -re84bc5dbd18b0ae0d5a9baa272007a05d54097bd
#
# 
# 
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
#  from [a1cab6bc90eb0131a08937ca4daae386afb46820]
#    to [5f41a35120e7ff29258edeee4606234a3248565f]
# 
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc	a1cab6bc90eb0131a08937ca4daae386afb46820
+++ conf/distro/include/angstrom-2007-preferred-versions.inc	5f41a35120e7ff29258edeee4606234a3248565f
@@ -1444,7 +1444,6 @@ PREFERRED_VERSION_mpd ?= "0.12.1"
 PREFERRED_VERSION_mp3blaster ?= "3.2.3"
 PREFERRED_VERSION_mpc ?= "0.12.1"
 PREFERRED_VERSION_mpd ?= "0.12.1"
-PREFERRED_VERSION_mpd-alsa ?= "svn"
 PREFERRED_VERSION_mpeg2dec ?= "0.4.0b"
 PREFERRED_VERSION_mpfr ?= "2.1.1"
 PREFERRED_VERSION_mpfr-native ?= "2.1.1"
@@ -1457,9 +1456,6 @@ PREFERRED_VERSION_mt-daapd ?= "0.2.3"
 PREFERRED_VERSION_msn-cap ?= "1.0"
 PREFERRED_VERSION_msynctool ?= "0.22"
 PREFERRED_VERSION_mt-daapd ?= "0.2.3"
-PREFERRED_VERSION_mtd-utils ?= "1.0.0"
-PREFERRED_VERSION_mtd-utils-native ?= "1.0.0"
-PREFERRED_VERSION_mtd-utils-tests ?= "1.0.0"
 PREFERRED_VERSION_mtools ?= "3.9.9"
 PREFERRED_VERSION_mtools-native ?= "3.9.9"
 PREFERRED_VERSION_mtpaint ?= "3.02"
@@ -1539,7 +1535,6 @@ PREFERRED_VERSION_openal ?= "0.0.8"
 PREFERRED_VERSION_omniorb ?= "4.0.7"
 PREFERRED_VERSION_omniorb-native ?= "4.0.7"
 PREFERRED_VERSION_openal ?= "0.0.8"
-PREFERRED_VERSION_openchrome ?= "svn"
 PREFERRED_VERSION_opencvs ?= "0.0"
 PREFERRED_VERSION_openh323 ?= "1.13.5.4"
 PREFERRED_VERSION_openjade ?= "1.3.2"


#
# mt diff -rc9606a6d7d837ce505119656bb9b07a84b3eb636 -re84bc5dbd18b0ae0d5a9baa272007a05d54097bd
#
# 
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [531eee7007b54c139368eb4fe74b8032d1c914d4]
#    to [853ecf974e4e8b0eb1c9ddac0e504455aa88abd8]
# 
============================================================
--- conf/distro/include/sane-srcrevs.inc	531eee7007b54c139368eb4fe74b8032d1c914d4
+++ conf/distro/include/sane-srcrevs.inc	853ecf974e4e8b0eb1c9ddac0e504455aa88abd8
@@ -26,7 +26,7 @@ SRCREV_pn-libxosd ?= "627"
 SRCREV_pn-libmokoui2 ?= "3111"
 SRCREV_pn-libowl ?= "277"
 SRCREV_pn-libxosd ?= "627"
-SRCREV_pn-linux-bfin ?= "3731"
+SRCREV_pn-linux-bfin ?= "3745"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"