merge of '57d7542ed0fd0b8b1f119cea4a56f425d875a4a0'

     and '881b243754238663caa684adaf1bfed923a1d0e6'

2 files changed, 3 insertions, 3 deletions

diff --git a/packages/openmoko-base/openmoko-sound-system/session b/packages/openmoko-base/openmoko-sound-system/session
index dfef83d934..ed2346d55f 100644
--- a/packages/openmoko-base/openmoko-sound-system/session
+++ b/packages/openmoko-base/openmoko-sound-system/session
@@ -22,7 +22,7 @@ load-sample-lazy x11-bell /usr/share/openmoko/sounds/notify_doorbell.wav
 load-module module-x11-bell sample=x11-bell
 
 # Load samples
-load-sample startup /usr/share/openmoko/sounds/startup_openmoko.wav
+load-sample startup /usr/share/openmoko/sounds/startup_unintrusive.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-theme-standard_svn.bb b/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb
index f42b75ecb0..9ce0929f0d 100644
--- 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 = "r1"
+PR = "r2"
 
 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 ringtone_classy.wav notify_doorbell.wav startup_openmoko.wav; do
+        for i in touchscreen_click.wav ringtone_classy.wav notify_doorbell.wav startup_unintrusive.wav; do
                 cp -f ${S}/$i ${D}${datadir}/openmoko/sounds/
         done
 }