From: ByungWoo Lee Date: Wed, 3 Jun 2015 03:55:35 +0000 (+0900) Subject: Modify license and group X-Git-Tag: submit/tizen/20150603.062006^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=87c2bf985b87b18d4860baef21d744fcd43df2d8;p=platform%2Fcore%2Fapi%2Fcommon.git Modify license and group Change-Id: Iedd1239d06db2b187fdf906ec0ec27eb8e7e2adb --- diff --git a/LICENSE b/LICENSE index bbe9d02..6e529a2 100755 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,3 @@ -Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. Apache License Version 2.0, January 2004 diff --git a/include/tizen_error.h b/include/tizen_error.h index a226ec7..efec872 100755 --- a/include/tizen_error.h +++ b/include/tizen_error.h @@ -150,6 +150,8 @@ extern "C" { #define TIZEN_ERROR_MEDIACODEC -0x019B0000 /* Tizen Metadata Editor Error */ #define TIZEN_ERROR_METADATA_EDITOR -0x019C0000 +/* Tizen Media Vision Error */ +#define TIZEN_ERROR_MEDIA_VISION -0x019D0000 /* Tizen Bluetooth Error */ #define TIZEN_ERROR_BLUETOOTH -0x01C00000 /* Tizen Connection Error */ @@ -350,8 +352,7 @@ typedef enum TIZEN_ERROR_TIMED_OUT, /**< Time out */ TIZEN_ERROR_NOT_SUPPORTED, /**< Not supported */ TIZEN_ERROR_USER_NOT_CONSENTED, /**< Not Consented */ - TIZEN_ERROR_END_OF_COLLECTION, - TIZEN_ERROR_NOT_SUPPORT_API = TIZEN_ERROR_NOT_SUPPORTED /**< TIZEN_ERROR_NOT_SUPPORT_API is deprecated */ + TIZEN_ERROR_END_OF_COLLECTION } tizen_error_e; diff --git a/packaging/capi-base-common.spec b/packaging/capi-base-common.spec index 463cb47..20ab73e 100644 --- a/packaging/capi-base-common.spec +++ b/packaging/capi-base-common.spec @@ -1,8 +1,8 @@ Name: capi-base-common Summary: Common header files of Tizen Native API -Version: 0.1.9 -Release: 0 -Group: System/API +Version: 0.2.0 +Release: 1 +Group: System/Libraries License: Apache-2.0 Source0: %{name}-%{version}.tar.gz Source1001: capi-base-common.manifest @@ -15,8 +15,9 @@ Requires(postun): /sbin/ldconfig This is Common header files of Tizen Native API %package devel -Summary: Common header files of Tizen Native API (Development) -Group: System/API +License: Apache-2.0 +Summary: Common header files of Tizen Native API (Development) +Group: System/Libraries Requires: %{name} = %{version}-%{release} %description devel diff --git a/src/tizen_error.c b/src/tizen_error.c index 9d830f7..19366f1 100755 --- a/src/tizen_error.c +++ b/src/tizen_error.c @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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://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, + * 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. + */ + + #include #include #include "tizen.h" @@ -505,6 +522,12 @@ ERR_ENTRY("IME_MANAGER_ERROR_OPERATION_FAILED",TIZEN_ERROR_IME | 0x0010 ,"Operat ERR_ENTRY("CONTEXT_TRIGGER_ERROR_INVALID_RULE",TIZEN_ERROR_CONTEXT | 0x07 ,"Invalid rule"), ERR_ENTRY("CONTEXT_TRIGGER_ERROR_RULE_NOT_EXIST",TIZEN_ERROR_CONTEXT | 0x08 ,"Rule does not exist"), #endif +#if defined (TIZEN_ERROR_MEDIA_VISION) + ERR_ENTRY("MEDIA_VISION_ERROR_NOT_SUPPORTED_FORMAT",TIZEN_ERROR_MEDIA_VISION | 0x01 ,"Not supported format"), + ERR_ENTRY("MEDIA_VISION_ERROR_INTERNAL",TIZEN_ERROR_MEDIA_VISION | 0x02 ,"Internal error"), + ERR_ENTRY("MEDIA_VISION_ERROR_INVALID_DATA",TIZEN_ERROR_MEDIA_VISION | 0x03 ,"Invalid data"), +#endif + {0,NULL,NULL} };