[oe-commits] org.oe.dev merge of '2cc1d45d9437bdd14d505b2d7872c95ac87a0157'

[xora commit]

merge of '2cc1d45d9437bdd14d505b2d7872c95ac87a0157'
     and 'ae7352b220b0e0099308d35ee2853b9ba371ca64'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: a502f0944da2e3daeb236f77c37f7ca3495763d0
ViewMTN: http://monotone.openembedded.org/revision/info/a502f0944da2e3daeb236f77c37f7ca3495763d0
Files:
1
packages/gsm/gsmd.inc
conf/distro/include/preferred-openmoko-versions.inc
conf/distro/angstrom-2007.1.conf
conf/distro/angstrom-2008.1.conf
conf/distro/openmoko.conf
Diffs:

#
# mt diff -r2cc1d45d9437bdd14d505b2d7872c95ac87a0157 -ra502f0944da2e3daeb236f77c37f7ca3495763d0
#
# 
# 
# patch "packages/gsm/gsmd.inc"
#  from [1d31a35594ce0b4c1ab114d1d3e5de11da773c2d]
#    to [87b9dba149b37494c35339f9cf26e9954c0052a4]
# 
============================================================
--- packages/gsm/gsmd.inc	1d31a35594ce0b4c1ab114d1d3e5de11da773c2d
+++ packages/gsm/gsmd.inc	87b9dba149b37494c35339f9cf26e9954c0052a4
@@ -1,11 +1,11 @@ PROVIDES += "gsmd"
 DESCRIPTION = "GSM libraries and daemons implementing the 07.10 specification"
 HOMEPAGE = "http://www.openmoko.org"
 LICENSE = "GPL LGPL"
 SECTION = "libs/gsm"
 PROVIDES += "gsmd"
-RPROVIDES_${PN} = "libgsmd0 gsmd"
+RPROVIDES_${PN} = "libgsmd0 gsmd gsmd-devel"
 PV = "0.1+svnr${SRCREV}"
-PR = "r34"
+PR = "r35"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
            file://gsmd \
@@ -49,8 +49,8 @@ RDEPENDS_${BASEPN}-plugins = "${BASEPN}-
                          ${BASEPN}-plugin-vendor-tihtc \
                          "
 
-RDEPENDS_${BASEPN} = "update-rc.d initscripts"
-RRECOMMENDS_${BASEPN} = "${BASEPN}-plugins"
+RDEPENDS_${PN} += "update-rc.d initscripts"
+RRECOMMENDS_${PN} += "${BASEPN}-plugins"
 
 FILES_${PN}-dbg += "${libdir}/gsmd/.debug/*"
 FILES_${PN}-tools = "${bindir}/*"


#
# mt diff -rae7352b220b0e0099308d35ee2853b9ba371ca64 -ra502f0944da2e3daeb236f77c37f7ca3495763d0
#
# 
# 
# delete "conf/distro/include/preferred-openmoko-versions.inc"
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [58d5a5972c3201255ecb63ccde82093b930045ee]
#    to [049fc2b41b1cdbb5c3fac1992eaa84cf2757f201]
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [de57aec5bf786bb9d5cdb1d40856ed0a69ec0f17]
#    to [b57f91c4b69991f51bbaf3bbdea9681d1bba1e6e]
# 
# patch "conf/distro/openmoko.conf"
#  from [98121f29b1e93f614687d8a818b5129f98eab3b6]
#    to [fb09004f81fdf9ff14811c7e83335282b3f46b4b]
# 
============================================================
--- conf/distro/angstrom-2007.1.conf	58d5a5972c3201255ecb63ccde82093b930045ee
+++ conf/distro/angstrom-2007.1.conf	049fc2b41b1cdbb5c3fac1992eaa84cf2757f201
@@ -160,7 +160,6 @@ require conf/distro/include/preferred-xo
 require conf/distro/include/preferred-gpe-versions-2.8.inc
 require conf/distro/include/preferred-e-versions.inc
 require conf/distro/include/preferred-xorg-versions.inc
-require conf/distro/include/preferred-openmoko-versions.inc
 
 
 # Virtuals:
============================================================
--- conf/distro/angstrom-2008.1.conf	de57aec5bf786bb9d5cdb1d40856ed0a69ec0f17
+++ conf/distro/angstrom-2008.1.conf	b57f91c4b69991f51bbaf3bbdea9681d1bba1e6e
@@ -92,7 +92,6 @@ require conf/distro/include/preferred-xo
 require conf/distro/include/preferred-gpe-versions-2.8.inc
 require conf/distro/include/preferred-e-versions.inc
 require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
-require conf/distro/include/preferred-openmoko-versions.inc
 
 
 # Virtuals:
============================================================
--- conf/distro/openmoko.conf	98121f29b1e93f614687d8a818b5129f98eab3b6
+++ conf/distro/openmoko.conf	fb09004f81fdf9ff14811c7e83335282b3f46b4b
@@ -37,8 +37,6 @@ PREFERRED_PROVIDER_libgsmd = "libgsmd"
 # we want the openmoko svn version of gsmd
 PREFERRED_PROVIDER_libgsmd = "libgsmd"
 
-require conf/distro/include/preferred-openmoko-versions.inc
-
 # Bleeding-edge developers should add the following line to their local.conf:
 # require conf/distro/include/moko-autorev.inc
 
@@ -62,7 +60,7 @@ PACKAGE_ARCH_pn-neod_fic-gta02 = "${MACH
 PACKAGE_ARCH_pn-neod_fic-gta01 = "${MACHINE_CLASS}"
 PACKAGE_ARCH_pn-neod_fic-gta02 = "${MACHINE_CLASS}"
 
-# Select packge versions we wash to use.
+# Select package versions we want to use.
 PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling"
 PREFERRED_VERSION_gtk+-fastscaling = "2.10.14"