change flora license, manifest * tag

Change-Id: I9ca019ca84bb1dc848887868ff12c49c51454c2a

diff --git a/LICENSE.Flora b/LICENSE.Flora
index fd90a36..571fe79 100755 (executable)
--- a/LICENSE.Flora
+++ b/LICENSE.Flora
@@ -1,6 +1,6 @@
 Flora License
 
-Version 1.0, April, 2013
+Version 1.1, April, 2013
 
 http://floralicense.org/license/
 
@@ -119,17 +119,17 @@ Object form, provided that You meet the following conditions:
      Derivative Works; or, within a display generated by the Derivative Works,
      if and wherever such third-party notices normally appear.
      The contents of the NOTICE file are for informational purposes only
-     and do not modify the License.
-
-You may add Your own attribution notices within Derivative Works
-that You distribute, alongside or as an addendum to the NOTICE text
-from the Work, provided that such additional attribution notices
-cannot be construed as modifying the License. You may add Your own
-copyright statement to Your modifications and may provide additional or
-different license terms and conditions for use, reproduction, or
-distribution of Your modifications, or for any such Derivative Works
-as a whole, provided Your use, reproduction, and distribution of
-the Work otherwise complies with the conditions stated in this License.
+     and do not modify the License. You may add Your own attribution notices 
+     within Derivative Works that You distribute, alongside or as an addendum 
+     to the NOTICE text from the Work, provided that such additional attribution 
+     notices cannot be construed as modifying the License. You may add Your own
+     copyright statement to Your modifications and may provide additional or
+     different license terms and conditions for use, reproduction, or
+     distribution of Your modifications, or for any such Derivative Works
+     as a whole, provided Your use, reproduction, and distribution of
+     the Work otherwise complies with the conditions stated in this License
+     and your own copyright statement or terms and conditions do not conflict
+     the conditions stated in the License including section 3.
 
 5. Submission of Contributions. Unless You explicitly state otherwise,
 any Contribution intentionally submitted for inclusion in the Work
@@ -192,7 +192,7 @@ identification within third-party archives.
 
    Copyright [yyyy] [name of copyright owner]
 
-   Licensed under the Flora License, Version 1.0 (the "License");
+   Licensed under the Flora License, Version 1.1 (the "License");
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 

diff --git a/NOTICE b/NOTICE
index 3997999..94d56df 100755 (executable)
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,3 @@
-Copyright (c) Samsung Electronics Co., Ltd. All rights reserved.
-Except as noted, this software is licensed under Flora License, Version 1.
-Please, see the LICENSE file for Flora License terms and conditions.
-
+Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved.
+Except as noted, this software is licensed under Flora License, Version 1.1
+Please, see the LICENSE.Flora file for Flora License, Version 1.1 terms and conditions.

diff --git a/libttssmt.manifest b/libttssmt.manifest
index 357525a..b6de022 100755 (executable)
--- a/libttssmt.manifest
+++ b/libttssmt.manifest
@@ -10,37 +10,32 @@
        </request>
        <assign>
                <filesystem path="/usr/share/voice/tts/smt_vdata" label="tts-engine-samsung::vdata"/>
-               <filesystem path="/usr/share/voice/tts/smt_vdata/smt_de_DE.dic" label="tts-engine-samsung::vdata"/>
+               <filesystem path="/usr/share/voice/tts/smt_vdata/smt_de_DE.lng" label="tts-engine-samsung::vdata"/>
                <filesystem path="/usr/share/voice/tts/smt_vdata/smt_de_DE_f01.am" label="tts-engine-samsung::vdata"/>
                <filesystem path="/usr/share/voice/tts/smt_vdata/smt_de_DE_f01.cfg" label="tts-engine-samsung::vdata"/>
                <filesystem path="/usr/share/voice/tts/smt_vdata/smt_de_DE_f01.dt" label="tts-engine-samsung::vdata"/>
                <filesystem path="/usr/share/voice/tts/smt_vdata/smt_de_DE_f01.qs" label="tts-engine-samsung::vdata"/>
