diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-10-12 11:37:45 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-10-12 11:37:45 +0000 |
| commit | 1c5df3f485ba9992931e06d07f28c57a29d89e5e (patch) | |
| tree | f1f786842f479fcdef015d6bfb430f8ea599fac1 /packages/openmoko2 | |
| parent | d6fd6d24ea9cef7d661bed9424f54a7719bea5dc (diff) | |
| parent | 276e2ad3fd901d3fca0291979abc9c10455232ee (diff) | |
propagate from branch 'org.openembedded.dev' (head 7c2dfd8725acfc6de0286a17d58cccbfa6c141f8)
to branch 'org.openembedded.dev.avr32' (head 6a2246abf3d894c89fc60280e99b73072b879e02)
Diffstat (limited to 'packages/openmoko2')
4 files changed, 8 insertions, 4 deletions
diff --git a/packages/openmoko2/libmokojournal2_svn.bb b/packages/openmoko2/libmokojournal2_svn.bb index 6e5383af83..09e249ff4f 100644 --- a/packages/openmoko2/libmokojournal2_svn.bb +++ b/packages/openmoko2/libmokojournal2_svn.bb @@ -5,6 +5,10 @@ PR = "r2" inherit openmoko2 lib_package +do_configure_prepend() { + touch gtk-doc.make +} + do_stage() { autotools_stage_all } diff --git a/packages/openmoko2/openmoko-sound-system2/session b/packages/openmoko2/openmoko-sound-system2/session index dfef83d934..ed2346d55f 100644 --- a/packages/openmoko2/openmoko-sound-system2/session +++ b/packages/openmoko2/openmoko-sound-system2/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/openmoko2/openmoko-sound-system2_0.1.0.bb b/packages/openmoko2/openmoko-sound-system2_0.1.0.bb index 35bfe66318..57b72af4b6 100644 --- a/packages/openmoko2/openmoko-sound-system2_0.1.0.bb +++ b/packages/openmoko2/openmoko-sound-system2_0.1.0.bb @@ -12,7 +12,7 @@ RDEPENDS = "\ " RREPLACES = "openmoko-sound-system" RPROVIDES = "openmoko-sound-system" -PR = "r1" +PR = "r2" inherit openmoko-base update-rc.d diff --git a/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb b/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb index 0693b9bb8a..1cfb519c99 100644 --- a/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb +++ b/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb @@ -3,7 +3,7 @@ SECTION = "openmoko/base" RREPLACES = "openmoko-sound-theme-standard" RPROVIDES = "openmoko-sound-theme-standard" PV = "0.1+svnr${SRCREV}" -PR = "r1" +PR = "r2" inherit openmoko2 autotools @@ -16,7 +16,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 } |