From 85122f1d148655675eaa902dbaf50f0fb147e20f Mon Sep 17 00:00:00 2001 From: Taeyoon Date: Tue, 3 Jun 2014 19:01:51 +0900 Subject: [PATCH] Conversion to Apache 2.0 license Change-Id: I22352f7663903944c445d3498fffcfb2c65f5549 --- LICENSE | 0 .../TET/dali-internal-test-suite/master-makefile.mk | 6 +++--- .../TET/dali-test-suite/master-makefile.mk | 6 +++--- build/tizen/Makefile.am | 6 +++--- build/tizen/common/Makefile.am | 6 +++--- build/tizen/configure.ac | 6 +++--- build/tizen/dali-adaptor/Makefile.am | 12 +++++++----- build/tizen/dali-application.pc.in | 2 +- build/tizen/dali-application/Makefile.am | 6 +++--- build/tizen/dali-evas.pc.in | 2 +- build/tizen/dali-evas/Makefile.am | 6 +++--- build/tizen/dali-livebox.pc.in | 2 +- build/tizen/dali-livebox/Makefile.am | 6 +++--- build/tizen/dali-native-buffer.pc.in | 2 +- build/tizen/dali-native-buffer/Makefile.am | 6 +++--- build/tizen/dali.pc.in | 2 +- build/tizen/plugins/Makefile.am | 6 +++--- 17 files changed, 42 insertions(+), 40 deletions(-) mode change 100644 => 100755 LICENSE diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 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 f82b1296f..10d703439 100644 --- 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 c25c00db7..467909751 100644 --- 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 675808e64..ddce45387 100644 --- 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 3d417831f..9dcdb3240 100644 --- 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 e706e0256..58ad05361 100644 --- 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 dbf5a29ef..1d8e20070 100644 --- 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 6d7a6aede..4d8957b3a 100644 --- 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 c00beaca2..e33d88f32 100644 --- 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 23eb1dfdf..54424c898 100644 --- 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 fb474a1bc..938f36a99 100644 --- 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 1b3454659..1a0949838 100644 --- 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 f127cff74..29f938c51 100644 --- 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 d6b4a9e62..07ad8b5f1 100644 --- 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 8a4158a50..c34c6660c 100644 --- 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 6d7a6aede..4d8957b3a 100644 --- 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 5ac1735e9..44746e1a2 100644 --- 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. -- 2.34.1