-               <filesystem path="/usr/share/voice/tts/smt_vdata/smt_en_GB_f01.am" label="tts-engine-samsung::vdata"/>
-               <filesystem path="/usr/share/voice/tts/smt_vdata/smt_en_GB_f01.cfg" label="tts-engine-samsung::vdata"/>
-               <filesystem path="/usr/share/voice/tts/smt_vdata/smt_en_GB_f01.dt" label="tts-engine-samsung::vdata"/>
-               <filesystem path="/usr/share/voice/tts/smt_vdata/smt_en_GB_f01.qs" label="tts-engine-samsung::vdata"/>
-               <filesystem path="/usr/share/voice/tts/smt_vdata/smt_en_GB.lng" label="tts-engine-samsung::vdata"/>
+               <filesystem path="/usr/share/voice/tts/smt_vdata/smt_en_US.lng" label="tts-engine-samsung::vdata"/>
                <filesystem path="/usr/share/voice/tts/smt_vdata/smt_en_US_f01.am" label="tts-engine-samsung::vdata"/>
                <filesystem path="/usr/share/voice/tts/smt_vdata/smt_en_US_f01.cfg" label="tts-engine-samsung::vdata"/>
                <filesystem path="/usr/share/voice/tts/smt_vdata/smt_en_US_f01.dt" label="tts-engine-samsung::vdata"/>
                <filesystem path="/usr/share/voice/tts/smt_vdata/smt_en_US_f01.qs" label="tts-engine-samsung::vdata"/>
-               <filesystem path="/usr/share/voice/tts/smt_vdata/smt_en_US.lng" label="tts-engine-samsung::vdata"/>
-               <filesystem path="/usr/share/voice/tts/smt_vdata/smt_en_US.pos" label="tts-engine-samsung::vdata"/>
-               <filesystem path="/usr/share/voice/tts/smt_vdata/smt_es_ES.dic" label="tts-engine-samsung::vdata"/>
+               <filesystem path="/usr/share/voice/tts/smt_vdata/smt_es_ES.lng" label="tts-engine-samsung::vdata"/>
                <filesystem path="/usr/share/voice/tts/smt_vdata/smt_es_ES_f01.am" label="tts-engine-samsung::vdata"/>
                <filesystem path="/usr/share/voice/tts/smt_vdata/smt_es_ES_f01.cfg" label="tts-engine-samsung::vdata"/>
                <filesystem path="/usr/share/voice/tts/smt_vdata/smt_es_ES_f01.dt" label="tts-engine-samsung::vdata"/>
                <filesystem path="/usr/share/voice/tts/smt_vdata/smt_es_ES_f01.qs" label="tts-engine-samsung::vdata"/>
-               <filesystem path="/usr/share/voice/tts/smt_vdata/smt_fr_FR.dic" label="tts-engine-samsung::vdata"/>
+               <filesystem path="/usr/share/voice/tts/smt_vdata/smt_fr_FR.lng" label="tts-engine-samsung::vdata"/>
                <filesystem path="/usr/share/voice/tts/smt_vdata/smt_fr_FR_f01.am" label="tts-engine-samsung::vdata"/>
                <filesystem path="/usr/share/voice/tts/smt_vdata/smt_fr_FR_f01.cfg" label="tts-engine-samsung::vdata"/>
                <filesystem path="/usr/share/voice/tts/smt_vdata/smt_fr_FR_f01.dt" label="tts-engine-samsung::vdata"/>
                <filesystem path="/usr/share/voice/tts/smt_vdata/smt_fr_FR_f01.qs" label="tts-engine-samsung::vdata"/>
+               <filesystem path="/usr/share/voice/tts/smt_vdata/smt_it_IT.lng" label="tts-engine-samsung::vdata"/>
                <filesystem path="/usr/share/voice/tts/smt_vdata/smt_it_IT_f01.am" label="tts-engine-samsung::vdata"/>
                <filesystem path="/usr/share/voice/tts/smt_vdata/smt_it_IT_f01.cfg" label="tts-engine-samsung::vdata"/>
                <filesystem path="/usr/share/voice/tts/smt_vdata/smt_it_IT_f01.dt" label="tts-engine-samsung::vdata"/>
                <filesystem path="/usr/share/voice/tts/smt_vdata/smt_it_IT_f01.qs" label="tts-engine-samsung::vdata"/>
-               <filesystem path="/usr/share/voice/tts/smt_vdata/smt_it_IT.lng" label="tts-engine-samsung::vdata"/>
+               <filesystem path="/usr/share/voice/tts/smt_vdata/smt_ko_KR.lng" label="tts-engine-samsung::vdata"/>
                <filesystem path="/usr/share/voice/tts/smt_vdata/smt_ko_KR_f01.am" label="tts-engine-samsung::vdata"/>
                <filesystem path="/usr/share/voice/tts/smt_vdata/smt_ko_KR_f01.cfg" label="tts-engine-samsung::vdata"/>
                <filesystem path="/usr/share/voice/tts/smt_vdata/smt_ko_KR_f01.dt" label="tts-engine-samsung::vdata"/>
@@ -49,17 +44,5 @@
                <filesystem path="/usr/share/voice/tts/smt_vdata/smt_ko_KR_f02.cfg" label="tts-engine-samsung::vdata"/>
                <filesystem path="/usr/share/voice/tts/smt_vdata/smt_ko_KR_f02.dt" label="tts-engine-samsung::vdata"/>
                <filesystem path="/usr/share/voice/tts/smt_vdata/smt_ko_KR_f02.qs" label="tts-engine-samsung::vdata"/>
