openmoko-sound-theme-standard: add classic ringtone, load on startup, bump PR

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 145e97e..8eec5ca 100644 (file)
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -66,7 +66,7 @@ SRCREV_pn-openmoko-panel-mainmenu ?= "2567"
 SRCREV_pn-openmoko-panel-usb ?= "2893"
 SRCREV_pn-openmoko-session ?= "152"
 SRCREV_pn-openmoko-simplemediaplayer ?= "1688"
-SRCREV_pn-openmoko-sound-theme-standard ?= "2827"
+SRCREV_pn-openmoko-sound-theme-standard ?= "2974"
 SRCREV_pn-openmoko-stylus-demo ?= "2324"
 SRCREV_pn-openmoko-stylus-demo-simple ?= "1818"
 SRCREV_pn-openmoko-taskmanager ?= "1663"

diff --git a/packages/openmoko-base/openmoko-sound-system/session b/packages/openmoko-base/openmoko-sound-system/session
index 91267b6..dfef83d 100644 (file)
--- a/packages/openmoko-base/openmoko-sound-system/session
+++ b/packages/openmoko-base/openmoko-sound-system/session
@@ -24,3 +24,5 @@ load-module module-x11-bell sample=x11-bell
 # Load samples
 load-sample startup /usr/share/openmoko/sounds/startup_openmoko.wav
 load-sample touchscreen /usr/share/openmoko/sounds/touchscreen_click.wav
+load-sample ringtone /usr/share/openmoko/sounds/ringtone_classy.wav
+

diff --git a/packages/openmoko-base/openmoko-sound-system_0.1.0.bb b/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
index 671ff37..ddb5053 100644 (file)
--- a/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
+++ b/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
@@ -10,7 +10,7 @@ RDEPENDS = "\
   pulseaudio-module-native-protocol-unix \
   pulseaudio-module-cli-protocol-unix \
 "
-PR = "r5"
+PR = "r6"
 
 inherit openmoko-base update-rc.d
 

diff --git a/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb b/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb
index f521fe1..f42b75e 100644 (file)
--- a/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb
+++ b/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Standard sound theme for the OpenMoko distribution"
 SECTION = "openmoko/base"
 PV = "0.1+svnr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
 inherit openmoko-base autotools
 
@@ -14,7 +14,7 @@ do_install() {
         for i in *.mp3; do
                 cp -fpPR ${S}/$i ${D}${datadir}/openmoko/sounds/
         done
-        for i in touchscreen_click.wav notify_doorbell.wav startup_openmoko.wav; do
+        for i in touchscreen_click.wav ringtone_classy.wav notify_doorbell.wav startup_openmoko.wav; do
                 cp -f ${S}/$i ${D}${datadir}/openmoko/sounds/
         done
 }