[oe-commits] org.oe.dev speech-dispatcher: Fix packaging of configfiles

[coredump2 commit]

speech-dispatcher: Fix packaging of configfiles

Author: coredump2 at openembedded.org
Branch: org.openembedded.dev
Revision: a97c52f271b18a7c7146382c7acc35a108bda245
ViewMTN: http://monotone.openembedded.org/revision/info/a97c52f271b18a7c7146382c7acc35a108bda245
Files:
1
packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch
packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
Diffs:

#
# mt diff -rba35013b9a274dcbd98dc61f4e2cee3cfe2889f2 -ra97c52f271b18a7c7146382c7acc35a108bda245
#
# 
# 
# patch "packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch"
#  from [650d7137523155d7c1eb3931d5d362d1ba96849c]
#    to [001e9d4108977248cedd50752029192824293596]
# 
# patch "packages/speech-dispatcher/speech-dispatcher_0.6.5.bb"
#  from [2c7cce801f4545669639d5346c2af202d79f813d]
#    to [c0404c61c7a8cf7050862abc2771e72e634cf323]
# 
============================================================
--- packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch	650d7137523155d7c1eb3931d5d362d1ba96849c
+++ packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch	001e9d4108977248cedd50752029192824293596
@@ -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"
============================================================
--- packages/speech-dispatcher/speech-dispatcher_0.6.5.bb	2c7cce801f4545669639d5346c2af202d79f813d
+++ packages/speech-dispatcher/speech-dispatcher_0.6.5.bb	c0404c61c7a8cf7050862abc2771e72e634cf323
@@ -5,7 +5,7 @@ RPROVIDES_${PN} += "speechd"
 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
 }