Conversion to Apache 2.0 license

Change-Id: I22352f7663903944c445d3498fffcfb2c65f5549

diff --git a/LICENSE b/LICENSE
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/automated-tests/TET/dali-internal-test-suite/master-makefile.mk b/automated-tests/TET/dali-internal-test-suite/master-makefile.mk
index f82b1296fe7c7e5a1271008575c265252c699240..10d703439fd1c461e8bb5c538df12a126f091390 100644 (file)
--- a/automated-tests/TET/dali-internal-test-suite/master-makefile.mk
+++ b/automated-tests/TET/dali-internal-test-suite/master-makefile.mk
@@ -1,14 +1,14 @@
 #
 # Copyright (c) 2014 Samsung Electronics Co., Ltd.
 #
-# Licensed under the Flora License, Version 1.0 (the License);
+# Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://floralicense.org/license/
+# http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an AS IS BASIS,
+# distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.

diff --git a/automated-tests/TET/dali-test-suite/master-makefile.mk b/automated-tests/TET/dali-test-suite/master-makefile.mk
index c25c00db70185f23a8d4b20b4618be187364aa92..467909751cb591b82bfe461904e1fe4aea77f72c 100644 (file)
--- a/automated-tests/TET/dali-test-suite/master-makefile.mk
+++ b/automated-tests/TET/dali-test-suite/master-makefile.mk
@@ -1,14 +1,14 @@
 #
 # Copyright (c) 2014 Samsung Electronics Co., Ltd.
 #
-# Licensed under the Flora License, Version 1.0 (the License);
+# Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://floralicense.org/license/
+# http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an AS IS BASIS,
+# distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.

diff --git a/build/tizen/Makefile.am b/build/tizen/Makefile.am
index 675808e647fc6466eec7f8e97419be4042811ede..ddce45387ccf1fd94eb3d32c3b3e877694344093 100644 (file)
--- a/build/tizen/Makefile.am
+++ b/build/tizen/Makefile.am
@@ -1,14 +1,14 @@
 #
 # Copyright (c) 2014 Samsung Electronics Co., Ltd.
 #
-# Licensed under the Flora License, Version 1.0 (the License);
+# Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://floralicense.org/license/
+# http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an AS IS BASIS,
+# distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.

diff --git a/build/tizen/common/Makefile.am b/build/tizen/common/Makefile.am
index 3d417831fe98a0ff2a7c5ecbe8018a93ba8e65ee..9dcdb3240dc247a565e3584b1eb8277be340a5be 100644 (file)
--- a/build/tizen/common/Makefile.am
+++ b/build/tizen/common/Makefile.am
@@ -1,14 +1,14 @@
 #
 # Copyright (c) 2014 Samsung Electronics Co., Ltd.
 #
-# Licensed under the Flora License, Version 1.0 (the License);
+# Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://floralicense.org/license/
+# http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an AS IS BASIS,
+# distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.

diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index e706e02562f29f3c66f106036d0fbbd1010c7074..58ad0536149ffd61b89c766b2d864734e67b694c 100644 (file)
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@ -1,14 +1,14 @@
 #
 # Copyright (c) 2014 Samsung Electronics Co., Ltd.
 #
-# Licensed under the Flora License, Version 1.0 (the License);
+# Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://floralicense.org/license/
+# http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an AS IS BASIS,
+# distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.

diff --git a/build/tizen/dali-adaptor/Makefile.am b/build/tizen/dali-adaptor/Makefile.am
index dbf5a29efdde63fb49db5bc8f17f6f3a8b73c419..1d8e200700c79fbb0056991ae2249b419c26d18e 100644 (file)
--- a/build/tizen/dali-adaptor/Makefile.am
+++ b/build/tizen/dali-adaptor/Makefile.am
@@ -1,14 +1,14 @@
 #
 # Copyright (c) 2014 Samsung Electronics Co., Ltd.
 #
-# Licensed under the Flora License, Version 1.0 (the License);
+# Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://floralicense.org/license/
+# http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an AS IS BASIS,
+# distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
@@ -41,14 +41,14 @@ libdali_adaptor_la_SOURCES = $(tizen_application_public_api_src_files)
 
 if MOBILE_PROFILE
 libdali_adaptor_la_SOURCES += $(tizen_evas_plugin_public_api_src_files) \
