Revert "Fix for ISF manifest DB change."

Change-Id: I9669908107fdb77355e9516257236b63e29a682f

diff --git a/Makefile.am b/Makefile.am
index 4136a33c8d2156a7b6393412057505cfa0334edf..a8efc89654749525fee5be0329619c71a043b9a9 100755 (executable)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,6 +20,3 @@ SUBDIRS = intl po m4  src data
 ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST = config.rpath
-
-pkgdir = $(SCIM_PKGDIR)
-pkg_DATA       = ise-engine-anthy.xml

diff --git a/configure.ac b/configure.ac
index 00897f1c1db486bb8d7ea3ef3366267d433e7095..bd0d36447f35f54dd2f8c5ee4d78aed31c00d7cb 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -123,7 +123,6 @@ AC_SUBST(SCIM_DEBUG_FLAGS)
 
 SCIM_DATADIR=`$PKG_CONFIG --variable=scimdatadir scim`
 SCIM_ICONDIR=`$PKG_CONFIG --variable=icondir scim`
-SCIM_PKGDIR=`$PKG_CONFIG --variable=pkgdir scim`
 SCIM_MODULEDIR=`$PKG_CONFIG --variable=moduledir scim`
 
 if test "x$SCIM_DATADIR" = "x"; then
@@ -134,10 +133,6 @@ 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
@@ -146,7 +141,6 @@ SCIM_ANTHY_DATADIR=${SCIM_DATADIR}/Anthy
 
 AC_SUBST(SCIM_DATADIR)
 AC_SUBST(SCIM_ICONDIR)
-AC_SUBST(SCIM_PKGDIR)
 AC_SUBST(SCIM_MODULEDIR)
 AC_SUBST(SCIM_ANTHY_DATADIR)
         

diff --git a/ise-engine-anthy.xml b/ise-engine-anthy.xml
deleted file mode 100755 (executable)
index 7a0d99d..0000000
--- a/ise-engine-anthy.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" package="ise-engine-anthy" version="1.0.10" install-location="internal-only">
-<author/>
-<description/>
-<label>Japanese keyboard</label>
-<icon/>
-<ui-application appid="org.tizen.ise-engine-anthy" 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>Japanese keyboard</label>
-    <label xml:lang="en-gb">Japanese keyboard</label>
-    <icon/>
-</ui-application>
-</manifest>

diff --git a/packaging/ise-engine-anthy.spec b/packaging/ise-engine-anthy.spec
index 81a8611de9ebd83081679373d93a7b25ea626eb0..cc7036579b5f740d906f42a067cdc8f572a7bfe5 100644 (file)
--- a/packaging/ise-engine-anthy.spec
+++ b/packaging/ise-engine-anthy.spec
@@ -43,6 +43,5 @@ rm -rf %{buildroot}
 %license COPYING
 %{_datadir}/scim/icons/*
 %{_datadir}/locale/*
-%{_datadir}/packages/*
 %{_datadir}/scim/Anthy/*
 %{_libdir}/scim-1.0/1.4.0/IMEngine/*