tizen 2.4 release

diff --git a/Makefile.am b/Makefile.am
old mode 100644 (file)
new mode 100755 (executable)
index 1fb4c33..39121fa
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,6 +49,9 @@ CLEANFILES            = *.bak src/*.bak
 ## @end 1
 ACLOCAL                        = aclocal -I $(ac_aux_dir)
 
+pkgdir = $(SCIM_PKGDIR)
+pkg_DATA       = hangul.xml
+
 ## @start 2
 ## docdir                      = $(top_builddir)/doc
 

diff --git a/configure.ac b/configure.ac
old mode 100644 (file)
new mode 100755 (executable)
index e816fcb..4a682d7
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,13 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(scim-hangul, 0.4.0, choe.hwanjing@gmail.com) #do not forget to update skim/configure.in.in
+AC_INIT(scim-hangul, 1.0.0, choe.hwanjing@gmail.com) #do not forget to update skim/configure.in.in
 AC_CONFIG_SRCDIR([src/scim_hangul_imengine.h])
 
 # Save this value here, since automake will set cflags and cxxflags later
 cflags_set=${CFLAGS+set}
 cppflags_set=${CPPFLAGS+set}
 
-SCIM_HANGUL_MAJOR_VERSION=0
-SCIM_HANGUL_MINOR_VERSION=4
+SCIM_HANGUL_MAJOR_VERSION=1
+SCIM_HANGUL_MINOR_VERSION=0
 SCIM_HANGUL_MICRO_VERSION=0
 
 SCIM_HANGUL_VERSION=$SCIM_HANGUL_MAJOR_VERSION.$SCIM_HANGUL_MINOR_VERSION.$SCIM_HANGUL_MICRO_VERSION
@@ -103,6 +103,7 @@ fi
 AM_CONDITIONAL(SCIM_BUILD_SKIM_SETUP, [test "$skim_support" = "yes"])
 
 SCIM_ICONDIR=`$PKG_CONFIG --variable=icondir scim`
+SCIM_PKGDIR=`$PKG_CONFIG --variable=pkgdir scim`
 SCIM_MODULEDIR=`$PKG_CONFIG --variable=moduledir scim`
 SCIM_DATADIR=`$PKG_CONFIG --variable=scimdatadir scim`
 
@@ -110,6 +111,10 @@ if test "x$SCIM_ICONDIR" = "x"; then
   SCIM_ICONDIR=${datadir}/scim/icons
 fi
 
+if test "x$SCIM_PKGDIR" = "x"; then
+  SCIM_PKGDIR=${datadir}/packages
+fi
+
 if test "x$SCIM_MODULEDIR" = "x"; then
   SCIM_MODULEDIR=${libdir}/scim-1.0
 fi
@@ -119,6 +124,7 @@ if test "x$SCIM_DATADIR" = "x"; then
 fi
 
 AC_SUBST(SCIM_ICONDIR)
+AC_SUBST(SCIM_PKGDIR)
 AC_SUBST(SCIM_MODULEDIR)
 AC_SUBST(SCIM_DATADIR)
 

diff --git a/hangul.xml b/hangul.xml
new file mode 100755 (executable)
index 0000000..f6d2c21
--- /dev/null
+++ b/hangul.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns="http://tizen.org/ns/packages" package="hangul" type="rpm" version="1.0.0" install-location="internal-only">
+<author/>
+<description/>
+<label>Hangul keyboard</label>
+<icon/>
+<ui-application appid="org.tizen.ise-engine-hangul" exec="/usr/lib/scim-1.0/scim-launcher" nodisplay="true" taskmanage="false" multiple="false" type="capp" hw-acceleration="use-system-setting" mainapp="true">
+    <category name="http://tizen.org/category/ime"/>
+    <label>Hangul keyboard</label>
+    <label xml:lang="en-gb">Hangul keyboard</label>
+    <icon/>
+</ui-application>
+</manifest>

diff --git a/ise-engine-hangul.manifest b/ise-engine-hangul.manifest
new file mode 100644 (file)
index 0000000..e000139
--- /dev/null
+++ b/ise-engine-hangul.manifest
@@ -0,0 +1,8 @@
+<manifest>
+ <request>
+    <domain name="_"/>
+ </request>
+<assign>
+    <filesystem path="/usr/bin/*" exec_label="none" />
+</assign>
+</manifest>

diff --git a/packaging/ise-engine-hangul.spec b/packaging/ise-engine-hangul.spec
old mode 100644 (file)
new mode 100755 (executable)
index fd93138..2df720b
--- a/packaging/ise-engine-hangul.spec
+++ b/packaging/ise-engine-hangul.spec
@@ -1,7 +1,7 @@
 Name:       ise-engine-hangul
 Summary:    Hangul Input Method Engine for ISF
-Version:    0.4.0
-Release:    4
+Version:    1.0.0
+Release:    1
 Group:      Graphics & UI Framework/Input
 License:    GPL-2.0+
 Source0:    %{name}-%{version}.tar.gz
@@ -33,10 +33,12 @@ install -m0644 %{_builddir}/%{buildsubdir}/COPYING %{buildroot}%{_datadir}/licen
 
 
 %files
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_datadir}/scim/icons/*
 %{_datadir}/scim/hangul/symbol.txt
 %{_datadir}/locale/*/LC_MESSAGES/*
+%{_datadir}/packages/*
 %{_libdir}/scim-1.0/1.4.0/IMEngine/hangul.so
 %{_datadir}/license/%{name}
 

diff --git a/src/scim_hangul_imengine.cpp b/src/scim_hangul_imengine.cpp
index 5c41f82..b8eeec0 100644 (file)
--- a/src/scim_hangul_imengine.cpp
+++ b/src/scim_hangul_imengine.cpp
@@ -125,7 +125,7 @@ extern "C" {
 
 HangulFactory::HangulFactory (const ConfigPointer &config)
 {
-    m_uuid = "d75857a5-4148-4745-89e2-1da7ddaf70a9";
+    m_uuid = "org.tizen.ise-engine-hangul";
     m_name = _("Korean");
     m_config = config;
     m_keyboard_layout = "2";