-               <filesystem path="/usr/share/voice/tts/smt_vdata/smt_ko_KR.lng" label="tts-engine-samsung::vdata"/>
-               <filesystem path="/usr/share/voice/tts/smt_vdata/smt_zh_CN.cart" label="tts-engine-samsung::vdata"/>
-               <filesystem path="/usr/share/voice/tts/smt_vdata/smt_zh_CN_f01.am" label="tts-engine-samsung::vdata"/>
-               <filesystem path="/usr/share/voice/tts/smt_vdata/smt_zh_CN_f01.cfg" label="tts-engine-samsung::vdata"/>
-               <filesystem path="/usr/share/voice/tts/smt_vdata/smt_zh_CN_f01.dt" label="tts-engine-samsung::vdata"/>
-               <filesystem path="/usr/share/voice/tts/smt_vdata/smt_zh_CN_f01.qs" label="tts-engine-samsung::vdata"/>
-               <filesystem path="/usr/share/voice/tts/smt_vdata/smt_zh_CN.pb" label="tts-engine-samsung::vdata"/>
-               <filesystem path="/usr/share/voice/tts/smt_vdata/smt_en_US_dict.lng" label="tts-engine-samsung::vdata"/>
-               <filesystem path="/usr/share/voice/tts/smt_vdata/smt_en_US_dict_f01.am" label="tts-engine-samsung::vdata"/>
-               <filesystem path="/usr/share/voice/tts/smt_vdata/smt_en_US_dict_f01.cfg" label="tts-engine-samsung::vdata"/>
-               <filesystem path="/usr/share/voice/tts/smt_vdata/smt_en_US_dict_f01.dt" label="tts-engine-samsung::vdata"/>
-               <filesystem path="/usr/share/voice/tts/smt_vdata/smt_en_US_dict_f01.qs" label="tts-engine-samsung::vdata"/>
        </assign>
 </manifest>

diff --git a/packaging/libttssmt.spec b/packaging/libttssmt.spec
index 698d0a8..84f7a23 100755 (executable)
--- a/packaging/libttssmt.spec
+++ b/packaging/libttssmt.spec
@@ -6,7 +6,7 @@
 
 Name:       libttssmt
 Summary:    Text To Speech smt plugin shared library
-Version:    0.0.31
+Version:    0.0.32
 Release:    1
 Group:      TO_BE/FILLED_IN
 License:    TO_BE/FILLED_IN

diff --git a/src/SMTApis.h b/src/SMTApis.h
index 0e4d1b7..a924edb 100755 (executable)
--- a/src/SMTApis.h
+++ b/src/SMTApis.h
@@ -2,7 +2,7 @@
  * Samsung TTS\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the License);\r
+ * Licensed under the Flora License, Version 1.1 (the License);\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/src/_SlpSmtApis.cpp b/src/_SlpSmtApis.cpp
index 676d89d..f179221 100755 (executable)
--- a/src/_SlpSmtApis.cpp
+++ b/src/_SlpSmtApis.cpp
@@ -2,7 +2,7 @@
  * Samsung TTS\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the License);\r
+ * Licensed under the Flora License, Version 1.1 (the License);\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/src/_SlpSmtApis.h b/src/_SlpSmtApis.h
index d34e4e0..afd6576 100755 (executable)
--- a/src/_SlpSmtApis.h
+++ b/src/_SlpSmtApis.h
@@ -2,7 +2,7 @@
  * Samsung TTS\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the License);\r
+ * Licensed under the Flora License, Version 1.1 (the License);\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/src/plugin_internal.cpp b/src/plugin_internal.cpp
index 28f593c..65e6565 100755 (executable)
--- a/src/plugin_internal.cpp
+++ b/src/plugin_internal.cpp
@@ -2,7 +2,7 @@
  * Samsung TTS\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the License);\r
+ * Licensed under the Flora License, Version 1.1 (the License);\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/src/plugin_internal.h b/src/plugin_internal.h
index 99cb633..50f8015 100755 (executable)
--- a/src/plugin_internal.h
+++ b/src/plugin_internal.h
@@ -2,7 +2,7 @@
  * Samsung TTS\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the License);\r
+ * Licensed under the Flora License, Version 1.1 (the License);\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/src/ttsp.c b/src/ttsp.c
index 51bfc5b..756e612 100755 (executable)
--- a/src/ttsp.c
+++ b/src/ttsp.c
@@ -2,7 +2,7 @@
  * Samsung TTS\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the License);\r
+ * Licensed under the Flora License, Version 1.1 (the License);\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r