-                                                                                                                       $(tizen_native_buffer_plugin_public_api_src_files)
+                              $(tizen_native_buffer_plugin_public_api_src_files)
 endif
 
 libdali_adaptor_la_SOURCES += $(tizen_application_internal_src_files)
 
 if MOBILE_PROFILE
 libdali_adaptor_la_SOURCES += $(tizen_evas_plugin_internal_src_files) \
-                                                                                                                       $(tizen_native_buffer_plugin_internal_src_files)
+                              $(tizen_native_buffer_plugin_internal_src_files)
 endif
 
 libdali_adaptor_la_DEPENDENCIES =
@@ -109,6 +109,8 @@ libdali_adaptor_la_LIBADD += \
                       $(NATIVE_BUFFER_POOL_LIBS)
 endif
 
+
+
 install-data-local:
        $(MKDIR_P) ${DESTDIR}/${daliUserFontCacheDir}
 

diff --git a/build/tizen/dali-application.pc.in b/build/tizen/dali-application.pc.in
index 6d7a6aede0c95d353ec9822968fb2b2d8c4914bd..4d8957b3a8e47b2fa29b0d29c8dc175b650e47cf 100644 (file)
--- a/build/tizen/dali-application.pc.in
+++ b/build/tizen/dali-application.pc.in
@@ -7,6 +7,6 @@ includedir=@devincludepath@
 Name: Samsung OpenGLES Toolkit Adaptor
 Description: 3D Canvas Toolkit using OpenGLES (with the adaptor)
 Version: ${apiversion}
-Requires: freetype2,fontconfig,libpng,gles20,x11,dali-core,elementary,libxml-2.0
+Requires: dali-core
 Libs: -L${libdir} -ldali-application -ldali-adaptor-common
 Cflags: -I${includedir}/dali -DDALI_APPLICATION

diff --git a/build/tizen/dali-application/Makefile.am b/build/tizen/dali-application/Makefile.am
index c00beaca29e76c240484e4716b07ecf0d45dabb3..e33d88f32e08b941850f79ff4bd205bd47fd1cac 100644 (file)
--- a/build/tizen/dali-application/Makefile.am
+++ b/build/tizen/dali-application/Makefile.am
@@ -1,14 +1,14 @@
 #
 # Copyright (c) 2014 Samsung Electronics Co., Ltd.
 #
-# Licensed under the Flora License, Version 1.0 (the License);
+# Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://floralicense.org/license/
+# http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an AS IS BASIS,
+# distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.

diff --git a/build/tizen/dali-evas.pc.in b/build/tizen/dali-evas.pc.in
index 23eb1dfdfbb485060578e4bbda028545183e40ad..54424c89895f047eb5761dba756e0bc56cd050ee 100644 (file)
--- a/build/tizen/dali-evas.pc.in
+++ b/build/tizen/dali-evas.pc.in
@@ -7,6 +7,6 @@ includedir=@devincludepath@
 Name: Samsung OpenGLES Toolkit Adaptor
 Description: 3D Canvas Toolkit using OpenGLES (with EvasPlugin adaptor)
 Version: ${apiversion}
-Requires: freetype2,fontconfig,libpng,gles20,x11,dali-core,elementary,libxml-2.0
+Requires: dali-core
 Libs: -L${libdir} -ldali-evas-plugin -ldali-adaptor-common
 Cflags: -I${includedir}/dali -DDALI_EVAS_PLUGIN

diff --git a/build/tizen/dali-evas/Makefile.am b/build/tizen/dali-evas/Makefile.am
index fb474a1bc26c5300081b69f11b5a7830e4e70ee9..938f36a99d1177ca5582ffcb93108092bba7d922 100644 (file)
--- a/build/tizen/dali-evas/Makefile.am
+++ b/build/tizen/dali-evas/Makefile.am
@@ -1,14 +1,14 @@
 #
 # Copyright (c) 2014 Samsung Electronics Co., Ltd.
 #
-# Licensed under the Flora License, Version 1.0 (the License);
+# Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://floralicense.org/license/
+# http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an AS IS BASIS,
+# distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.

diff --git a/build/tizen/dali-livebox.pc.in b/build/tizen/dali-livebox.pc.in
index 1b3454659924100a10f967bcf58b7158b7ba0b63..1a09498385f0eca2b24b335639e90abeb86ad6da 100644 (file)
--- a/build/tizen/dali-livebox.pc.in
+++ b/build/tizen/dali-livebox.pc.in
@@ -7,6 +7,6 @@ includedir=@devincludepath@
 Name: Samsung OpenGLES Toolkit Adaptor
 Description: 3D Canvas Toolkit using OpenGLES (with the Livebox adaptor)
 Version: ${apiversion}
