speech-dispatcher: Fix packaging of configfiles

diff --git a/packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch b/packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch
index f8f135d..c4a7f91 100644 (file)
--- a/packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch
+++ b/packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch
@@ -1,5 +1,5 @@
---- speech-dispatcher-0.6.5/config/speechd.conf.in.orig        2008-01-05 15:07:08.000000000 +0000
-+++ speech-dispatcher-0.6.5/config/speechd.conf.in     2008-01-05 15:08:00.000000000 +0000
+--- speech-dispatcher-0.6.5/config/speechd.conf.in.orig        2008-01-05 16:38:53.000000000 +0000
++++ speech-dispatcher-0.6.5/config/speechd.conf.in     2008-01-05 16:40:45.000000000 +0000
 @@ -36,7 +36,7 @@
  # DO NOT COMMENT OUT THIS OPTION, SET IT TO "default" if you do not
  # want to influence it.
@@ -9,12 +9,14 @@
  #LogDir  "/var/log/speech-dispatcher/"
  #LogDir  "stdout"
  
-@@ -130,8 +130,8 @@
+@@ -129,9 +129,9 @@
+ #  - configuration is the path to the config file of this module,
  #    either relative (to etc/speechd/modules/) or absolute
  
- AddModule "espeak"       "sd_espeak"   "espeak.conf"
+-AddModule "espeak"       "sd_espeak"   "espeak.conf"
 -AddModule "festival"     "sd_festival"  "festival.conf"
 -AddModule "flite"        "sd_flite"     "flite.conf"
++AddModule "espeak"       "sd_espeak"   "/etc/speech-dispatcher/modules/espeak.conf"
 +#AddModule "festival"     "sd_festival"  "festival.conf"
 +#AddModule "flite"        "sd_flite"     "flite.conf"
  #AddModule "espeak-generic" "sd_generic" "espeak-generic.conf"

diff --git a/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb b/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
index 4b49870..d8e2b8e 100644 (file)
--- a/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
+++ b/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
 DEPENDS = "flite libdotconf glib-2.0"
 RPROVIDES_${PN} += "speechd"
 
-PR = "r4"
+PR = "r5"
 
 inherit autotools update-rc.d
 
@@ -24,9 +24,10 @@ do_install() {
         install -d ${D}${bindir}
         install -d ${D}${includedir}
         install -d ${D}${libdir}/${PN}-modules
-       install -d ${D}${sysconfdir}
-       install -d ${D}${sysconfdir}/modules
+       install -d ${D}${sysconfdir}    
        install -d ${D}${sysconfdir}/init.d
+       install -d ${D}${sysconfdir}/speech-dispatcher
+       install -d ${D}${sysconfdir}/speech-dispatcher/modules
 
         oe_libinstall -so -C src/audio libsdaudio ${D}${libdir}
         oe_libinstall -so -C src/c/api libspeechd ${D}${libdir}
@@ -37,8 +38,8 @@ do_install() {
         install -m 0755 ${S}/src/server/.libs/speech-dispatcher  ${D}${bindir}
         install -m 0755 ${S}/src/modules/.libs/sd_*   ${D}${libdir}/${PN}-modules/
        
-       install -m 0644 ${S}/config/speechd.conf ${D}${sysconfdir}
-       install -m 0644 ${S}/config/modules/*.conf ${D}${sysconfdir}/modules
+       install -m 0644 ${S}/config/speechd.conf ${D}${sysconfdir}/speech-dispatcher
+       install -m 0644 ${S}/config/modules/*.conf ${D}${sysconfdir}/speech-dispatcher/modules
        install -m 0755 ${WORKDIR}/speech-dispatcher.init ${D}${sysconfdir}/init.d/speech-dispatcher
 }