[oe-commits] Thomas Zimmermann : shr/merge: alsa-scenarios: create virtual/alsa-scenario

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: 77a1f35d560f0c61c83a2e8c0fae1f7a82dabde1
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=77a1f35d560f0c61c83a2e8c0fae1f7a82dabde1

Author: Thomas Zimmermann <zimmermann at vdm-design.de>
Date:   Thu Oct 15 21:25:51 2009 +0000

shr/merge: alsa-scenarios: create virtual/alsa-scenario

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 conf/distro/shr.conf                         |    2 ++
 recipes/ffalarms/ffalarms_svn.bb             |    4 ++--
 recipes/openmoko2/openmoko-alsa-scenarios.bb |    4 +++-
 recipes/shr/alsa-scenarii-shr_git.bb         |    4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index a992104..15463a5 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -100,6 +100,8 @@ PREFERRED_PROVIDER_frameworkd = "frameworkd"
 PREFERRED_PROVIDER_gpsd = "fso-gpsd"
 PREFERRED_PROVIDER_e-wm-menu = "e-wm-menu-shr"
 PREFERRED_PROVIDER_openmoko-alsa-scenarios = "alsa-scenarii-shr"
+PREFERRED_PROVIDER_virtual/alsa-scenarios = "alsa-scenarii-shr"
+
 # Helper to say what image we built
 SHR_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/shr-version"
 ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Tag Name: `git tag|tail -n 1`> ${SHR_VERSION_FILE};cd $OLD_PWD;"
diff --git a/recipes/ffalarms/ffalarms_svn.bb b/recipes/ffalarms/ffalarms_svn.bb
index ff72405..9f4886b 100644
--- a/recipes/ffalarms/ffalarms_svn.bb
+++ b/recipes/ffalarms/ffalarms_svn.bb
@@ -8,7 +8,7 @@ PRIORITY = "optional"
 DEPENDS = "elementary libeflvala"
 
 PV = "0.2.4+svnr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
 inherit vala
 
@@ -18,7 +18,7 @@ S = "${WORKDIR}/trunk"
 
 FILES_${PN} += "${datadir}/${PN} ${datadir}/applications ${datadir}/pixmaps"
 
-RDEPENDS = "atd alsa-utils-amixer alsa-utils-alsactl openmoko-alsa-scenarios ttf-dejavu-sans"
+RDEPENDS = "atd alsa-utils-amixer alsa-utils-alsactl virtual/alsa-scenarios ttf-dejavu-sans"
 
 RSUGGESTS = "mplayer alsa-utils-aplay frameworkd"
 
diff --git a/recipes/openmoko2/openmoko-alsa-scenarios.bb b/recipes/openmoko2/openmoko-alsa-scenarios.bb
index 08531e8..1991f88 100644
--- a/recipes/openmoko2/openmoko-alsa-scenarios.bb
+++ b/recipes/openmoko2/openmoko-alsa-scenarios.bb
@@ -1,7 +1,9 @@
 DESCRIPTION = "Package for the different scenarios used by Openmoko"
 SECTION = "openmoko/base"
 PV = "1.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
+
+PROVIDES = "virtual/alsa-scenarios"
 
 COMPATIBLE_MACHINE = "(om-gta01|om-gta02)"
 
diff --git a/recipes/shr/alsa-scenarii-shr_git.bb b/recipes/shr/alsa-scenarii-shr_git.bb
index 97b4393..dff37cc 100644
--- a/recipes/shr/alsa-scenarii-shr_git.bb
+++ b/recipes/shr/alsa-scenarii-shr_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Package for the different scenarios used by Openmoko"
 SECTION = "openmoko/base"
 PV = "1.0+gitr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 COMPATIBLE_MACHINE = "(om-gta01|om-gta02|om-3d7k)"
 
@@ -21,5 +21,5 @@ PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
 FILES_${PN} += "${datadir}/shr"
 
 CONFFILES_${PN} += "${datadir}/shr/scenarii/*"
-RPROVIDES_${PN} = "openmoko-alsa-scenarios"
+RPROVIDES_${PN} = "openmoko-alsa-scenarios virtual/alsa-scenarios"