Merge branch private-master

Change-Id: I6d0318278566278f843f3569ae062ee90eb40e54
Signed-off-by: junsuk77.oh <junsuk77.oh@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 368431e..efba4b9 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,3 +74,4 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/vconf-internal-appservice-keys.h DESTI
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/vconf-internal-isf-keys.h DESTINATION ${INCLUDEDIR})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/vconf-internal-gallery-setting-keys.h DESTINATION ${INCLUDEDIR})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/vconf-internal-livebox-keys.h DESTINATION ${INCLUDEDIR})
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/vconf-internal-pkgmgr-keys.h DESTINATION ${INCLUDEDIR})

diff --git a/include/vconf-internal-keys.h b/include/vconf-internal-keys.h
index e464d5d..c0d0f6f 100755 (executable)
--- a/include/vconf-internal-keys.h
+++ b/include/vconf-internal-keys.h
@@ -90,6 +90,7 @@
 #include "vconf-internal-isf-keys.h"
 #include "vconf-internal-gallery-setting-keys.h"
 #include "vconf-internal-livebox-keys.h"
+#include "vconf-internal-pkgmgr-keys.h"
 
 #endif         /* __VCONF_INTERNAL_KEYS_H__ */
 

diff --git a/include/vconf-internal-pkgmgr-keys.h b/include/vconf-internal-pkgmgr-keys.h
new file mode 100644 (file)
index 0000000..fd52227
--- /dev/null
+++ b/include/vconf-internal-pkgmgr-keys.h
@@ -0,0 +1,55 @@
+/*
+ * vconf-internal-keys
+ *
+ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Contact: junsuk oh <junsuk77.oh@samsung.com>
+ *
+ * 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.
+ *
+ */
+
+#ifndef __VCONF_INTERNAL_PKGMGR_KEYS_H__
+#define __VCONF_INTERNAL_PKGMGR_KEYS_H__
+
+/**
+ * This file defines keys and values.
+ *
+ * @file        vconf-internal-pkgmgr-keys.h
+ * @defgroup    vconf_internal_pkgmgr_key Definitions of internal shared Keys for pkgmgr
+ * @ingroup     vconf_internal_key
+ * @author      junsuk77.oh@samsung.com
+ * @version     0.1
+ * @brief       This file has the definitions of shared keys for pkgmgr \n
+ */
+
+/* ========================== PKGMGR Keys & Values ============================ */
+/**
+ * @addtogroup vconf_internal_pkgmgr_key
+ * @{
+ * @brief pkgmgr Keys & Values\n
+ *        Maintainer : junsuk77.oh@samsung.com
+ */
+
+/**
+ * @brief it stands for status of pkgmgr value.
+ *
+ */
+#define VCONFKEY_PKGMGR_STATUS "memory/pkgmgr/status"
+
+/**
+ * @}
+ */
+
+#endif /* __VCONF_INTERNAL_PKGMGR_KEYS_H__ */
+

diff --git a/packaging/vconf-internal-keys.spec b/packaging/vconf-internal-keys.spec
index 0ff1a8f..f811b36 100644 (file)
--- a/packaging/vconf-internal-keys.spec
+++ b/packaging/vconf-internal-keys.spec
@@ -1,6 +1,6 @@
 Name:       vconf-internal-keys
 Summary:    Internal shared keys for vconf
-Version:    0.0.78
+Version:    0.0.79
 Release:    0
 Group:      Development/Headers
 License:    Apache License, Version 2.0