tizen 2.4 release

diff --git a/Makefile.am b/Makefile.am
index 29dcae2..882be0c 100755 (executable)
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,6 +38,9 @@ CLEANFILES            = *.bak
 
 ACLOCAL_AMFLAGS = -I m4
 
+pkgdir = $(SCIM_PKGDIR)
+pkg_DATA       = table.xml
+
 .PHONY: update-ChangeLog
 
 update-ChangeLog:

diff --git a/configure.ac b/configure.ac
index 8b0981a..b912c14 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 #AC_INIT(scim-tables, 0.5.10, suzhe@tsinghua.org.cn) #do not forget to edit skim/configure.in.in to change the version
-AC_INIT(ise-engine-tables-zh, 0.0.0518, li2012.zhang@samsung.com)
+AC_INIT(ise-engine-tables-zh, 1.0.0, li2012.zhang@samsung.com)
 AC_CONFIG_SRCDIR([src/scim_table_imengine.h])
 
 ISF_VERSION=1.0.0
@@ -79,6 +79,7 @@ if test "$enable_debug" = "yes"; then
 fi
 
 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`
 
@@ -86,6 +87,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
@@ -95,6 +100,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/ise-engine-tables.manifest b/ise-engine-tables.manifest
new file mode 100644 (file)
index 0000000..e000139
--- /dev/null
+++ b/ise-engine-tables.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-tables.spec b/packaging/ise-engine-tables.spec
old mode 100644 (file)
new mode 100755 (executable)
index 312a756..327cf19
--- a/packaging/ise-engine-tables.spec
+++ b/packaging/ise-engine-tables.spec
@@ -1,5 +1,5 @@
 %define nam               ise-engine-tables
-%define ver               0.0.0518
+%define ver               1.0.0
 %define skim              0
 %define rel               1
 %define isf_version       1.0.0
@@ -120,15 +120,17 @@ rm -f $RPM_BUILD_ROOT//lib/kde*/*.{a,la}
 %postun
 
 %files
+%manifest %{name}.manifest
 %attr(644,-,-) %doc AUTHORS COPYING NEWS README ChangeLog
 %doc %{_mandir}/man*/*
 %{_bindir}/scim-make-table
-%{_libdir}/scim-1.0/1.4.0/IMEngine/table.*
+%{_libdir}/scim-1.0/1.4.0/IMEngine/table.so
 %{_datadir}/scim/icons/table.png
 %if %{build_scim_setup}
 %{_libdir}/scim-1.0/1.4.0/SetupUI/table-imengine-setup.so
 %endif
 %{_datadir}/locale/*/LC_MESSAGES/*
+%{_datadir}/packages/*
 %{_datadir}/license/%{name}
 
 %files zh

diff --git a/table.xml b/table.xml
new file mode 100755 (executable)
index 0000000..73bdc36
--- /dev/null
+++ b/table.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns="http://tizen.org/ns/packages" package="table" type="rpm" version="1.0.0" install-location="internal-only">
+<author/>
+<description/>
+<label>keyboard</label>
+<icon/>
+<ui-application appid="org.tizen.ise-engine-tables.zhuyin-big" 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>ZhuYin Big keyboard</label>
+    <label xml:lang="en-gb">ZhuYin Big keyboard</label>
+</ui-application>
+<ui-application appid="org.tizen.ise-engine-tables.cangjie3" 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>CanJie 3 keyboard</label>
+    <label xml:lang="en-gb">CanJie 3 keyboard</label>
+</ui-application>
+</manifest>

diff --git a/tables/zh/CangJie3.txt.in b/tables/zh/CangJie3.txt.in
index 2e8e098..b60f35d 100755 (executable)
--- a/tables/zh/CangJie3.txt.in
+++ b/tables/zh/CangJie3.txt.in
@@ -9,7 +9,7 @@ BEGIN_DEFINITION
 
 ### An unique id to distinguish this table among others.
 ### Use uuidgen to generate this kind of id.
-UUID = 5da9d4ff-ccdd-45af-b1a5-7bd4ac0aeb5f
+UUID = org.tizen.ise-engine-tables.cangjie3
 
 ### A unique number indicates the version of this file.
 ### For example the last modified date of this file.

diff --git a/tables/zh/ZhuYin-Big.txt.in b/tables/zh/ZhuYin-Big.txt.in
index e7a1fcc..7a7edb4 100755 (executable)
--- a/tables/zh/ZhuYin-Big.txt.in
+++ b/tables/zh/ZhuYin-Big.txt.in
@@ -10,7 +10,7 @@ BEGIN_DEFINITION
 
 ### An unique id to distinguish this table among others.
 ### Use uuidgen to generate this kind of id.
-UUID = 6137b317-cffc-4e39-80a1-eabb903ed855
+UUID = org.tizen.ise-engine-tables.zhuyin-big
 
 ### A unique number indicates the version of this file.
 ### For example the last modified date of this file.