Update debian packaging scripts from ubuntu

47 files changed, 1118 insertions, 1218 deletions

diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index be1551b0..00000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,6 +0,0 @@
-ibus for Debian
----------------
-
-<possible notes regarding this package - if none, delete this file>
-
- -- oneleaf <oneleaf@gmail.com>  Thu, 11 Sep 2008 09:58:03 +0800
diff --git a/debian/changelog b/debian/changelog
index b685c1c7..fdc0a1f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,228 @@
-ibus (0.1.1.20080908-1) unstable; urgency=low
+ibus (1.2.0.20090927-1~ppa1) karmic; urgency=low
 
-  * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
+  * new upstream release.
 
- -- oneleaf <oneleaf@gmail.com>  Thu, 11 Sep 2008 09:58:03 +0800
+ -- LI Daobing <lidaobing@debian.org>  Tue, 29 Sep 2009 20:45:17 +0800
 
+ibus (1.2.0.20090915-1) unstable; urgency=low
+
+  * new upstream release.
+
+ -- LI Daobing <lidaobing@debian.org>  Tue, 15 Sep 2009 19:30:53 +0800
+
+ibus (1.2.0.20090904-1) unstable; urgency=low
+
+  * new upstream release.
+  * debian/rules: remove ibus.desktop (LP: #420282)
+
+ -- LI Daobing <lidaobing@debian.org>  Sat, 05 Sep 2009 12:17:53 +0800
+
+ibus (1.2.0.20090828-1) unstable; urgency=low
+
+  * new upstream release.
+  * debian/control: bump standards version to 3.8.3. 
+  * debian/libibus1.symbols: updated. 
+
+ -- LI Daobing <lidaobing@debian.org>  Sun, 30 Aug 2009 12:37:45 +0800
+
+ibus (1.2.0.20090812-1) unstable; urgency=low
+
+  * new upstream release.
+  * debian/libibus1.symbols: updated. 
+
+ -- LI Daobing <lidaobing@debian.org>  Wed, 12 Aug 2009 20:41:02 +0800
+
+ibus (1.2.0.20090810-1) unstable; urgency=low
+
+  * new upstream release.
+
+ -- LI Daobing <lidaobing@debian.org>  Mon, 10 Aug 2009 19:15:15 +0800
+
+ibus (1.2.0.20090807-1) unstable; urgency=low
+
+  * new upstream release.
+  * suggest qt4:
+    - debian/control: add recommends for ibus-qt4
+    - debian/xinput/ibus: detect ibus-qt4
+
+ -- LI Daobing <lidaobing@debian.org>  Sun, 09 Aug 2009 15:27:19 +0800
+
+ibus (1.2.0.20090806-1) unstable; urgency=low
+
+  * new upstream release.
+
+ -- LI Daobing <lidaobing@debian.org>  Thu, 06 Aug 2009 22:00:41 +0800
+
+ibus (1.2.0.20090723-1) unstable; urgency=low
+
+  * new upstream release.
+
+ -- LI Daobing <lidaobing@debian.org>  Thu, 23 Jul 2009 20:22:09 +0800
+
+ibus (1.2.0.20090719-2) unstable; urgency=low
+
+  * Fix "Cannot find libibus.so and fail to launch ibus", change it to
+    libibus.so.1 (Closes: #537685)
+
+ -- LI Daobing <lidaobing@debian.org>  Mon, 20 Jul 2009 21:33:29 +0800
+
+ibus (1.2.0.20090719-1) unstable; urgency=low
+
+  * new upstream release.
+  * debian/libibus1.symbols: updated. 
+  * debian/control: change url of vcs-bzr 
+
+ -- LI Daobing <lidaobing@debian.org>  Sun, 19 Jul 2009 16:00:48 +0800
+
+ibus (1.2.0.20090617-2) unstable; urgency=low
+
+  * Fix "ibus' autostart in xdg folder breaks im-switch and other input
+    method" (Closes: #537217)
+    - debian/ibus.install: remove the autostart file.
+    - debian/rules: remove /etc/xdg after install. 
+    - debian/ibus.postinst: remove the autostart file. 
+
+ -- LI Daobing <lidaobing@debian.org>  Thu, 16 Jul 2009 20:41:18 +0800
+
+ibus (1.2.0.20090617-1) unstable; urgency=low
+
+  * new upstream release.
+  * libibus0 -> libibus1:
+    - debian/control: rename the package.
+    - debian/libibus0.install: removed
+    - debian/libibus0.symbols: removed
+    - debian/libibus1.install: added
+    - debian/libibus1.symbols: added
+    - debian/rules: change script of dh_gtkmodules
+  * debian/ibus-gtk.install: updated.
+  * debian/control: 
+    - ibus conflicts the ibus modules with low version. 
+    - bump policy version to 3.8.2.
+
+ -- LI Daobing <lidaobing@debian.org>  Fri, 26 Jun 2009 22:47:52 +0800
+
+ibus (1.1.0.20090612-1) unstable; urgency=low
+
+  * new upstream release.
+  * Fix "python-ibus should depends on iso-codes" (Closes: #532163)
+  * debian/libibus0.symbols: update symbols
+
+ -- LI Daobing <lidaobing@debian.org>  Sat, 13 Jun 2009 11:39:05 +0800
+
+ibus (1.1.0.20090531-1) unstable; urgency=low
+
+  * new upstream release.
+
+ -- LI Daobing <lidaobing@debian.org>  Mon, 01 Jun 2009 20:57:27 +0800
+
+ibus (1.1.0.20090508-1) unstable; urgency=low
+
+  * new upstream release.
+  * merge ubuntu changelog.
+  * debian/control:
+    - depends of ibus: add python-xdg (closes: #529055)
+
+ -- LI Daobing <lidaobing@debian.org>  Sun, 17 May 2009 22:19:38 +0800
+
+ibus (1.1.0.20090508-0ubuntu1) karmic; urgency=low
+
+  * new upstream release (LP: #373976)
+  * debian/libibus0.symbols: update symbols
+
+ -- LI Daobing <lidaobing@debian.org>  Sat, 09 May 2009 13:52:29 +0800
+
+ibus (1.1.0.20090423-0ubuntu1) karmic; urgency=low
+
+  * new upstream release (LP: #325740)
+  * debian/patches/01_typo_in_Makefile_am.dpatch: merged by upstream, removed.
+  * no patch needed, remove dpatch from debian/*
+  * debian/rules:
+    - add "--list-missing --fail-missing" to dh_install, refactor other to make
+      this works.
+  * debian/xinput/ibus: change XIM_PROGRAM from ibus to ibus-daemon, add
+    "--xim" to XIM_ARGS
+  * debian/xinput/ibus-qt4: removed.
+  * debian/ibus.install: install gconf schemas, lib and autostart.
+  * debian/rules: add dh_gconf 
+  * debian/control: 
+    - build depends: add intltool, python-dbus, python-gobject-dev,
+      libgconf2-dev. remove libqt4-dev, dpatch.
+    - package libibus-gtk0 renamed to libibus0.
+    - change maintainer's email.
+    - bump standards version to 3.8.1.
+    - use simple depends on python-dbus.
+    - depends of ibus: add python-xdg.
+    - package ibus-qt4 removed. (no longer supported)
+    - new package libibus-dev.
+  * debian/libibus0.symbols: update symbols
+  * debian/docs: added 
+
+ -- LI Daobing <lidaobing@debian.org>  Fri, 01 May 2009 10:41:09 +0800
+
+ibus (1.1.0.20090417-1) unstable; urgency=low
+
+  * initial release to Debian (closes: #501106)
+  * new upstream release (LP: #325740)
+    - package libibus-gtk0 renamed to libibus0.
+    - package ibus-qt4 removed. (no longer supported)
+    - new package libibus-dev.
+    - debian/control: add intltool to build depends.
+  * debian/patches/01_typo_in_Makefile_am.dpatch: merged by upstream, removed.
+  * no patch needed, remove dpatch from debian/*
+  * debian/rules:
+    - add "--list-missing --fail-missing" to dh_install, refactor other to make
+      this works.
+  * debian/xinput/ibus: change XIM_PROGRAM from ibus to ibus-daemon, add
+    "--xim" to XIM_ARGS
+  * debian/xinput/ibus-qt4: removed.
+  * debian/ibus.install: install gconf schemas 
+  * debian/rules: add dh_gconf 
+  * debian/control: 
+    - build depends on python-dbus.
+    - change maintainer's email.
+    - bump standards version to 3.8.1.
+    - use simple depends on python-dbus.
+  * debian/libibus0.symbols: update symbols
+  * debian/docs: added 
+
+ -- LI Daobing <lidaobing@debian.org>  Wed, 22 Apr 2009 21:28:45 +0800
+
+ibus (0.1.1.20081023-0ubuntu5) jaunty; urgency=low
+
+  * debian/control: Add depends on python-gconf as ibus needs this to run
+    correctly. (LP: #358770) 
+
+ -- LI Daobing <lidaobing@gmail.com>  Sun, 12 Apr 2009 10:58:27 +0800
+
+ibus (0.1.1.20081023-0ubuntu4) jaunty; urgency=low
+
+  * port to python2.6 (LP: #336525)
+    - debian/pyversions: change from "2.5" to "2.5-"
+    - debian/rules: fix dh_pysupport
+  * debian/rules: change "dh_clean -k" to "dh_prep" 
+
+ -- LI Daobing <lidaobing@gmail.com>  Mon, 02 Mar 2009 13:03:03 +0800
+
+ibus (0.1.1.20081023-0ubuntu3) jaunty; urgency=low
+
+  * debian/rules: add dh_gtkmodules (LP: #314375) 
+  * debian/control: depends on ${misc:Depends}
+
+ -- LI Daobing <lidaobing@gmail.com>  Tue, 06 Jan 2009 22:29:46 +0800
+
+ibus (0.1.1.20081023-0ubuntu2) jaunty; urgency=low
+
+  * ibus should depends on python-ibus (LP: #312428)
+
+ -- LI Daobing <lidaobing@gmail.com>  Tue, 30 Dec 2008 21:26:16 +0800
+
+ibus (0.1.1.20081023-0ubuntu1) jaunty; urgency=low
+
+  [ LI Daobing ]
+  * Initial release (LP: #292616)
+
+  [ Zhengpeng Hou ]
+  * Add myself as an uploader. :)
+  * Add im-switch's support, stole it from scim-bridge. :)
+
+ -- Zhengpeng Hou <zhengpeng-hou@ubuntu.com>  Sun, 30 Nov 2008 10:41:05 +0000
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 00000000..3b93b747
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+config.guess
+config.sub
diff --git a/debian/compat b/debian/compat
index 7ed6ff82..7f8f011e 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index c2ff2828..26662129 100644
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,83 @@
 Source: ibus
-Section: unknown
-Priority: extra
-Maintainer: oneleaf <oneleaf@gmail.com>
-Build-Depends: debhelper (>= 5), autotools-dev, python-gtk2-dev, libgtk2.0-dev, libdbus-1-dev, libdbus-glib-1-dev 
-Standards-Version: 3.7.2
+Section: utils
+Priority: optional
+Maintainer: LI Daobing <lidaobing@debian.org>
+Uploaders: Zhengpeng Hou <zhengpeng-hou@ubuntu.com>
+Build-Depends: debhelper (>= 7),
+ autotools-dev,
+ autoconf,
+ automake,
+ libtool,
+ python-support (>= 0.6),
+ libgtk2.0-dev,
+ libdbus-glib-1-dev,
+ python-dev,
+ iso-codes,
+ python-gobject-dev,
+ libgconf2-dev,
+ python-dbus (>= 0.83.0),
+ intltool (>= 0.40.0)
+Standards-Version: 3.8.3
+Homepage: http://code.google.com/p/ibus/
+Vcs-Bzr: lp:~lidaobing/ibus/ibus
+Vcs-Browser: https://code.launchpad.net/~lidaobing/ibus/ibus
 
 Package: ibus
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, python-dbus (>= 0.83)
-Description: IBus - Intelligent Input Bus for Linux / Unix OS
- ibus is a simplified Chinese input server. 
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-glade2,
+ im-switch, python-ibus (= ${source:Version}), python-xdg
+Recommends: ibus-gtk, ibus-qt4
+Conflicts: ibus-anthy (< 1.2),
+ ibus-table (< 1.2),
+ ibus-pinyin (< 1.2),
+ ibus-m17n (< 1.2),
+ ibus-hangul (< 1.2),
+ ibus-chewing (< 1.2)
+Description: New input method framework using dbus
+ IBus is an Intelligent Input Bus. It is a new input framework for Linux
+ OS. It provides full featured and user friendly input method user interface.
+ It also may help developers to develop input method easily.
+
+Package: libibus1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: New input method framework using dbus
+ IBus is an Intelligent Input Bus. It is a new input framework for Linux
+ OS. It provides full featured and user friendly input method user interface.
+ It also may help developers to develop input method easily.
+ .
+ libibus1 is the library of ibus.
+
+Package: libibus-dev
+Section: libdevel
+Architecture: any
+Depends: libibus1 (= ${binary:Version}), libglib2.0-dev, libdbus-1-dev, ${shlibs:Depends}, ${misc:Depends}
+Description: New input method framework using dbus
+ IBus is an Intelligent Input Bus. It is a new input framework for Linux
+ OS. It provides full featured and user friendly input method user interface.
+ It also may help developers to develop input method easily.
+ .
+ This package contains the header files and static libraries which is
+ needed for developing the IBus applications.
+
+Package: ibus-gtk
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: New input method framework using dbus
+ IBus is an Intelligent Input Bus. It is a new input framework for Linux
+ OS. It provides full featured and user friendly input method user interface.
+ It also may help developers to develop input method easily.
+ .
+ ibus-gtk is the GTK+ client of ibus, it provide a gtk-immodule for ibus.
+ 
+Package: python-ibus
+Section: python
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends}, python-gtk2, python-dbus (>= 0.83.0), iso-codes
+Description: New input method framework using dbus
+ IBus is an Intelligent Input Bus. It is a new input framework for Linux
+ OS. It provides full featured and user friendly input method user interface.
+ It also may help developers to develop input method easily.
+ .
+ python-ibus is the Python binding of ibus.
diff --git a/debian/copyright b/debian/copyright
index 26049cd7..39bdda91 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,22 +1,260 @@
-This package was debianized by oneleaf <oneleaf@gmail.com> on
-Thu, 11 Sep 2008 09:58:03 +0800.
+This package was debianized by LI Daobing <lidaobing@gmail.com> on
+Sat, 04 Oct 2008 15:30:08 +0800.
 
-It was downloaded from <http://code.google.com/p/ibus/>
+It was downloaded from http://code.google.com/p/ibus/
 
-Upstream Author(s): 
+Upstream Author:
 
-    Shawn.P.Huang <Shawn.P.Huang@gmail.com>
+    Huang Peng <shawn.p.huang@gmail.com>
 
-Copyright: 
+Copyright:
 
-    <Copyright (C) Shawn.P.Huang>
+    Copyright (C) 2007,2008 Huang Peng <shawn.p.huang@gmail.com>
 
 License:
 
-    GNU Lesser General Public License
+    This package is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
 
-The Debian packaging is (C) 2008, oneleaf <oneleaf@gmail.com> and
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
+
+The Debian packaging is (C) 2008, LI Daobing <lidaobing@gmail.com> and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
 
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
+some files belong to different copyright holder or in a different
+license, following is the list of the files and licenses.
+
+-------------------------------------------------------------------------------
+
+ibus/keysyms.py: LGPL (v2.1 or later)
+  Copyright: 1998-2003 James Henstridge
+
+-------------------------------------------------------------------------------
+
+util/gconf/gconf-fixes.c: LGPL (v2 or later)
+  Copyright: 2002 Johan Dahlin
+
+-------------------------------------------------------------------------------
+
+util/gconf/gconf-types.c, util/gconf/gconf-types.h: LGPL (v2.1 or later)
+  [Copyright: 2005 Red Hat, Inc]
+
+-------------------------------------------------------------------------------
+
+util/IMdkit/FrameMgr.c, util/IMdkit/FrameMgr.h:
+
+/******************************************************************
+Copyright 1993, 1994 by Digital Equipment Corporation, Maynard, Massachusetts,
+ 
+                        All Rights Reserved
+ 
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the names of Digital or MIT not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+ 
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+ 
+  Author: Hiroyuki Miyamoto  Digital Equipment Corporation
+                             miyamoto@jrd.dec.com
+
+    This version tidied and debugged by Steve Underwood May 1999
+
+******************************************************************/
+
+----------------------------------------------------------------------------
+
+util/IMdkit/i18nAttr.c,
+util/IMdkit/i18nClbk.c,
+util/IMdkit/i18nIc.c,
+util/IMdkit/i18nMethod.c,
+util/IMdkit/i18nPtHdr.c,
+util/IMdkit/i18nUtil.c,
+util/IMdkit/i18nX.c,
+util/IMdkit/IMConn.c,
+util/IMdkit/IMdkit.h,
+util/IMdkit/IMMethod.c,
+util/IMdkit/IMValues.c,
+util/IMdkit/Xi18n.h,
+util/IMdkit/Xi18nX.h,
+util/IMdkit/XimFunc.h:
+
+/******************************************************************
+ 
+         Copyright 1994, 1995 by Sun Microsystems, Inc.
+         Copyright 1993, 1994 by Hewlett-Packard Company
+ 
+Permission to use, copy, modify, distribute, and sell this software
+and its documentation for any purpose is hereby granted without fee,
+provided that the above copyright notice appear in all copies and
+that both that copyright notice and this permission notice appear
+in supporting documentation, and that the name of Sun Microsystems, Inc.
+and Hewlett-Packard not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior permission.
+Sun Microsystems, Inc. and Hewlett-Packard make no representations about
+the suitability of this software for any purpose.  It is provided "as is"
+without express or implied warranty.
+ 
+SUN MICROSYSTEMS INC. AND HEWLETT-PACKARD COMPANY DISCLAIMS ALL
+WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+SUN MICROSYSTEMS, INC. AND HEWLETT-PACKARD COMPANY BE LIABLE FOR ANY
+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ 
+  Author: Hidetoshi Tajima(tajima@Eng.Sun.COM) Sun Microsystems, Inc.
+
+    This version tidied and debugged by Steve Underwood May 1999
+ 
+******************************************************************/
+
+--------------------------------------------------------------------------
+
+util/IMdkit/i18nIMProro.c:
+
+/******************************************************************
+Copyright 1993, 1994 by Digital Equipment Corporation, Maynard, Massachusetts,
+Copyright 1993, 1994 by Hewlett-Packard Company
+ 
+Copyright 1994, 1995 by Sun Microsystems, Inc.
+ 
+                        All Rights Reserved
+ 
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the names of Digital or MIT not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+ 
+DIGITAL AND HEWLETT-PACKARD COMPANY DISCLAIMS ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL DIGITAL AND HEWLETT-PACKARD COMPANY BE LIABLE
+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ 
+  Author: Hiroyuki Miyamoto  Digital Equipment Corporation
+                             miyamoto@jrd.dec.com
+	  Hidetoshi Tajima(tajima@Eng.Sun.COM) Sun Microsystems, Inc.
+
+    This version tidied and debugged by Steve Underwood May 1999
+ 
+******************************************************************/
+
+--------------------------------------------------------------------
+
+util/IMdkit/XimProto.h:
+
+/******************************************************************
+
+           Copyright 1992, 1993, 1994 by FUJITSU LIMITED
+
+Permission to use, copy, modify, distribute, and sell this software
+and its documentation for any purpose is hereby granted without fee,
+provided that the above copyright notice appear in all copies and
+that both that copyright notice and this permission notice appear
+in supporting documentation, and that the name of FUJITSU LIMITED
+not be used in advertising or publicity pertaining to distribution
+of the software without specific, written prior permission.
+FUJITSU LIMITED makes no representations about the suitability of
+this software for any purpose. 
+It is provided "as is" without express or implied warranty.
+
+FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL FUJITSU LIMITED BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+  Author: Takashi Fujiwara     FUJITSU LIMITED 
+                               fujiwara@a80.tech.yk.fujitsu.co.jp
+
+    This version tidied and debugged by Steve Underwood May 1999
+
+******************************************************************/
+
+------------------------------------------------------------------------
+
+util/IMdkit/Xtrans.h
+
+/*
+
+Copyright (c) 1993, 1994  X Consortium
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the X Consortium shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from the X Consortium.
+
+*/
+
+/* Copyright (c) 1993, 1994 NCR Corporation - Dayton, Ohio, USA
+ *
+ * All Rights Reserved
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name NCR not be used in advertising
+ * or publicity pertaining to distribution of the software without specific,
+ * written prior permission.  NCR makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ *
+ * NCR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL NCR BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
diff --git a/debian/cron.d.ex b/debian/cron.d.ex
deleted file mode 100644
index 5e965fa7..00000000
--- a/debian/cron.d.ex
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Regular cron jobs for the ibus package
-#
-0 4	* * *	root	ibus_maintenance
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index ca882bbb..00000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff --git a/debian/docs b/debian/docs
index 50bd824b..6f12db50 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1,2 @@
-NEWS
+AUTHORS
 README
diff --git a/debian/emacsen-install.ex b/debian/emacsen-install.ex
deleted file mode 100644
index 6d747dbd..00000000
--- a/debian/emacsen-install.ex
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/sh -e
-# /usr/lib/emacsen-common/packages/install/ibus
-
-# Written by Jim Van Zandt <jrv@debian.org>, borrowing heavily
-# from the install scripts for gettext by Santiago Vila
-# <sanvila@ctv.es> and octave by Dirk Eddelbuettel <edd@debian.org>.
-
-FLAVOR=$1
-PACKAGE=ibus
-
-if [ ${FLAVOR} = emacs ]; then exit 0; fi
-
-echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}
-
-#FLAVORTEST=`echo $FLAVOR | cut -c-6`
-#if [ ${FLAVORTEST} = xemacs ] ; then
-#    SITEFLAG="-no-site-file"
-#else
-#    SITEFLAG="--no-site-file"
-#fi
-FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile"
-
-ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
-ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
-
-# Install-info-altdir does not actually exist. 
-# Maybe somebody will write it.
-if test -x /usr/sbin/install-info-altdir; then
-    echo install/${PACKAGE}: install Info links for ${FLAVOR}
-    install-info-altdir --quiet --section "" "" --dirname=${FLAVOR} /usr/share/info/${PACKAGE}.info.gz
-fi
-
-install -m 755 -d ${ELCDIR}
-cd ${ELDIR}
-FILES=`echo *.el`
-cp ${FILES} ${ELCDIR}
-cd ${ELCDIR}
-
-cat << EOF > path.el
-(setq load-path (cons "." load-path) byte-compile-warnings nil)
-EOF
-${FLAVOR} ${FLAGS} ${FILES}
-rm -f *.el path.el
-
-exit 0
diff --git a/debian/emacsen-remove.ex b/debian/emacsen-remove.ex
deleted file mode 100644
index e56c9841..00000000
--- a/debian/emacsen-remove.ex
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-# /usr/lib/emacsen-common/packages/remove/ibus
-
-FLAVOR=$1
-PACKAGE=ibus
-
-if [ ${FLAVOR} != emacs ]; then
-    if test -x /usr/sbin/install-info-altdir; then
-        echo remove/${PACKAGE}: removing Info links for ${FLAVOR}
-        install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/share/info/ibus.info.gz
-    fi
-
-    echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
-    rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
-fi
diff --git a/debian/emacsen-startup.ex b/debian/emacsen-startup.ex
deleted file mode 100644
index 24bd3b54..00000000
--- a/debian/emacsen-startup.ex
+++ /dev/null
@@ -1,25 +0,0 @@
-;; -*-emacs-lisp-*-
-;;
-;; Emacs startup file, e.g.  /etc/emacs/site-start.d/50ibus.el
-;; for the Debian ibus package
-;;
-;; Originally contributed by Nils Naumann <naumann@unileoben.ac.at>
-;; Modified by Dirk Eddelbuettel <edd@debian.org>
-;; Adapted for dh-make by Jim Van Zandt <jrv@debian.org>
-
-;; The ibus package follows the Debian/GNU Linux 'emacsen' policy and
-;; byte-compiles its elisp files for each 'emacs flavor' (emacs19,
-;; xemacs19, emacs20, xemacs20...).  The compiled code is then
-;; installed in a subdirectory of the respective site-lisp directory.
-;; We have to add this to the load-path:
-(let ((package-dir (concat "/usr/share/"
-                           (symbol-name flavor)
-                           "/site-lisp/ibus")))
-;; If package-dir does not exist, the ibus package must have
-;; removed but not purged, and we should skip the setup.
-  (when (file-directory-p package-dir)
-        (setq load-path (cons package-dir load-path))
-       (autoload 'ibus-mode "ibus-mode"
-         "Major mode for editing ibus files." t)
-       (add-to-list 'auto-mode-alist '("\\.ibus$" . ibus-mode))))
-
diff --git a/debian/ibus-daemon.1 b/debian/ibus-daemon.1
new file mode 100644
index 00000000..9ddd9f92
--- /dev/null
+++ b/debian/ibus-daemon.1
@@ -0,0 +1 @@
+.so man1/ibus.1
diff --git a/debian/ibus-default.ex b/debian/ibus-default.ex
deleted file mode 100644
index 80a70335..00000000
--- a/debian/ibus-default.ex
+++ /dev/null
@@ -1,10 +0,0 @@
-# Defaults for ibus initscript
-# sourced by /etc/init.d/ibus
-# installed at /etc/default/ibus by the maintainer scripts
-
-#
-# This is a POSIX shell fragment
-#
-
-# Additional options that are passed to the Daemon.
-DAEMON_OPTS=""
diff --git a/debian/ibus-gconf.1 b/debian/ibus-gconf.1
new file mode 100644
index 00000000..9ddd9f92
--- /dev/null
+++ b/debian/ibus-gconf.1
@@ -0,0 +1 @@
+.so man1/ibus.1
diff --git a/debian/ibus-gtk.install b/debian/ibus-gtk.install
new file mode 100644
index 00000000..3cdfe6a9
--- /dev/null
+++ b/debian/ibus-gtk.install
@@ -0,0 +1 @@
+usr/lib/gtk-2.0/2.10.0/immodules/im-ibus.so
diff --git a/debian/ibus-setup.1 b/debian/ibus-setup.1
new file mode 100644
index 00000000..1c01b39f
--- /dev/null
+++ b/debian/ibus-setup.1
@@ -0,0 +1,26 @@
+.\" This file is distributed under the same license as the ibus
+.\" package.
+.\" Copyright (C) LI Daobing <lidaobing@gmail.com>, 2008.
+.\"
+.TH "IBUS-SETUP" 1 "2008-11-08" "" ""
+.SH NAME
+ibus-setup \- configuration program for ibus
+
+.SH "SYNOPSIS"
+.B ibus-setup
+
+.SH "DESCRIPTION"
+
+.PP
+IBus is an Intelligent Input Bus. It is a new input framework for Linux
+OS. It provides full featured and user friendly input method user
+interface.  It also may help developers to develop input method easily.  
+
+.PP
+ibus-setup is the configuration program for IBus.
+
+.PP
+Homepage: http://code.google.com/p/ibus/
+
+.SH "SEE ALSO"
+.BR ibus (1)
diff --git a/debian/ibus-ui-gtk.1 b/debian/ibus-ui-gtk.1
new file mode 100644
index 00000000..9ddd9f92
--- /dev/null
+++ b/debian/ibus-ui-gtk.1
@@ -0,0 +1 @@
+.so man1/ibus.1
diff --git a/debian/ibus-x11.1 b/debian/ibus-x11.1
new file mode 100644
index 00000000..9ddd9f92
--- /dev/null
+++ b/debian/ibus-x11.1
@@ -0,0 +1 @@
+.so man1/ibus.1
diff --git a/debian/ibus.1 b/debian/ibus.1
new file mode 100644
index 00000000..c0c05b51
--- /dev/null
+++ b/debian/ibus.1
@@ -0,0 +1,27 @@
+.\" This file is distributed under the same license as the ibus
+.\" package.
+.\" Copyright (C) LI Daobing <lidaobing@gmail.com>, 2008.
+.\"
+.TH "IBUS" 1 "2008-11-08" "" ""
+.SH NAME
+ibus \- Intelligent Input Bus for Linux / Unix OS
+
+.SH "SYNOPSIS"
+.B ibus
+
+.SH "DESCRIPTION"
+
+.PP
+IBus is an Intelligent Input Bus. It is a new input framework for Linux
+OS. It provides full featured and user friendly input method user
+interface.  It also may help developers to develop input method easily.  
+
+.PP
+ibus will launch ibus-daemon, ibus-gconf, ibus-ui-gtk and ibus-x11.
+
+.PP
+Homepage: http://code.google.com/p/ibus/
+
+.SH "SEE ALSO"
+.BR scim (1),
+.BR fcitx (1)
diff --git a/debian/ibus.doc-base.EX b/debian/ibus.doc-base.EX
deleted file mode 100644
index 4f8251ac..00000000
--- a/debian/ibus.doc-base.EX
+++ /dev/null
@@ -1,22 +0,0 @@
-Document: ibus
-Title: Debian ibus Manual
-Author: <insert document author here>
-Abstract: This manual describes what ibus is
- and how it can be used to
- manage online manuals on Debian systems.
-Section: unknown
-
-Format: debiandoc-sgml
-Files: /usr/share/doc/ibus/ibus.sgml.gz
-
-Format: postscript
-Files: /usr/share/doc/ibus/ibus.ps.gz
-
-Format: text
-Files: /usr/share/doc/ibus/ibus.text.gz
-
-Format: HTML
-Index: /usr/share/doc/ibus/html/index.html
-Files: /usr/share/doc/ibus/html/*.html
-
-  
diff --git a/debian/ibus.install b/debian/ibus.install
new file mode 100644
index 00000000..df25b6d0
--- /dev/null
+++ b/debian/ibus.install
@@ -0,0 +1,5 @@
+debian/tmp/etc/gconf/schemas/*
+debian/tmp/usr/bin/*
+debian/tmp/usr/share/*
+debian/tmp/usr/lib/ibus/*
+debian/xinput/* etc/X11/xinit/xinput.d
diff --git a/debian/ibus.manpages b/debian/ibus.manpages
new file mode 100644
index 00000000..b255c415
--- /dev/null
+++ b/debian/ibus.manpages
@@ -0,0 +1,6 @@
+debian/ibus-x11.1
+debian/ibus-setup.1
+debian/ibus-gconf.1
+debian/ibus-daemon.1
+debian/ibus.1
+debian/ibus-ui-gtk.1
diff --git a/debian/ibus.postinst b/debian/ibus.postinst
new file mode 100644
index 00000000..853fd82f
--- /dev/null
+++ b/debian/ibus.postinst
@@ -0,0 +1,34 @@
+#!/bin/sh
+set -e
+
+ua_inst () {
+	update-alternatives \
+        --install /etc/X11/xinit/xinput.d/$1 xinput-$1 \
+        /etc/X11/xinit/xinput.d/$2 $3 ;
+}
+
+case "$1" in
+    configure)
+        #ua_inst all_ALL ibus  0
+        ua_inst ja_JP   ibus 60
+        ua_inst ko_KR   ibus 60
+        ua_inst zh_CN   ibus 60
+        ua_inst zh_TW   ibus 60
+        ua_inst zh_HK   ibus 60
+        ua_inst zh_SG   ibus 60
+	rm -f /etc/xdg/autostart/ibus.desktop
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+
diff --git a/debian/ibus.prerm b/debian/ibus.prerm
new file mode 100644
index 00000000..f32ef339
--- /dev/null
+++ b/debian/ibus.prerm
@@ -0,0 +1,30 @@
+#!/bin/sh
+set -e
+
+ua_remove () {
+	update-alternatives \
+        --remove xinput-$1 \
+        /etc/X11/xinit/xinput.d/$2 ;
+}
+
+case "$1" in
+    remove|upgrade|deconfigure)
+        ua_remove all_ALL ibus
+        ua_remove ja_JP   ibus
+        ua_remove ko_KR   ibus
+        ua_remove zh_CN   ibus
+        ua_remove zh_TW   ibus
+        ua_remove zh_HK   ibus
+        ua_remove zh_SG   ibus
+	;;
+    failed-upgrade)
+	;;
+    *)
+	echo "prerm called with unknown argument \`$1'" >&2
+	exit 1
+   ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/im-switch/ibus b/debian/im-switch/ibus
deleted file mode 100644
index 5bda9148..00000000
--- a/debian/im-switch/ibus
+++ /dev/null
@@ -1,6 +0,0 @@
-XIM=ibus
-XIM_PROGRAM=/usr/bin/ibus
-XIM_ARGS=""
-GTK_IM_MODULE=ibus
-QT_IM_MODULE=ibus
-DEPENDS="ibus"
diff --git a/debian/init.d.ex b/debian/init.d.ex
deleted file mode 100644
index 61ff72a6..00000000
--- a/debian/init.d.ex
+++ /dev/null
@@ -1,157 +0,0 @@
-#! /bin/sh
-#
-# skeleton	example file to build /etc/init.d/ scripts.
-#		This file should be used to construct scripts for /etc/init.d.
-#
-#		Written by Miquel van Smoorenburg <miquels@cistron.nl>.
-#		Modified for Debian 
-#		by Ian Murdock <imurdock@gnu.ai.mit.edu>.
-#               Further changes by Javier Fernandez-Sanguino <jfs@debian.org>
-#
-# Version:	@(#)skeleton  1.9  26-Feb-2001  miquels@cistron.nl
-#
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/ibus
-NAME=ibus
-DESC=ibus
-
-test -x $DAEMON || exit 0
-
-LOGDIR=/var/log/ibus
-PIDFILE=/var/run/$NAME.pid
-DODTIME=1                   # Time to wait for the server to die, in seconds
-                            # If this value is set too low you might not
-                            # let some servers to die gracefully and
-                            # 'restart' will not work
-
-# Include ibus defaults if available
-if [ -f /etc/default/ibus ] ; then
-	. /etc/default/ibus
-fi
-
-set -e
-
-running_pid()
-{
-    # Check if a given process pid's cmdline matches a given name
-    pid=$1
-    name=$2
-    [ -z "$pid" ] && return 1 
-    [ ! -d /proc/$pid ] &&  return 1
-    cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1`
-    # Is this the expected child?
-    [ "$cmd" != "$name" ] &&  return 1
-    return 0
-}
-
-running()
-{
-# Check if the process is running looking at /proc
-# (works for all users)
-
-    # No pidfile, probably no daemon present
-    [ ! -f "$PIDFILE" ] && return 1
-    # Obtain the pid and check it against the binary name
-    pid=`cat $PIDFILE`
-    running_pid $pid $NAME || return 1
-    return 0
-}
-
-force_stop() {
-# Forcefully kill the process
-    [ ! -f "$PIDFILE" ] && return
-    if running ; then
-        kill -15 $pid
-        # Is it really dead?
-        [ -n "$DODTIME" ] && sleep "$DODTIME"s
-        if running ; then
-            kill -9 $pid
-            [ -n "$DODTIME" ] && sleep "$DODTIME"s
-            if running ; then
-                echo "Cannot kill $LABEL (pid=$pid)!"
-                exit 1
-            fi
-        fi
-    fi
-    rm -f $PIDFILE
-    return 0
-}
-
-case "$1" in
-  start)
-	echo -n "Starting $DESC: "
-	start-stop-daemon --start --quiet --pidfile $PIDFILE \
-		--exec $DAEMON -- $DAEMON_OPTS
-        if running then
-            echo "$NAME."
-        else
-            echo " ERROR."
-        fi
-	;;
-  stop)
-	echo -n "Stopping $DESC: "
-	start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-		--exec $DAEMON
-	echo "$NAME."
-	;;
-  force-stop)
-	echo -n "Forcefully stopping $DESC: "
-        force_stop
-        if ! running then
-            echo "$NAME."
-        else
-            echo " ERROR."
-        fi
-	;;
-  #reload)
-	#
-	#	If the daemon can reload its config files on the fly
-	#	for example by sending it SIGHUP, do it here.
-	#
-	#	If the daemon responds to changes in its config file
-	#	directly anyway, make this a do-nothing entry.
-	#
-	# echo "Reloading $DESC configuration files."
-	# start-stop-daemon --stop --signal 1 --quiet --pidfile \
-	#	/var/run/$NAME.pid --exec $DAEMON
-  #;;
-  force-reload)
-	#
-	#	If the "reload" option is implemented, move the "force-reload"
-	#	option to the "reload" entry above. If not, "force-reload" is
-	#	just the same as "restart" except that it does nothing if the
-	#   daemon isn't already running.
-	# check wether $DAEMON is running. If so, restart
-	start-stop-daemon --stop --test --quiet --pidfile \
-		/var/run/$NAME.pid --exec $DAEMON \
-	&& $0 restart \
-	|| exit 0
-	;;
-  restart)
-    echo -n "Restarting $DESC: "
-	start-stop-daemon --stop --quiet --pidfile \
-		/var/run/$NAME.pid --exec $DAEMON
-	[ -n "$DODTIME" ] && sleep $DODTIME
-	start-stop-daemon --start --quiet --pidfile \
-		/var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
-	echo "$NAME."
-	;;
-  status)
-    echo -n "$LABEL is "
-    if running ;  then
-        echo "running"
-    else
-        echo " not running."
-        exit 1
-    fi
-    ;;
-  *)
-	N=/etc/init.d/$NAME
-	# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
-	echo "Usage: $N {start|stop|restart|force-reload|status|force-stop}" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/debian/init.d.lsb.ex b/debian/init.d.lsb.ex
deleted file mode 100644
index 908b3fcb..00000000
--- a/debian/init.d.lsb.ex
+++ /dev/null
@@ -1,281 +0,0 @@
-#!/bin/sh 
-#
-# Example init.d script with LSB support.
-#
-# Please read this init.d carefully and modify the sections to
-# adjust it to the program you want to run.
-#
-# Copyright (c) 2007 Javier Fernandez-Sanguino <jfs@debian.org>
-#
-# This is free software; you may redistribute it and/or modify
-# it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2,
-# or (at your option) any later version.
-#
-# This is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License with
-# the Debian operating system, in /usr/share/common-licenses/GPL;  if
-# not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
-#
-### BEGIN INIT INFO
-# Provides:          ibus
-# Required-Start:    $network $local_fs
-# Required-Stop:     
-# Should-Start:      $named
-# Should-Stop:       
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: <Enter a short description of the sortware>
-# Description:       <Enter a long description of the software>
-#                    <...>
-#                    <...>
-### END INIT INFO
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-
-DAEMON=/usr/sbin/ibus # Introduce the server's location here
-NAME=#PACKAGE              # Introduce the short server's name here
-DESC=#PACKAGE              # Introduce a short description here
-LOGDIR=/var/log/ibus  # Log directory to use
-
-PIDFILE=/var/run/$NAME.pid 
-
-test -x $DAEMON || exit 0
-test -x $DAEMON_WRAPPER || exit 0
-
-. /lib/lsb/init-functions
-
-# Default options, these can be overriden by the information
-# at /etc/default/$NAME
-DAEMON_OPTS=""          # Additional options given to the server 
-
-DODTIME=10              # Time to wait for the server to die, in seconds
-                        # If this value is set too low you might not
-                        # let some servers to die gracefully and
-                        # 'restart' will not work
-                        
-LOGFILE=$LOGDIR/$NAME.log  # Server logfile
-#DAEMONUSER=ibus   # Users to run the daemons as. If this value
-                        # is set start-stop-daemon will chuid the server
-
-# Include defaults if available
-if [ -f /etc/default/$NAME ] ; then
-	. /etc/default/$NAME
-fi
-
-# Use this if you want the user to explicitly set 'RUN' in 
-# /etc/default/
-#if [ "x$RUN" != "xyes" ] ; then
-#    log_failure_msg "$NAME disabled, please adjust the configuration to your needs "
-#    log_failure_msg "and then set RUN to 'yes' in /etc/default/$NAME to enable it."
-#    exit 1
-#fi
-
-# Check that the user exists (if we set a user)
-# Does the user exist?
-if [ -n "$DAEMONUSER" ] ; then
-    if getent passwd | grep -q "^$DAEMONUSER:"; then
-        # Obtain the uid and gid
-        DAEMONUID=`getent passwd |grep "^$DAEMONUSER:" | awk -F : '{print $3}'`
-        DAEMONGID=`getent passwd |grep "^$DAEMONUSER:" | awk -F : '{print $4}'`
-    else
-        log_failure_msg "The user $DAEMONUSER, required to run $NAME does not exist."
-        exit 1
-    fi
-fi
-
-
-set -e
-
-running_pid() {
-# Check if a given process pid's cmdline matches a given name
-    pid=$1
-    name=$2
-    [ -z "$pid" ] && return 1 
-    [ ! -d /proc/$pid ] &&  return 1
-    cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1`
-    # Is this the expected server
-    [ "$cmd" != "$name" ] &&  return 1
-    return 0
-}
-
-running() {
-# Check if the process is running looking at /proc
-# (works for all users)
-
-    # No pidfile, probably no daemon present
-    [ ! -f "$PIDFILE" ] && return 1
-    pid=`cat $PIDFILE`
-    running_pid $pid $DAEMON_WRAPPER || return 1
-    return 0
-}
-
-start_server() {
-# Start the process using the wrapper
-        if [ -z "$DAEMONUSER" ] ; then
-            start-stop-daemon --start --quiet --pidfile $PIDFILE \
-                        --exec $DAEMON -- $DAEMON_OPTS
-            errcode=$?
-        else
-# if we are using a daemonuser then change the user id
-            start-stop-daemon --start --quiet --pidfile $PIDFILE \
-                        --chuid $DAEMONUSER \
-                        --exec $DAEMON -- $DAEMON_OPTS
-            errcode=$?
-        fi
-	return $errcode
-}
-
-stop_server() {
-# Stop the process using the wrapper
-        if [ -z "$DAEMONUSER" ] ; then
-            start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-                        --exec $DAEMON
-            errcode=$
-        else
-# if we are using a daemonuser then look for process that match
-            start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-                        --user $DAEMONUSER \
-                        --exec $DAEMON
-            errcode=$
-        fi
-
-	return $errcode
-}
-
-reload_server() {
-    [ ! -f "$PIDFILE" ] && return 1
-    pid=`cat $PIDFILE` # This is the daemon's pid
-    # Send a SIGHUP
-    kill -1 $pid
-    return $?
-}
-
-force_stop() {
-# Force the process to die killing it manually
-	[ ! -e "$PIDFILE" ] && return
-	if running ; then
-		kill -15 $pid
-	# Is it really dead?
-		sleep "$DIETIME"s
-		if running ; then
-			kill -9 $pid
-			sleep "$DIETIME"s
-			if running ; then
-				echo "Cannot kill $NAME (pid=$pid)!"
-				exit 1
-			fi
-		fi
-	fi
-	rm -f $PIDFILE
-}
-
-
-case "$1" in
-  start)
-	log_daemon_msg "Starting $DESC " "$NAME"
-        # Check if it's running first
-        if running ;  then
-            log_progress_msg "apparently already running"
-            log_end_msg 0
-            exit 0
-        fi
-        if start_server && running ;  then
-            # It's ok, the server started and is running
-            log_end_msg 0
-        else
-            # Either we could not start it or it is not running
-            # after we did
-            # NOTE: Some servers might die some time after they start,
-            # this code does not try to detect this and might give
-            # a false positive (use 'status' for that)
-            log_end_msg 1
-        fi
-	;;
-  stop)
-        log_daemon_msg "Stopping $DESC" "$NAME"
-        if running ; then
-            # Only stop the server if we see it running
-            stop_server
-            log_end_msg $?
-        else
-            # If it's not running don't do anything
-            log_progress_msg "apparently not running"
-            log_end_msg 0
-            exit 0
-        fi
-        ;;
-  force-stop)
-        # First try to stop gracefully the program
-        $0 stop
-        if running; then
-            # If it's still running try to kill it more forcefully
-            log_daemon_msg "Stopping (force) $DESC" "$NAME"
-            force_stop
-            log_end_msg $?
-        fi
-	;;
-  restart|force-reload)
-        log_daemon_msg "Restarting $DESC" "$NAME"
-        stop_server
-        # Wait some sensible amount, some server need this
-        [ -n "$DIETIME" ] && sleep $DIETIME
-        start_server
-        running
-        log_end_msg $?
-	;;
-  status)
-
-        log_daemon_msg "Checking status of $DESC" "$NAME"
-        if running ;  then
-            log_progress_msg "running"
-            log_end_msg 0
-        else
-            log_progress_msg "apparently not running"
-            log_end_msg 1
-            exit 1
-        fi
-        ;;
-  # Use this if the daemon cannot reload
-  reload)
-        log_warning_msg "Reloading $NAME daemon: not implemented, as the daemon"
-        log_warning_msg "cannot re-read the config file (use restart)."
-        ;;
-  # And this if it cann
-  #reload)
-          #
-          # If the daemon can reload its config files on the fly
-          # for example by sending it SIGHUP, do it here.
-          #
-          # If the daemon responds to changes in its config file
-          # directly anyway, make this a do-nothing entry.
-          #
-          # log_daemon_msg "Reloading $DESC configuration files" "$NAME"
-          # if running ; then
-          #    reload_server
-          #    if ! running ;  then
-          # Process died after we tried to reload
-          #       log_progress_msg "died on reload"
-          #       log_end_msg 1
-          #       exit 1
-          #    fi
-          # else
-          #    log_progress_msg "server is not running"
-          #    log_end_msg 1
-          #    exit 1
-          # fi
-                                                                                    #;;
-
-  *)
-	N=/etc/init.d/$NAME
-	echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/debian/libibus-dev.install b/debian/libibus-dev.install
new file mode 100644
index 00000000..1ff189ec
--- /dev/null
+++ b/debian/libibus-dev.install
@@ -0,0 +1,4 @@
+debian/tmp/usr/include/*
+debian/tmp/usr/lib/libibus.so
+debian/tmp/usr/lib/libibus.a
+debian/tmp/usr/lib/pkgconfig/*
diff --git a/debian/libibus1.install b/debian/libibus1.install
new file mode 100644
index 00000000..7c47ebf7
--- /dev/null
+++ b/debian/libibus1.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libibus.so.1*
diff --git a/debian/libibus1.symbols b/debian/libibus1.symbols
new file mode 100644
index 00000000..eaef3916
--- /dev/null
+++ b/debian/libibus1.symbols
@@ -0,0 +1,329 @@
+libibus.so.1 libibus1 #MINVER#
+ ibus_attr_background_new@Base 1.2.0.20090617
+ ibus_attr_foreground_new@Base 1.2.0.20090617
+ ibus_attr_list_append@Base 1.2.0.20090617
+ ibus_attr_list_get@Base 1.2.0.20090617
+ ibus_attr_list_get_type@Base 1.2.0.20090617
+ ibus_attr_list_new@Base 1.2.0.20090617
+ ibus_attr_type_get_type@Base 1.2.0.20090617
+ ibus_attr_underline_get_type@Base 1.2.0.20090617
+ ibus_attr_underline_new@Base 1.2.0.20090617
+ ibus_attribute_get_type@Base 1.2.0.20090617
+ ibus_attribute_new@Base 1.2.0.20090617
+ ibus_bus_add_match@Base 1.2.0.20090617
+ ibus_bus_create_input_context@Base 1.2.0.20090617
+ ibus_bus_exit@Base 1.2.0.20090617
+ ibus_bus_get_config@Base 1.2.0.20090617
+ ibus_bus_get_connection@Base 1.2.0.20090617
+ ibus_bus_get_name_owner@Base 1.2.0.20090617
+ ibus_bus_get_type@Base 1.2.0.20090617
+ ibus_bus_hello@Base 1.2.0.20090617
+ ibus_bus_is_connected@Base 1.2.0.20090617
+ ibus_bus_list_active_engines@Base 1.2.0.20090617
+ ibus_bus_list_engines@Base 1.2.0.20090617
+ ibus_bus_list_names@Base 1.2.0.20090617
+ ibus_bus_name_has_owner@Base 1.2.0.20090617
+ ibus_bus_new@Base 1.2.0.20090617
+ ibus_bus_register_component@Base 1.2.0.20090617
+ ibus_bus_release_name@Base 1.2.0.20090617
+ ibus_bus_remove_match@Base 1.2.0.20090617
+ ibus_bus_request_name@Base 1.2.0.20090617
+ ibus_bus_set_watch_dbus_signal@Base 1.2.0.20090617
+ ibus_capabilite_get_type@Base 1.2.0.20090617
+ ibus_component_add_engine@Base 1.2.0.20090617
+ ibus_component_add_observed_path@Base 1.2.0.20090617
+ ibus_component_check_modification@Base 1.2.0.20090617
+ ibus_component_get_engines@Base 1.2.0.20090617
+ ibus_component_get_from_engine@Base 1.2.0.20090617
+ ibus_component_get_type@Base 1.2.0.20090617
+ ibus_component_is_running@Base 1.2.0.20090617
+ ibus_component_new@Base 1.2.0.20090617
+ ibus_component_new_from_file@Base 1.2.0.20090617
+ ibus_component_new_from_xml_node@Base 1.2.0.20090617
+ ibus_component_output@Base 1.2.0.20090617
+ ibus_component_output_engines@Base 1.2.0.20090617
+ ibus_component_start@Base 1.2.0.20090617
+ ibus_component_stop@Base 1.2.0.20090617
+ ibus_config_get_type@Base 1.2.0.20090617
+ ibus_config_get_value@Base 1.2.0.20090617
+ ibus_config_new@Base 1.2.0.20090617
+ ibus_config_service_get_type@Base 1.2.0.20090617
+ ibus_config_service_new@Base 1.2.0.20090617
+ ibus_config_service_value_changed@Base 1.2.0.20090617
+ ibus_config_set_value@Base 1.2.0.20090617
+ ibus_connection_call@Base 1.2.0.20090617
+ ibus_connection_close@Base 1.2.0.20090617
+ ibus_connection_flush@Base 1.2.0.20090617
+ ibus_connection_get_connection@Base 1.2.0.20090617
+ ibus_connection_get_type@Base 1.2.0.20090617
+ ibus_connection_get_unix_user@Base 1.2.0.20090617
+ ibus_connection_is_authenticated@Base 1.2.0.20090617
+ ibus_connection_is_connected@Base 1.2.0.20090617
+ ibus_connection_new@Base 1.2.0.20090617
+ ibus_connection_open@Base 1.2.0.20090617
+ ibus_connection_open_private@Base 1.2.0.20090617
+ ibus_connection_read_write_dispatch@Base 1.2.0.20090617
+ ibus_connection_register_object_path@Base 1.2.0.20090617
+ ibus_connection_send@Base 1.2.0.20090617
+ ibus_connection_send_signal@Base 1.2.0.20090617
+ ibus_connection_send_signal_valist@Base 1.2.0.20090617
+ ibus_connection_send_valist@Base 1.2.0.20090617
+ ibus_connection_send_with_reply@Base 1.2.0.20090617
+ ibus_connection_send_with_reply_and_block@Base 1.2.0.20090617
+ ibus_connection_set_connection@Base 1.2.0.20090617
+ ibus_connection_unregister_object_path@Base 1.2.0.20090617
+ ibus_dbus_connection_setup@Base 1.2.0.20090617
+ ibus_dbus_server_setup@Base 1.2.0.20090617
+ ibus_engine_commit_text@Base 1.2.0.20090617
+ ibus_engine_desc_get_type@Base 1.2.0.20090617
+ ibus_engine_desc_new@Base 1.2.0.20090617
+ ibus_engine_desc_new_from_xml_node@Base 1.2.0.20090617
+ ibus_engine_desc_output@Base 1.2.0.20090617
+ ibus_engine_forward_key_event@Base 1.2.0.20090617
+ ibus_engine_get_name@Base 1.2.0.20090617
+ ibus_engine_get_type@Base 1.2.0.20090617
+ ibus_engine_hide_auxiliary_text@Base 1.2.0.20090617
+ ibus_engine_hide_lookup_table@Base 1.2.0.20090617
+ ibus_engine_hide_preedit_text@Base 1.2.0.20090617
+ ibus_engine_new@Base 1.2.0.20090617
+ ibus_engine_register_properties@Base 1.2.0.20090617
+ ibus_engine_show_auxiliary_text@Base 1.2.0.20090617
+ ibus_engine_show_lookup_table@Base 1.2.0.20090617
+ ibus_engine_show_preedit_text@Base 1.2.0.20090617
+ ibus_engine_update_auxiliary_text@Base 1.2.0.20090617
+ ibus_engine_update_lookup_table@Base 1.2.0.20090617
+ ibus_engine_update_lookup_table_fast@Base 1.2.0.20090617
+ ibus_engine_update_preedit_text@Base 1.2.0.20090617
+ ibus_engine_update_property@Base 1.2.0.20090617
+ ibus_error_free@Base 1.2.0.20090617
+ ibus_error_new@Base 1.2.0.20090617
+ ibus_error_new_from_message@Base 1.2.0.20090617
+ ibus_error_new_from_printf@Base 1.2.0.20090617
+ ibus_error_new_from_text@Base 1.2.0.20090617
+ ibus_factory_add_engine@Base 1.2.0.20090617
+ ibus_factory_get_type@Base 1.2.0.20090617
+ ibus_factory_info_get_type@Base 1.2.0.20090617
+ ibus_factory_info_new@Base 1.2.0.20090617
+ ibus_factory_new@Base 1.2.0.20090617
+ ibus_free_strv@Base 1.2.0.20090617
+ ibus_get_address@Base 1.2.0.20090617
+ ibus_get_daemon_uid@Base 1.2.0.20090617
+ ibus_get_local_machine_id@Base 1.2.0.20090719
+ ibus_get_session_id@Base 1.2.0.20090617
+#MISSING: 1.2.0.20090812-1# ibus_get_socket_folder@Base 1.2.0.20090617
+ ibus_get_socket_path@Base 1.2.0.20090617
+ ibus_get_user_name@Base 1.2.0.20090617
+ ibus_hotkey_get_type@Base 1.2.0.20090617
+ ibus_hotkey_profile_add_hotkey@Base 1.2.0.20090617
+ ibus_hotkey_profile_add_hotkey_from_string@Base 1.2.0.20090617
+ ibus_hotkey_profile_filter_key_event@Base 1.2.0.20090617
+ ibus_hotkey_profile_get_type@Base 1.2.0.20090617
+ ibus_hotkey_profile_new@Base 1.2.0.20090617
+ ibus_hotkey_profile_remove_hotkey@Base 1.2.0.20090617
+ ibus_hotkey_profile_remove_hotkey_by_event@Base 1.2.0.20090617
+ ibus_init@Base 1.2.0.20090617
+ ibus_input_context_cursor_down@Base 1.2.0.20090617
+ ibus_input_context_cursor_up@Base 1.2.0.20090617
+ ibus_input_context_disable@Base 1.2.0.20090617
+ ibus_input_context_enable@Base 1.2.0.20090617
+ ibus_input_context_focus_in@Base 1.2.0.20090617
+ ibus_input_context_focus_out@Base 1.2.0.20090617
+ ibus_input_context_get_type@Base 1.2.0.20090617
+ ibus_input_context_new@Base 1.2.0.20090617
+ ibus_input_context_page_down@Base 1.2.0.20090617
+ ibus_input_context_page_up@Base 1.2.0.20090617
+ ibus_input_context_process_key_event@Base 1.2.0.20090617
+ ibus_input_context_property_activate@Base 1.2.0.20090617
+ ibus_input_context_property_hide@Base 1.2.0.20090617
+ ibus_input_context_property_show@Base 1.2.0.20090617
+ ibus_input_context_reset@Base 1.2.0.20090617
+ ibus_input_context_set_capabilities@Base 1.2.0.20090617
+ ibus_input_context_set_cursor_location@Base 1.2.0.20090617
+ ibus_key_event_from_string@Base 1.2.0.20090617
+ ibus_key_event_to_string@Base 1.2.0.20090617
+ ibus_keymap_fill@Base 1.2.0.20090617
+ ibus_keymap_get_type@Base 1.2.0.20090617
+ ibus_keymap_lookup_keysym@Base 1.2.0.20090617
+ ibus_keymap_new@Base 1.2.0.20090617
+ ibus_keyval_from_name@Base 1.2.0.20090617
+ ibus_keyval_name@Base 1.2.0.20090617
+ ibus_lookup_table_append_candidate@Base 1.2.0.20090617
+ ibus_lookup_table_append_label@Base 1.2.0.20090617
+ ibus_lookup_table_clear@Base 1.2.0.20090617
+ ibus_lookup_table_cursor_down@Base 1.2.0.20090617
+ ibus_lookup_table_cursor_up@Base 1.2.0.20090617
+ ibus_lookup_table_get_candidate@Base 1.2.0.20090617
+ ibus_lookup_table_get_cursor_in_page@Base 1.2.0.20090617
+ ibus_lookup_table_get_cursor_pos@Base 1.2.0.20090617
+ ibus_lookup_table_get_label@Base 1.2.0.20090617
+ ibus_lookup_table_get_page_size@Base 1.2.0.20090617
+ ibus_lookup_table_get_type@Base 1.2.0.20090617
+ ibus_lookup_table_is_cursor_visible@Base 1.2.0.20090617
+ ibus_lookup_table_new@Base 1.2.0.20090617
+ ibus_lookup_table_page_down@Base 1.2.0.20090617
+ ibus_lookup_table_page_up@Base 1.2.0.20090617
+ ibus_lookup_table_set_cursor_pos@Base 1.2.0.20090617
+ ibus_lookup_table_set_cursor_visible@Base 1.2.0.20090617
+ ibus_lookup_table_set_page_size@Base 1.2.0.20090617
+ ibus_main@Base 1.2.0.20090617
+ ibus_mainloop_setup@Base 1.2.0.20090617
+ ibus_marshal_BOOLEAN__POINTER@Base 1.2.0.20090617
+ ibus_marshal_BOOLEAN__POINTER_POINTER@Base 1.2.0.20090617
+ ibus_marshal_BOOLEAN__UINT_UINT@Base 1.2.0.20090617
+ ibus_marshal_BOOLEAN__UINT_UINT_UINT@Base 1.2.0.20090617
+ ibus_marshal_BOOLEAN__ULONG@Base 1.2.0.20090617
+ ibus_marshal_VOID__BOXED_BOOLEAN@Base 1.2.0.20090617
+ ibus_marshal_VOID__INT_INT_INT_INT@Base 1.2.0.20090617
+ ibus_marshal_VOID__OBJECT_BOOLEAN@Base 1.2.0.20090617
+ ibus_marshal_VOID__OBJECT_UINT_BOOLEAN@Base 1.2.0.20090617
+ ibus_marshal_VOID__STRING_INT@Base 1.2.0.20090617
+ ibus_marshal_VOID__STRING_STRING_BOXED@Base 1.2.0.20090617
+ ibus_marshal_VOID__STRING_STRING_STRING@Base 1.2.0.20090617
+ ibus_marshal_VOID__STRING_UINT@Base 1.2.0.20090617
+ ibus_marshal_VOID__UINT_UINT@Base 1.2.0.20090617
+ ibus_marshal_VOID__UINT_UINT_UINT@Base 1.2.0.20090617
+ ibus_message_append_args@Base 1.2.0.20090617
+ ibus_message_append_args_valist@Base 1.2.0.20090617
+ ibus_message_get_args@Base 1.2.0.20090617
+ ibus_message_get_args_valist@Base 1.2.0.20090617
+ ibus_message_get_destination@Base 1.2.0.20090617
+ ibus_message_get_error_message@Base 1.2.0.20090617
+ ibus_message_get_error_name@Base 1.2.0.20090617
+ ibus_message_get_interface@Base 1.2.0.20090617
+ ibus_message_get_member@Base 1.2.0.20090617
+ ibus_message_get_no_reply@Base 1.2.0.20090617
+ ibus_message_get_path@Base 1.2.0.20090617
+ ibus_message_get_reply_serial@Base 1.2.0.20090617
+ ibus_message_get_sender@Base 1.2.0.20090617
+ ibus_message_get_serial@Base 1.2.0.20090617
+ ibus_message_get_type@Base 1.2.0.20090617
+ ibus_message_is_error@Base 1.2.0.20090617
+ ibus_message_is_method_call@Base 1.2.0.20090617
+ ibus_message_is_signal@Base 1.2.0.20090617
+ ibus_message_iter_append@Base 1.2.0.20090617
+ ibus_message_iter_close_container@Base 1.2.0.20090617
+ ibus_message_iter_copy_data@Base 1.2.0.20090719
+ ibus_message_iter_get@Base 1.2.0.20090617
+ ibus_message_iter_get_arg_type@Base 1.2.0.20090617
+ ibus_message_iter_get_basic@Base 1.2.0.20090617
+ ibus_message_iter_get_element_type@Base 1.2.0.20090617
+ ibus_message_iter_has_next@Base 1.2.0.20090617
+ ibus_message_iter_init@Base 1.2.0.20090617
+ ibus_message_iter_init_append@Base 1.2.0.20090617
+ ibus_message_iter_next@Base 1.2.0.20090617
+ ibus_message_iter_open_container@Base 1.2.0.20090617
+#MISSING: 1.2.0.20090719-1# ibus_message_iter_peek@Base 1.2.0.20090617
+ ibus_message_iter_recurse@Base 1.2.0.20090617
+ ibus_message_new@Base 1.2.0.20090617
+ ibus_message_new_error@Base 1.2.0.20090617
+ ibus_message_new_error_printf@Base 1.2.0.20090617
+ ibus_message_new_method_call@Base 1.2.0.20090617
+ ibus_message_new_method_return@Base 1.2.0.20090617
+ ibus_message_new_signal@Base 1.2.0.20090617
+ ibus_message_ref@Base 1.2.0.20090617
+ ibus_message_set_destination@Base 1.2.0.20090617
+ ibus_message_set_error_name@Base 1.2.0.20090617
+ ibus_message_set_interface@Base 1.2.0.20090617
+ ibus_message_set_member@Base 1.2.0.20090617
+ ibus_message_set_no_reply@Base 1.2.0.20090617
+ ibus_message_set_path@Base 1.2.0.20090617
+ ibus_message_set_reply_serial@Base 1.2.0.20090617
+ ibus_message_set_sender@Base 1.2.0.20090617
+ ibus_message_to_string@Base 1.2.0.20090617
+ ibus_message_unref@Base 1.2.0.20090617
+ ibus_modifier_type_get_type@Base 1.2.0.20090617
+ ibus_object_destroy@Base 1.2.0.20090617
+ ibus_object_flags_get_type@Base 1.2.0.20090617
+ ibus_object_get_type@Base 1.2.0.20090617
+ ibus_object_new@Base 1.2.0.20090617
+ ibus_observed_path_check_modification@Base 1.2.0.20090617
+ ibus_observed_path_get_type@Base 1.2.0.20090617
+ ibus_observed_path_new@Base 1.2.0.20090617
+ ibus_observed_path_new_from_xml_node@Base 1.2.0.20090617
+ ibus_observed_path_output@Base 1.2.0.20090617
+ ibus_observed_path_traverse@Base 1.2.0.20090617
+ ibus_pending_call_allocate_data_slot@Base 1.2.0.20090617
+ ibus_pending_call_block@Base 1.2.0.20090617
+ ibus_pending_call_cancel@Base 1.2.0.20090617
+ ibus_pending_call_free_data_slot@Base 1.2.0.20090617
+ ibus_pending_call_get_completed@Base 1.2.0.20090617
+ ibus_pending_call_get_data@Base 1.2.0.20090617
+ ibus_pending_call_ref@Base 1.2.0.20090617
+ ibus_pending_call_set_data@Base 1.2.0.20090617
+ ibus_pending_call_set_notify@Base 1.2.0.20090617
+ ibus_pending_call_steal_reply@Base 1.2.0.20090617
+ ibus_pending_call_unref@Base 1.2.0.20090617
+ ibus_pending_call_wait@Base 1.2.0.20090617
+ ibus_prop_list_append@Base 1.2.0.20090617
+ ibus_prop_list_get@Base 1.2.0.20090617
+ ibus_prop_list_get_type@Base 1.2.0.20090617
+ ibus_prop_list_new@Base 1.2.0.20090617
+ ibus_prop_list_update_property@Base 1.2.0.20090617
+ ibus_prop_state_get_type@Base 1.2.0.20090617
+ ibus_prop_type_get_type@Base 1.2.0.20090617
+ ibus_property_get_type@Base 1.2.0.20090617
+ ibus_property_new@Base 1.2.0.20090617
+ ibus_property_set_icon@Base 1.2.0.20090828
+ ibus_property_set_label@Base 1.2.0.20090617
+ ibus_property_set_sensitive@Base 1.2.0.20090828
+ ibus_property_set_state@Base 1.2.0.20090828
+ ibus_property_set_sub_props@Base 1.2.0.20090617
+ ibus_property_set_tooltip@Base 1.2.0.20090828
+ ibus_property_set_visible@Base 1.2.0.20090617
+ ibus_property_update@Base 1.2.0.20090617
+ ibus_proxy_call@Base 1.2.0.20090617
+ ibus_proxy_call_with_reply@Base 1.2.0.20090617
+ ibus_proxy_call_with_reply_and_block@Base 1.2.0.20090617
+ ibus_proxy_get_connection@Base 1.2.0.20090617
+ ibus_proxy_get_interface@Base 1.2.0.20090617
+ ibus_proxy_get_name@Base 1.2.0.20090617
+ ibus_proxy_get_path@Base 1.2.0.20090617
+ ibus_proxy_get_type@Base 1.2.0.20090617
+ ibus_proxy_get_unique_name@Base 1.2.0.20090617
+ ibus_proxy_handle_signal@Base 1.2.0.20090617
+ ibus_proxy_new@Base 1.2.0.20090617
+ ibus_proxy_send@Base 1.2.0.20090617
+ ibus_quit@Base 1.2.0.20090617
+ ibus_serializable_copy@Base 1.2.0.20090617
+ ibus_serializable_deserialize@Base 1.2.0.20090617
+ ibus_serializable_get_qattachment@Base 1.2.0.20090617
+ ibus_serializable_get_type@Base 1.2.0.20090617
+ ibus_serializable_new@Base 1.2.0.20090617
+ ibus_serializable_remove_qattachment@Base 1.2.0.20090617
+ ibus_serializable_serialize@Base 1.2.0.20090617
+ ibus_serializable_set_qattachment@Base 1.2.0.20090617
+ ibus_server_disconnect@Base 1.2.0.20090617
+ ibus_server_get_address@Base 1.2.0.20090617
+ ibus_server_get_id@Base 1.2.0.20090617
+ ibus_server_get_type@Base 1.2.0.20090617
+ ibus_server_is_connected@Base 1.2.0.20090617
+ ibus_server_listen@Base 1.2.0.20090617
+ ibus_server_new@Base 1.2.0.20090617
+ ibus_server_set_auth_mechanisms@Base 1.2.0.20090617
+ ibus_service_add_to_connection@Base 1.2.0.20090617
+ ibus_service_get_connections@Base 1.2.0.20090617
+ ibus_service_get_path@Base 1.2.0.20090617
+ ibus_service_get_type@Base 1.2.0.20090617
+ ibus_service_handle_message@Base 1.2.0.20090617
+ ibus_service_new@Base 1.2.0.20090617
+ ibus_service_remove_from_all_connections@Base 1.2.0.20090617
+ ibus_service_remove_from_connection@Base 1.2.0.20090617
+ ibus_service_send_signal@Base 1.2.0.20090617
+ ibus_set_display@Base 1.2.0.20090617
+ ibus_text_append_attribute@Base 1.2.0.20090617
+ ibus_text_get_length@Base 1.2.0.20090617
+ ibus_text_get_type@Base 1.2.0.20090617
+ ibus_text_new_from_printf@Base 1.2.0.20090617
+ ibus_text_new_from_static_string@Base 1.2.0.20090617
+ ibus_text_new_from_string@Base 1.2.0.20090617
+ ibus_text_new_from_ucs4@Base 1.2.0.20090617
+ ibus_text_new_from_unichar@Base 1.2.0.20090617
+ ibus_type_get_array@Base 1.2.0.20090617
+ ibus_type_get_dict_entry@Base 1.2.0.20090617
+ ibus_type_get_object_path@Base 1.2.0.20090617
+ ibus_type_get_struct@Base 1.2.0.20090617
+ ibus_type_get_variant@Base 1.2.0.20090617
+ ibus_write_address@Base 1.2.0.20090719
+ ibus_xml_free@Base 1.2.0.20090617
+ ibus_xml_parse_buffer@Base 1.2.0.20090617
+ ibus_xml_parse_file@Base 1.2.0.20090617
diff --git a/debian/manpage.1.ex b/debian/manpage.1.ex
deleted file mode 100644
index d9966642..00000000
--- a/debian/manpage.1.ex
+++ /dev/null
@@ -1,59 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH IBUS SECTION "九月 11, 2008"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-ibus \- program to do something
-.SH SYNOPSIS
-.B ibus
-.RI [ options ] " files" ...
-.br
-.B bar
-.RI [ options ] " files" ...
-.SH DESCRIPTION
-This manual page documents briefly the
-.B ibus
-and
-.B bar
-commands.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBibus\fP is a program that...
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-For a complete description, see the Info files.
-.TP
-.B \-h, \-\-help
-Show summary of options.
-.TP
-.B \-v, \-\-version
-Show version of program.
-.SH SEE ALSO
-.BR bar (1),
-.BR baz (1).
-.br
-The programs are documented fully by
-.IR "The Rise and Fall of a Fooish Bar" ,
-available via the Info system.
-.SH AUTHOR
-ibus was written by <upstream author>.
-.PP
-This manual page was written by oneleaf <oneleaf@gmail.com>,
-for the Debian project (but may be used by others).
diff --git a/debian/manpage.sgml.ex b/debian/manpage.sgml.ex
deleted file mode 100644
index 892e663a..00000000
--- a/debian/manpage.sgml.ex
+++ /dev/null
@@ -1,156 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-
-    
-	The docbook-to-man binary is found in the docbook-to-man package.
-	Please remember that if you create the nroff version in one of the
-	debian/rules file targets (such as build), you will need to include
-	docbook-to-man in your Build-Depends control field.
-
-  -->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>FIRSTNAME</firstname>">
-  <!ENTITY dhsurname   "<surname>SURNAME</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>九月 11, 2008</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>SECTION</manvolnum>">
-  <!ENTITY dhemail     "<email>oneleaf@gmail.com</email>">
-  <!ENTITY dhusername  "oneleaf">
-  <!ENTITY dhucpackage "<refentrytitle>IBUS</refentrytitle>">
-  <!ENTITY dhpackage   "ibus">
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2003</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>program to do something</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-
-      <arg><option>-e <replaceable>this</replaceable></option></arg>
-
-      <arg><option>--example <replaceable>that</replaceable></option></arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command> and <command>bar</command>
-      commands.</para>
-
-    <para>This manual page was written for the &debian; distribution
-      because the original program does not have a manual page.
-      Instead, it has documentation in the &gnu;
-      <application>Info</application> format; see below.</para>
-
-    <para><command>&dhpackage;</command> is a program that...</para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>These programs follow the usual &gnu; command line syntax,
-      with long options starting with two dashes (`-').  A summary of
-      options is included below.  For a complete description, see the
-      <application>Info</application> files.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>-h</option>
-          <option>--help</option>
-        </term>
-        <listitem>
-          <para>Show summary of options.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-v</option>
-          <option>--version</option>
-        </term>
-        <listitem>
-          <para>Show version of program.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>SEE ALSO</title>
-
-    <para>bar (1), baz (1).</para>
-
-    <para>The programs are documented fully by <citetitle>The Rise and
-      Fall of a Fooish Bar</citetitle> available via the
-      <application>Info</application> system.</para>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername; &dhemail; for
-      the &debian; system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the &gnu; General Public License, Version 2 any 
-	  later version published by the Free Software Foundation.
-    </para>
-	<para>
-	  On Debian systems, the complete text of the GNU General Public
-	  License can be found in /usr/share/common-licenses/GPL.
-	</para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
-
-
diff --git a/debian/manpage.xml.ex b/debian/manpage.xml.ex
deleted file mode 100644
index 164afdeb..00000000
--- a/debian/manpage.xml.ex
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
-<!--
-
-Process this file with an XSLT processor: `xsltproc \
--''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
-manpages/docbook.xsl manpage.dbk'.  A manual page
-<package>.<section> will be generated.  You may view the
-manual page with: nroff -man <package>.<section> | less'.  A
-typical entry in a Makefile or Makefile.am is:
-
-DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
-manpages/docbook.xsl
-XP=xsltproc -''-nonet
-
-manpage.1: manpage.dbk
-        $(XP) $(DB2MAN) $<
-    
-The xsltproc binary is found in the xsltproc package.  The
-XSL files are in docbook-xsl.  Please remember that if you
-create the nroff version in one of the debian/rules file
-targets (such as build), you will need to include xsltproc
-and docbook-xsl in your Build-Depends control field.
-
--->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>FIRSTNAME</firstname>">
-  <!ENTITY dhsurname   "<surname>SURNAME</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>九月 11, 2008</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>SECTION</manvolnum>">
-  <!ENTITY dhemail     "<email>oneleaf@gmail.com</email>">
-  <!ENTITY dhusername  "oneleaf">
-  <!ENTITY dhucpackage "<refentrytitle>IBUS</refentrytitle>">
-  <!ENTITY dhpackage   "ibus">
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <copyright>
-      <year>2007</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>program to do something</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-
-      <arg><option>-e <replaceable>this</replaceable></option></arg>
-
-      <arg><option>--example <replaceable>that</replaceable></option></arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command> and <command>bar</command>
-      commands.</para>
-
-    <para>This manual page was written for the &debian; distribution
-      because the original program does not have a manual page.
-      Instead, it has documentation in the &gnu;
-      <application>Info</application> format; see below.</para>
-
-    <para><command>&dhpackage;</command> is a program that...</para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>These programs follow the usual &gnu; command line syntax,
-      with long options starting with two dashes (`-').  A summary of
-      options is included below.  For a complete description, see the
-      <application>Info</application> files.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>-h</option>
-          <option>--help</option>
-        </term>
-        <listitem>
-          <para>Show summary of options.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-v</option>
-          <option>--version</option>
-        </term>
-        <listitem>
-          <para>Show version of program.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>SEE ALSO</title>
-
-    <para>bar (1), baz (1).</para>
-
-    <para>The programs are documented fully by <citetitle>The Rise and
-      Fall of a Fooish Bar</citetitle> available via the
-      <application>Info</application> system.</para>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername; &dhemail; for
-      the &debian; system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the &gnu; General Public License, Version 2 any 
-	  later version published by the Free Software Foundation.
-    </para>
-	<para>
-	  On Debian systems, the complete text of the GNU General Public
-	  License can be found in /usr/share/common-licenses/GPL.
-	</para>
-
-  </refsect1>
-</refentry>
-
diff --git a/debian/menu.ex b/debian/menu.ex
deleted file mode 100644
index 219262ba..00000000
--- a/debian/menu.ex
+++ /dev/null
@@ -1,2 +0,0 @@
-?package(ibus):needs="X11|text|vc|wm" section="Applications/see-menu-manual"\
-  title="ibus" command="/usr/bin/ibus"
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644
index 46f092ac..00000000
--- a/debian/postinst
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-set -e
-
-update-alternatives \
-        --install /etc/X11/xinit/xinput.d/zh_CN xinput-zh_CN \
-        /etc/X11/xinit/xinput.d/ibus 40
-
-#DEBHELPER#
diff --git a/debian/postinst.ex b/debian/postinst.ex
deleted file mode 100644
index d1d0648c..00000000
--- a/debian/postinst.ex
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-# postinst script for ibus
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    configure)
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/postrm.ex b/debian/postrm.ex
deleted file mode 100644
index 876dba3b..00000000
--- a/debian/postrm.ex
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-# postrm script for ibus
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/preinst.ex b/debian/preinst.ex
deleted file mode 100644
index 0889dba9..00000000
--- a/debian/preinst.ex
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# preinst script for ibus
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <new-preinst> `install'
-#        * <new-preinst> `install' <old-version>
-#        * <new-preinst> `upgrade' <old-version>
-#        * <old-preinst> `abort-upgrade' <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    install|upgrade)
-    ;;
-
-    abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/prerm b/debian/prerm
deleted file mode 100644
index 4ee844c6..00000000
--- a/debian/prerm
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-set -e
-
-update-alternatives --remove xinput-zh_CN /etc/X11/xinit/xinput.d/ibus
-
-#DEBHELPER#
diff --git a/debian/prerm.ex b/debian/prerm.ex
deleted file mode 100644
index 60fa4da0..00000000
--- a/debian/prerm.ex
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-# prerm script for ibus
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    remove|upgrade|deconfigure)
-    ;;
-
-    failed-upgrade)
-    ;;
-
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/python-ibus.install b/debian/python-ibus.install
new file mode 100644
index 00000000..5996c8a0
--- /dev/null
+++ b/debian/python-ibus.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/python*/*
diff --git a/debian/pyversions b/debian/pyversions
new file mode 100644
index 00000000..b3dc41eb
--- /dev/null
+++ b/debian/pyversions
@@ -0,0 +1 @@
+2.5-
diff --git a/debian/rules b/debian/rules
index f1b3bf76..b83684b4 100644
--- a/debian/rules
+++ b/debian/rules
@@ -1,108 +1,114 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 # Sample debian/rules that uses debhelper.
+#
 # This file was originally written by Joey Hess and Craig Small.
 # As a special exception, when this file is copied by dh-make into a
 # dh-make output file, you may use that output file without restriction.
 # This special exception was added by Craig Small in version 0.37 of dh-make.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets  by Bill Allombert 2001
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-GTKVER = $(shell pkg-config --variable=gtk_binary_version gtk+-2.0)
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+else
+CROSS= --build $(DEB_BUILD_GNU_TYPE)
+endif
 
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
+	ln -sf /usr/share/misc/config.sub config.sub
 endif
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
+	ln -sf /usr/share/misc/config.guess config.guess
 endif
-	./configure --host=$(DEB_HOST_GNU_TYPE) \
-				--build=$(DEB_BUILD_GNU_TYPE) \
-				--prefix=/usr \
-				--mandir=\$${prefix}/share/man \
-				--infodir=\$${prefix}/share/info \
-				CFLAGS="$(CFLAGS)" \
-				LDFLAGS="-Wl,-z,defs" \
-				$(NULL)
-
-build: build-stamp
+	dh_auto_configure -- --enable-static LDFLAGS="-Wl,--as-needed"
 
-build-stamp:  config.status
-	dh_testdir
 
-	# Add here commands to compile the package.
+#Architecture
+build: build-stamp
+build-stamp: config.status
 	$(MAKE)
-	#docbook-to-man debian/ibus.sgml > ibus.1
-
 	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
+	rm -f build-arch-stamp build-indep-stamp 
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-	rm -f config.sub config.guess
-
+	[ ! -f Makefile ] || $(MAKE) distclean
 	dh_clean 
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_prep
 	dh_installdirs
-
-	# Add here commands to install the package into debian/ibus.
-	$(MAKE) DESTDIR=$(CURDIR)/debian/ibus install
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	install -d $(CURDIR)/debian/ibus/etc/X11/xinit/xinput.d/
-	install -m 644 $(CURDIR)/debian/im-switch/ibus $(CURDIR)/debian/ibus/etc/X11/xinit/xinput.d/
-	dh_installexamples
-	dh_install
-	LD_LIBRARY_PATH=$(CURDIR)/debian/ibus/usr/lib:$(LD_LIBRARY_PATH) dh_gtkmodules
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_python
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+	rm -rf $(CURDIR)/debian/tmp/usr/lib/libibus.la \
+		$(CURDIR)/debian/tmp/usr/lib/gtk-2.0/2.10.0/immodules/im-ibus.a \
+		$(CURDIR)/debian/tmp/usr/lib/gtk-2.0/2.10.0/immodules/im-ibus.la \
+		$(CURDIR)/debian/tmp/etc/xdg \
+		$(CURDIR)/debian/tmp/usr/share/applications/ibus.desktop
+	dh_install --list-missing --fail-missing
+
+binary-indep: install
+	dh_testdir -i
+	dh_testroot -i
+	dh_installchangelogs -i
+	dh_installdocs -i
+	dh_installexamples -i
+	dh_installman -i
+	dh_gconf -i
+	dh_link -i
+	dh_strip -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_makeshlibs -Nibus-gtk -i
+	dh_pysupport -i
+	dh_installdeb -i
+	dh_shlibdeps -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+# Build architecture independant packages using the common target.
+binary-arch: install
+	dh_testdir -s
+	dh_testroot -s
+	dh_installchangelogs -s
+	dh_installdocs -s
+	dh_installexamples -s
+	dh_installman -s
+	dh_gconf -s
+	LD_LIBRARY_PATH=debian/libibus1/usr/lib:$(LD_LIBRARY_PATH) \
+		dh_gtkmodules -p ibus-gtk -s
+	dh_link -s
+	dh_strip -s
+	dh_compress -s
+	dh_fixperms -s
+	dh_makeshlibs -Nibus-gtk -s
+	dh_pysupport -s
+	dh_installdeb -s
+	dh_shlibdeps -s
+	dh_gencontrol -s
+	dh_md5sums -s
+	dh_builddeb -s
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+
+.PHONY: build clean binary-indep binary-arch binary install	\
+	install-indep install-arch
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 00000000..9b8c3653
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+http://code.google.com/p/ibus/downloads/list \
+http://ibus.googlecode.com/files/ibus-([0-9].*)\.tar\.gz
diff --git a/debian/watch.ex b/debian/watch.ex
deleted file mode 100644
index e6765b0b..00000000
--- a/debian/watch.ex
+++ /dev/null
@@ -1,22 +0,0 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
-version=3
-
-# Uncomment to examine a Webpage 
-# <Webpage URL> <string match>
-#http://www.example.com/downloads.php ibus-(.*)\.tar\.gz
-
-# Uncomment to examine a Webserver directory
-#http://www.example.com/pub/ibus-(.*)\.tar\.gz
-
-# Uncommment to examine a FTP server
-#ftp://ftp.example.com/pub/ibus-(.*)\.tar\.gz debian uupdate
-
-# Uncomment to find new files on sourceforge, for debscripts >= 2.9
-# http://sf.net/ibus/ibus-(.*)\.tar\.gz
-
-
diff --git a/debian/xinput/ibus b/debian/xinput/ibus
new file mode 100644
index 00000000..b4d3fd22
--- /dev/null
+++ b/debian/xinput/ibus
@@ -0,0 +1,16 @@
+XIM=ibus
+XIM_PROGRAM=/usr/bin/ibus-daemon
+XIM_ARGS="--xim"
+if [ -e /usr/lib/gtk-2.0/*/immodules/im-ibus.so ]; then
+    GTK_IM_MODULE=ibus
+else
+    GTK_IM_MODULE=xim
+fi
+
+if [ -e /usr/lib/qt4/plugins/inputmethods/libqtim-ibus.so ]; then
+	QT_IM_MODULE=ibus
+else
+	QT_IM_MODULE=xim
+fi
+DEPENDS="ibus, ibus-gtk, ibus-qt4"
+# vim:ft=sh: