From: Li Zhang <li2012.zhang@samsung.com>
Date: Thu, 15 Aug 2013 06:37:47 +0000 (+0800)
Subject: Include unistd.h in scim_helper.cpp
X-Git-Tag: accepted/tizen/generic/20140310.074606~136
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f71e3ceefb2b3dba41304030e00b5fdd9a8d0aa8;p=platform%2Fcore%2Fuifw%2Fisf.git

Include unistd.h in scim_helper.cpp

Change-Id: Id3b2ae698cb0116d504a6dfaa5ea62f76234bde9
---

diff --git a/configure.ac b/configure.ac
index 9afe8a6..1eb56e5 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script
 #AC_INIT(scim, 1.4.7, suzhe@tsinghua.org.cn)
-AC_INIT(isf, 2.4.6801, isf@samsung.com)
+AC_INIT(isf, 2.4.6815, isf@samsung.com)
 AC_CONFIG_SRCDIR([ism/src/scim.h])
 m4_pattern_allow([^AS_])
 
@@ -11,7 +11,7 @@ m4_pattern_allow([^AS_])
 # ISF version
 ISF_MAJOR_VERSION=2
 ISF_MINOR_VERSION=4
-ISF_MICRO_VERSION=6801
+ISF_MICRO_VERSION=6815
 
 ISF_VERSION=$ISF_MAJOR_VERSION.$ISF_MINOR_VERSION.$ISF_MICRO_VERSION
 
diff --git a/ism/src/scim_helper.cpp b/ism/src/scim_helper.cpp
index bc089f4..8dd5363 100644
--- a/ism/src/scim_helper.cpp
+++ b/ism/src/scim_helper.cpp
@@ -45,6 +45,7 @@
 #define Uses_SCIM_EVENT
 
 #include <string.h>
+#include <unistd.h>
 
 #include "scim_private.h"
 #include "scim.h"
diff --git a/packaging/isf.changes b/packaging/isf.changes
index db196a8..0f6b622 100644
--- a/packaging/isf.changes
+++ b/packaging/isf.changes
@@ -1,3 +1,8 @@
+* Thu Aug 15 2013 Li Zhang <li2012.zhang@samsung.com> submit/tizen_2.2/20130815.054758@9d070e0
+- Change "English/Keyboard" to "English Keyboard"
+- Fix bug of autocapital analysis
+- Include unistd.h in scim_helper.cpp
+
 * Thu Aug 01 2013 Jihoon Kim <jihoon48.kim@samsung.com> submit/tizen_2.2/20130729.054443@870bbef
 - set _app_window before set_keyboard_geometry_atom_info in slot_show_ise()
 - set keyboard geometry at _ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_OFF_PREPARE_REQUEST status
diff --git a/packaging/isf.spec b/packaging/isf.spec
index b8e79a2..b56e882 100644
--- a/packaging/isf.spec
+++ b/packaging/isf.spec
@@ -3,7 +3,7 @@
 
 Name:       isf
 Summary:    Input Service Framework
-Version:    2.4.6801
+Version:    2.4.6815
 Release:    1
 Group:      Graphics & UI Framework/Input
 License:    LGPL-2.1
diff --git a/releasenote.txt b/releasenote.txt
index 66438d7..b5c6209 100644
--- a/releasenote.txt
+++ b/releasenote.txt
@@ -1,3 +1,9 @@
+ISF 2.4.6815 :
+ 1. Change "English/Keyboard" to "English Keyboard"
+ 2. [immodule] Fix bug of autocapital analysis
+ 3. Include unistd.h in scim_helper.cpp
+
+
 ISF 2.4.6801 :
  1. [panel] set window angle value in ECORE_X_VIRTUAL_KEYBOARD_STATE_ON
  2. [panel] set _app_window value in efl_get_app_window API