-Requires: freetype2,fontconfig,libpng,opengl-es-20,x11,dali-core,elementary,libxml-2.0
+Requires: dali-core
 Libs: -L${libdir} -ldali-livebox-plugin -ldali-adaptor-common
 Cflags: -I${includedir}/dali -DDALI_LIVEBOX_PLUGIN

diff --git a/build/tizen/dali-livebox/Makefile.am b/build/tizen/dali-livebox/Makefile.am
index f127cff74fa9f0dbabaf91337472b2a639db028e..29f938c51d7c6edb3fef5bd0c132bc15856908cb 100644 (file)
--- a/build/tizen/dali-livebox/Makefile.am
+++ b/build/tizen/dali-livebox/Makefile.am
@@ -1,14 +1,14 @@
 #
 # Copyright (c) 2014 Samsung Electronics Co., Ltd.
 #
-# Licensed under the Flora License, Version 1.0 (the License);
+# Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://floralicense.org/license/
+# http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an AS IS BASIS,
+# distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.

diff --git a/build/tizen/dali-native-buffer.pc.in b/build/tizen/dali-native-buffer.pc.in
index d6b4a9e62f82326476790d0f6541d3e55153ad76..07ad8b5f1296937e6df1ecaf839efba50f851b4f 100644 (file)
--- a/build/tizen/dali-native-buffer.pc.in
+++ b/build/tizen/dali-native-buffer.pc.in
@@ -7,6 +7,6 @@ includedir=@devincludepath@
 Name: Samsung OpenGLES Toolkit Adaptor
 Description: 3D Canvas Toolkit using OpenGLES (with the Native Buffer adaptor)
 Version: ${apiversion}
-Requires: freetype2,fontconfig,libpng,gles20,x11,dali-core,elementary,libxml-2.0,native-buffer,native-buffer-pool
+Requires: dali-core,native-buffer,native-buffer-pool
 Libs: -L${libdir} -ldali-native-buffer-plugin -ldali-adaptor-common
 Cflags: -I${includedir}/dali -DDALI_NATIVE_BUFFER_PLUGIN

diff --git a/build/tizen/dali-native-buffer/Makefile.am b/build/tizen/dali-native-buffer/Makefile.am
index 8a4158a50252d760bef06c31ad7e7b9d0e05ccf4..c34c6660ca11ffd332b1836049c774110a380111 100644 (file)
--- a/build/tizen/dali-native-buffer/Makefile.am
+++ b/build/tizen/dali-native-buffer/Makefile.am
@@ -1,14 +1,14 @@
 #
 # Copyright (c) 2014 Samsung Electronics Co., Ltd.
 #
-# Licensed under the Flora License, Version 1.0 (the License);
+# Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://floralicense.org/license/
+# http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an AS IS BASIS,
+# distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.

diff --git a/build/tizen/dali.pc.in b/build/tizen/dali.pc.in
index 6d7a6aede0c95d353ec9822968fb2b2d8c4914bd..4d8957b3a8e47b2fa29b0d29c8dc175b650e47cf 100644 (file)
--- a/build/tizen/dali.pc.in
+++ b/build/tizen/dali.pc.in
@@ -7,6 +7,6 @@ includedir=@devincludepath@
 Name: Samsung OpenGLES Toolkit Adaptor
 Description: 3D Canvas Toolkit using OpenGLES (with the adaptor)
 Version: ${apiversion}
-Requires: freetype2,fontconfig,libpng,gles20,x11,dali-core,elementary,libxml-2.0
+Requires: dali-core
 Libs: -L${libdir} -ldali-application -ldali-adaptor-common
 Cflags: -I${includedir}/dali -DDALI_APPLICATION

diff --git a/build/tizen/plugins/Makefile.am b/build/tizen/plugins/Makefile.am
index 5ac1735e959fd31cfe4ae819b735a3ba7fd52acc..44746e1a22c988d8346aa96266d14843b5108f06 100644 (file)
--- a/build/tizen/plugins/Makefile.am
+++ b/build/tizen/plugins/Makefile.am
@@ -1,14 +1,14 @@
 #
 # Copyright (c) 2014 Samsung Electronics Co., Ltd.
 #
-# Licensed under the Flora License, Version 1.0 (the License);
+# Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://floralicense.org/license/
+# http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an AS IS BASIS,
+# distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.