kinput2 (3.1-10.2) debian-dir only changes

--- kinput2-3.1.orig/debian/control
+++ kinput2-3.1/debian/control
@@ -0,0 +1,63 @@
+Source: kinput2
+Section: x11
+Priority: optional
+Maintainer: Keita Maehara <maehara@debian.org>
+Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5), xutils-dev, x11proto-core-dev, libice-dev, libsm-dev, libx11-dev, libxext-dev, libxmu-dev, libxp-dev, libxpm-dev, libxt-dev, libxaw7-dev | libxaw-dev, libcanna1g-dev, libwnn6-dev
+
+Package: kinput2-common
+Architecture: all
+Conflicts: xbase (<< 3.3.2.3a-2)
+Depends: im-switch, ${misc:Depends}
+Description: Files shared among kinput2 packages
+ This package contains files that is needed by three kinput2 packages
+ (kinput2-canna, kinput2-wnn and kinput2-canna-wnn).
+
+Package: kinput2-canna
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, kinput2-common
+Recommends: xfonts-base
+Suggests: canna
+Description: An input server for X11 applications that want Japanese text input
+ Kinput2 is an input server for X11 applications that want Japanese
+ text input.
+ .
+ A client that wants kana-kanji conversion service for Japanese text
+ sends a request to kinput2.  Kinput2 receives the request, does
+ kana-kanji conversion, and sends the converted text back to the
+ client.
+ .
+ This package supports Canna cannaserver.
+
+Package: kinput2-wnn
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, kinput2-common, freewnn-common
+Recommends: xfonts-base
+Suggests: freewnn-jserver (>= 1.1.0+1.1.1-a017-4) | wnn6
+Description: An input server for X11 applications that want Japanese text input
+ Kinput2 is an input server for X11 applications that want Japanese
+ text input.
+ .
+ A client that wants kana-kanji conversion service for Japanese text
+ sends a request to kinput2.  Kinput2 receives the request, does
+ kana-kanji conversion, and sends the converted text back to the
+ client.
+ .
+ This package supports Wnn jserver (version 4 or 6).
+
+Package: kinput2-canna-wnn
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, kinput2-common, freewnn-common
+Recommends: xfonts-base
+Suggests: canna, freewnn-jserver (>= 1.1.0+1.1.1-a017-4) | wnn6
+Description: An input server for X11 applications that want Japanese text input 
+ Kinput2 is an input server for X11 applications that want Japanese
+ text input.
+ .
+ A client that wants kana-kanji conversion service for Japanese text
+ sends a request to kinput2.  Kinput2 receives the request, does
+ kana-kanji conversion, and sends the converted text back to the
+ client.
+ .
+ This package supports both Canna cannaserver and Wnn jserver (version
+ 4 or 6).
--- kinput2-3.1.orig/debian/Kinput2.conf
+++ kinput2-3.1/debian/Kinput2.conf
@@ -0,0 +1,140 @@
+XCOMM
+XCOMM Kinput2 global configuration parameters
+XCOMM
+/*
+ * Before editing following parameters, you should read 
+ * README file.
+ */
+
+/**
+ ** Conversion system configuration:
+ **	Kinput2 supports 3 conversion systems, Wnn, Canna and Sj3.
+ **	In order to install and use kinput2, you have to compile and
+ **	install at least one of them.  If you select more than one
+ **	conversion system, you can choose one at run time with a
+ **	command line option.
+ **/
+
+/* #define UseWnn */	/* define if you are going to use Wnn (v4 or v6) */
+/* #define UseWnn6 */	/* define if you are going to use Wnn6 */
+#define UseCanna	/* define if you are going to use Canna */
+#define UseSj3		/* define if you are going to use Sj3 */
+
+
+XCOMM Wnn configuration
+/*
+ * If you define UseWnn, set following 3 variables:
+ *
+ *	WNNINCDIR: Wnn include file directory
+ *	WNNLIB: Wnn client-side library
+ *	CCDEF_DIR: directory where character conversion rule
+ *		   definition files are to be installed
+ *
+ * You have to define WnnLibDir if Wnn4 configuration files
+ * are not installed in /usr/local/lib/wnn (which is the default).
+ */
+/* #define WnnLibDir /some/peculiar/directory/wnn */
+
+/* for convenience.. */
+#if defined(UseWnn6) && !defined(UseWnn)
+#define UseWnn
+#endif
+
+CCDEF_DIR = $(LIBDIR)/ccdef
+
+/*
+ * If you have installed Wnn..
+ *
+ * First check the directory where Wnn header files has been installed.
+ * Note that if you installed Wnn4 configuration files in a directory
+ * other than the default (/usr/local/lib/wnn), you have to define
+ * WnnLibDir above.
+ */
+XCOMM use installed header files
+XCOMM WNNINCDIR = /usr/X11R6/include/wnn
+XCOMM use installed library
+XCOMM WNNLIB = -lwnn
+
+/*
+ * Or, use library in the source tree..
+ */
+XCOMM use library in the source tree
+WNNSRC = $(CONTRIBSRC)/programs/Xsi/Wnn
+WNNINCDIR = $(WNNSRC)/include
+WNNLIB = $(WNNSRC)/jlib/libwnn.a
+
+
+XCOMM Canna configuration
+/*
+ * If you define UseCanna, set following 2 variables:
+ *	CANNASRC: Canna source directory (or directory of installed headers)
+ *	CANNALIB: Canna user library
+ * Note that kinput2 no longer supports Canna version 1.x,
+ * which came with X11R5.  Use the new version in R6 contrib.
+ */
+
+/*
+ * If you have already installed Canna header files and libraries..
+ */
+XCOMM use installed headers/libraries
+XCOMM CANNAINSTDIR = /usr/local/canna
+XCOMM CANNASRC = $(CANNAINSTDIR)/include
+XCOMM CANNALIB = -lcanna16
+
+/*
+ * If you have compiled Canna that came with X11R6 (contrib/programs/Canna),
+ * but not installed yet..
+ */
+XCOMM use headers/libraries in the source tree
+CANNASRC = $(CONTRIBSRC)/programs/Canna32
+CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16
+
+
+XCOMM SJ3 configuration
+/*
+ * If you define UseSj3, set following 3 variables:
+ *	SJ3SRC: Sj3 source directory
+ *	SJ3LIB: Sj3 user library
+ *	SJ3DEF_DIR: directory where conversion rule
+ *		   definition files are to be installed
+ */
+
+SJ3DEF_DIR = $(LIBDIR)/sj3def
+
+/*
+ * If you have installed SJ3 library and header file,
+ * or your machine is Sony NEWS, on which SJ3 is
+ * already installed..
+ * (in this case, you don't have to care about SJ3SRC)
+ */
+XCOMM use installed header/library
+XCOMM specify the directory where libsj3.h resides as SJ3SRC.
+XCOMM SJ3SRC = /usr/local/include
+XCOMM SJ3LIB = -lsj3lib
+
+/*
+ * Use compiled library in the source tree..
+ */
+XCOMM use library in the source tree
+SJ3SRC = $(CONTRIBSRC)/programs/sj3
+SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a
+
+
+/**
+ ** Transport configuration:
+ **	Kinput2 X Input Method Protocol handler supports
+ **	3 transports, X, TCP and local (UNIX domain).
+ **	If your system does not support any of these,
+ **	add appropriate flag(s) to TRANSPORTDEFS.
+ **
+ **	-DNO_UNIX_TRANSPORT	-- if UNIX domain transport is not available
+ **	-DNO_TCP_TRANSPORT	-- if TCP/IP transport is not available
+ **	-DNO_X_TRANSPORT	-- if X transport is not available (unlikely)
+ **/
+XCOMM transport configuration
+
+TRANSPORTDEFS = 
+
+XCOMM
+XCOMM End of global configuration parameters
+XCOMM
--- kinput2-3.1.orig/debian/kinput2-canna-wnn.menu
+++ kinput2-3.1/debian/kinput2-canna-wnn.menu
@@ -0,0 +1,4 @@
+?package(kinput2-canna-wnn):needs="X11" section="Applications/System/Administration"\
+  title="kinput2-canna-wnn (canna)" command="/usr/bin/kinput2-canna-wnn -canna"
+?package(kinput2-canna-wnn):needs="X11" section="Applications/System/Administration"\
+  title="kinput2-canna-wnn (wnn)" command="/usr/bin/kinput2-canna-wnn -wnn"
--- kinput2-3.1.orig/debian/kinput2-wnn.menu
+++ kinput2-3.1/debian/kinput2-wnn.menu
@@ -0,0 +1,2 @@
+?package(kinput2-wnn):needs="X11" section="Applications/System/Administration"\
+  title="kinput2-wnn" command="/usr/bin/kinput2-wnn"
--- kinput2-3.1.orig/debian/copyright
+++ kinput2-3.1/debian/copyright
@@ -0,0 +1,27 @@
+This package was debianized by Keita Maehara <maehara@debian.org> on
+Sun, 13 Jun 1999 00:29:49 +0900.
+
+It was downloaded from ftp://ftp.sra.co.jp/pub/x11/kinput2/kinput2-v3.tar.gz.
+
+Upstream Author: Makoto Ishisone <ishisone@sra.co.jp>
+
+Copyright:
+
+/*
+ * Copyright (C) 1991 by Software Research Associates, Inc.
+ *
+ * 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 of Software Research Associates not be
+ * used in advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.  Software Research
+ * Associates makes no representations about the suitability of this software
+ * for any purpose.  It is provided "as is" without express or implied
+ * warranty.
+ *
+ * Author:  Makoto Ishisone, Software Research Associates, Inc., Japan
+ *              ishisone@sra.co.jp
+ */
+
--- kinput2-3.1.orig/debian/kinput2-canna.menu
+++ kinput2-3.1/debian/kinput2-canna.menu
@@ -0,0 +1,2 @@
+?package(kinput2-canna):needs="X11" section="Applications/System/Administration"\
+  title="kinput2-canna" command="/usr/bin/kinput2-canna"
--- kinput2-3.1.orig/debian/kinput2-wnn.postinst
+++ kinput2-3.1/debian/kinput2-wnn.postinst
@@ -0,0 +1,30 @@
+#!/bin/sh
+set -e
+
+update-alternatives --install /usr/bin/kinput2 kinput2 /usr/bin/kinput2-wnn 30 --slave /usr/share/man/man1/kinput2.1x.gz kinput2.1x.gz /usr/share/man/man1/kinput2-wnn.1x.gz
+update-alternatives \
+        --install /etc/X11/xinit/xinput.d/ja_JP xinput-ja_JP \
+        /etc/X11/xinit/xinput.d/kinput2-wnn 60
+
+. /usr/share/debconf/confmodule
+
+if [ -f /etc/X11/Xresources/kinput2-common ]; then
+    rm -f /etc/X11/Xresources/kinput2-common
+fi
+
+XRESOURCE=/etc/X11/Xresources/kinput2
+
+if [ ! -f $XRESOURCE ]; then cat << EOF > $XRESOURCE
+Kinput2*CcWnn.ccdef: ccdef.kinput2
+EOF
+fi
+
+db_get shared/kinput2/wnn/keybindings
+if [ "$RET" = "Egg" ]; then
+    POSTFIX=".egg"
+fi
+sed "s/\(Kinput2\*CcWnn\.ccdef:\).*/\1\ ccdef.kinput2$POSTFIX/g" < $XRESOURCE > $XRESOURCE.new
+
+mv -f $XRESOURCE.new $XRESOURCE
+
+#DEBHELPER#
--- kinput2-3.1.orig/debian/kinput2-canna.postinst
+++ kinput2-3.1/debian/kinput2-canna.postinst
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+update-alternatives --install /usr/bin/kinput2 kinput2 /usr/bin/kinput2-canna 30 --slave /usr/share/man/man1/kinput2.1x.gz kinput2.1x.gz /usr/share/man/man1/kinput2-canna.1x.gz
+
+update-alternatives \
+        --install /etc/X11/xinit/xinput.d/ja_JP xinput-ja_JP \
+        /etc/X11/xinit/xinput.d/kinput2-canna 70
+
+#DEBHELPER#
+
--- kinput2-3.1.orig/debian/kinput2-canna-wnn.templates
+++ kinput2-3.1/debian/kinput2-canna-wnn.templates
@@ -0,0 +1,9 @@
+Template: shared/kinput2/wnn/keybindings
+Type: select
+Choices: Kinput2, Egg
+Default: Egg
+_Description: Default system keybindings of Kinput2 for Wnn
+ Debian prepackaged version of Kinput2 provides a functionality to select
+ default keybindings of Kinput2 for Wnn from "Kinput2" and "Egg". Although
+ the former is the original keybindings of Kinput2, Egg on Emacs users may
+ prefer the latter.
--- kinput2-3.1.orig/debian/README.Debian
+++ kinput2-3.1/debian/README.Debian
@@ -0,0 +1,28 @@
+kinput2 for Debian
+------------------
+
+* Workaround for the buggy window managers
+
+  Kinput2 provides an X resource to avoid strange behavior of buggy
+  window managers.  Debian prepackaged version of kinput2 is released
+  with this feature by enabling
+  "*OverTheSpotConversion.UseOverrideShellForMode: True" in
+  /etc/X11/app-defaults/Kinput2.
+
+* Workaround for the input focus problem (taken from SuSE's
+  kinput2.app-defaults.patch)
+
+  Don't give input focus to the windows of kinput2, they don't need
+  input focus it just causes problems if they get input focus.
+
+* Kinput2 with Wnn support
+
+  Kinput2 with Wnn support (kinput2-canna-wnn and kinput2-wnn) hangs
+  unless you set any jserver hosts by X resource
+  "Kinput2*CcWnn.Jserver" or command line option "-jserver" or
+  environment variable "JSERVER".  Debian prepackaged version of
+  kinput2 can connect to localhost even if you don't set any jserver
+  hosts by setting "*CcWnn.Jserver: localhost" in
+  /etc/X11/app-defaults/Kinput2.
+
+ -- Keita Maehara <maehara@debian.org>, Sun, 13 Jun 1999 00:29:49 +0900
--- kinput2-3.1.orig/debian/Kinput2-Canna-Wnn.conf
+++ kinput2-3.1/debian/Kinput2-Canna-Wnn.conf
@@ -0,0 +1,140 @@
+XCOMM
+XCOMM Kinput2 global configuration parameters
+XCOMM
+/*
+ * Before editing following parameters, you should read 
+ * README file.
+ */
+
+/**
+ ** Conversion system configuration:
+ **	Kinput2 supports 3 conversion systems, Wnn, Canna and Sj3.
+ **	In order to install and use kinput2, you have to compile and
+ **	install at least one of them.  If you select more than one
+ **	conversion system, you can choose one at run time with a
+ **	command line option.
+ **/
+
+#define UseWnn		/* define if you are going to use Wnn (v4 or v6) */
+#define UseWnn6		/* define if you are going to use Wnn6 */
+#define UseCanna	/* define if you are going to use Canna */
+/* #define UseSj3 */	/* define if you are going to use Sj3 */
+
+
+XCOMM Wnn configuration
+/*
+ * If you define UseWnn, set following 3 variables:
+ *
+ *	WNNINCDIR: Wnn include file directory
+ *	WNNLIB: Wnn client-side library
+ *	CCDEF_DIR: directory where character conversion rule
+ *		   definition files are to be installed
+ *
+ * You have to define WnnLibDir if Wnn4 configuration files
+ * are not installed in /usr/local/lib/wnn (which is the default).
+ */
+#define WnnLibDir /usr/share/wnn
+
+/* for convenience.. */
+#if defined(UseWnn6) && !defined(UseWnn)
+#define UseWnn
+#endif
+
+CCDEF_DIR = /etc/kinput2
+
+/*
+ * If you have installed Wnn..
+ *
+ * First check the directory where Wnn header files has been installed.
+ * Note that if you installed Wnn4 configuration files in a directory
+ * other than the default (/usr/local/lib/wnn), you have to define
+ * WnnLibDir above.
+ */
+XCOMM use installed header files
+WNNINCDIR = /usr/include/wnn
+XCOMM use installed library
+WNNLIB = -lwnn6
+
+/*
+ * Or, use library in the source tree..
+ */
+XCOMM use library in the source tree
+XCOMM WNNSRC = $(CONTRIBSRC)/programs/Xsi/Wnn
+XCOMM WNNINCDIR = $(WNNSRC)/include
+XCOMM WNNLIB = $(WNNSRC)/jlib/libwnn.a
+
+
+XCOMM Canna configuration
+/*
+ * If you define UseCanna, set following 2 variables:
+ *	CANNASRC: Canna source directory (or directory of installed headers)
+ *	CANNALIB: Canna user library
+ * Note that kinput2 no longer supports Canna version 1.x,
+ * which came with X11R5.  Use the new version in R6 contrib.
+ */
+
+/*
+ * If you have already installed Canna header files and libraries..
+ */
+XCOMM use installed headers/libraries
+CANNAINSTDIR = /usr
+CANNASRC = $(CANNAINSTDIR)/include
+CANNALIB = -lcanna16
+
+/*
+ * If you have compiled Canna that came with X11R6 (contrib/programs/Canna),
+ * but not installed yet..
+ */
+XCOMM use headers/libraries in the source tree
+XCOMM CANNASRC = $(CONTRIBSRC)/programs/Canna32
+XCOMM CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16
+
+
+XCOMM SJ3 configuration
+/*
+ * If you define UseSj3, set following 3 variables:
+ *	SJ3SRC: Sj3 source directory
+ *	SJ3LIB: Sj3 user library
+ *	SJ3DEF_DIR: directory where conversion rule
+ *		   definition files are to be installed
+ */
+
+SJ3DEF_DIR = $(LIBDIR)/sj3def
+
+/*
+ * If you have installed SJ3 library and header file,
+ * or your machine is Sony NEWS, on which SJ3 is
+ * already installed..
+ * (in this case, you don't have to care about SJ3SRC)
+ */
+XCOMM use installed header/library
+XCOMM specify the directory where libsj3.h resides as SJ3SRC.
+XCOMM SJ3SRC = /usr/local/include
+XCOMM SJ3LIB = -lsj3lib
+
+/*
+ * Use compiled library in the source tree..
+ */
+XCOMM use library in the source tree
+SJ3SRC = $(CONTRIBSRC)/programs/sj3
+SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a
+
+
+/**
+ ** Transport configuration:
+ **	Kinput2 X Input Method Protocol handler supports
+ **	3 transports, X, TCP and local (UNIX domain).
+ **	If your system does not support any of these,
+ **	add appropriate flag(s) to TRANSPORTDEFS.
+ **
+ **	-DNO_UNIX_TRANSPORT	-- if UNIX domain transport is not available
+ **	-DNO_TCP_TRANSPORT	-- if TCP/IP transport is not available
+ **	-DNO_X_TRANSPORT	-- if X transport is not available (unlikely)
+ **/
+XCOMM transport configuration
+
+TRANSPORTDEFS = 
+
+XCOMM
+XCOMM End of global configuration parameters
+XCOMM
--- kinput2-3.1.orig/debian/Kinput2-Canna.conf
+++ kinput2-3.1/debian/Kinput2-Canna.conf
@@ -0,0 +1,140 @@
+XCOMM
+XCOMM Kinput2 global configuration parameters
+XCOMM
+/*
+ * Before editing following parameters, you should read 
+ * README file.
+ */
+
+/**
+ ** Conversion system configuration:
+ **	Kinput2 supports 3 conversion systems, Wnn, Canna and Sj3.
+ **	In order to install and use kinput2, you have to compile and
+ **	install at least one of them.  If you select more than one
+ **	conversion system, you can choose one at run time with a
+ **	command line option.
+ **/
+
+/* #define UseWnn */	/* define if you are going to use Wnn (v4 or v6) */
+/* #define UseWnn6 */	/* define if you are going to use Wnn6 */
+#define UseCanna	/* define if you are going to use Canna */
+/* #define UseSj3 */	/* define if you are going to use Sj3 */
+
+
+XCOMM Wnn configuration
+/*
+ * If you define UseWnn, set following 3 variables:
+ *
+ *	WNNINCDIR: Wnn include file directory
+ *	WNNLIB: Wnn client-side library
+ *	CCDEF_DIR: directory where character conversion rule
+ *		   definition files are to be installed
+ *
+ * You have to define WnnLibDir if Wnn4 configuration files
+ * are not installed in /usr/local/lib/wnn (which is the default).
+ */
+/* #define WnnLibDir /some/peculiar/directory/wnn */
+
+/* for convenience.. */
+#if defined(UseWnn6) && !defined(UseWnn)
+#define UseWnn
+#endif
+
+CCDEF_DIR = /etc/kinput2
+
+/*
+ * If you have installed Wnn..
+ *
+ * First check the directory where Wnn header files has been installed.
+ * Note that if you installed Wnn4 configuration files in a directory
+ * other than the default (/usr/local/lib/wnn), you have to define
+ * WnnLibDir above.
+ */
+XCOMM use installed header files
+XCOMM WNNINCDIR = /usr/X11R6/include/wnn
+XCOMM use installed library
+XCOMM WNNLIB = -lwnn
+
+/*
+ * Or, use library in the source tree..
+ */
+XCOMM use library in the source tree
+WNNSRC = $(CONTRIBSRC)/programs/Xsi/Wnn
+WNNINCDIR = $(WNNSRC)/include
+WNNLIB = $(WNNSRC)/jlib/libwnn.a
+
+
+XCOMM Canna configuration
+/*
+ * If you define UseCanna, set following 2 variables:
+ *	CANNASRC: Canna source directory (or directory of installed headers)
+ *	CANNALIB: Canna user library
+ * Note that kinput2 no longer supports Canna version 1.x,
+ * which came with X11R5.  Use the new version in R6 contrib.
+ */
+
+/*
+ * If you have already installed Canna header files and libraries..
+ */
+XCOMM use installed headers/libraries
+CANNAINSTDIR = /usr
+CANNASRC = $(CANNAINSTDIR)/include
+CANNALIB = -lcanna16
+
+/*
+ * If you have compiled Canna that came with X11R6 (contrib/programs/Canna),
+ * but not installed yet..
+ */
+XCOMM use headers/libraries in the source tree
+XCOMM CANNASRC = $(CONTRIBSRC)/programs/Canna32
+XCOMM CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16
+
+
+XCOMM SJ3 configuration
+/*
+ * If you define UseSj3, set following 3 variables:
+ *	SJ3SRC: Sj3 source directory
+ *	SJ3LIB: Sj3 user library
+ *	SJ3DEF_DIR: directory where conversion rule
+ *		   definition files are to be installed
+ */
+
+SJ3DEF_DIR = $(LIBDIR)/sj3def
+
+/*
+ * If you have installed SJ3 library and header file,
+ * or your machine is Sony NEWS, on which SJ3 is
+ * already installed..
+ * (in this case, you don't have to care about SJ3SRC)
+ */
+XCOMM use installed header/library
+XCOMM specify the directory where libsj3.h resides as SJ3SRC.
+XCOMM SJ3SRC = /usr/local/include
+XCOMM SJ3LIB = -lsj3lib
+
+/*
+ * Use compiled library in the source tree..
+ */
+XCOMM use library in the source tree
+SJ3SRC = $(CONTRIBSRC)/programs/sj3
+SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a
+
+
+/**
+ ** Transport configuration:
+ **	Kinput2 X Input Method Protocol handler supports
+ **	3 transports, X, TCP and local (UNIX domain).
+ **	If your system does not support any of these,
+ **	add appropriate flag(s) to TRANSPORTDEFS.
+ **
+ **	-DNO_UNIX_TRANSPORT	-- if UNIX domain transport is not available
+ **	-DNO_TCP_TRANSPORT	-- if TCP/IP transport is not available
+ **	-DNO_X_TRANSPORT	-- if X transport is not available (unlikely)
+ **/
+XCOMM transport configuration
+
+TRANSPORTDEFS = 
+
+XCOMM
+XCOMM End of global configuration parameters
+XCOMM
--- kinput2-3.1.orig/debian/kinput2-canna-wnn.config
+++ kinput2-3.1/debian/kinput2-canna-wnn.config
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+. /usr/share/debconf/confmodule
+
+if [ -e "$XRESOURCE".new ]; then
+    rm -f "$XRESOURCE".new
+fi
+
+db_input low shared/kinput2/wnn/keybindings || true
+db_go
+
--- kinput2-3.1.orig/debian/kinput2-wnn.prerm
+++ kinput2-3.1/debian/kinput2-wnn.prerm
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+update-alternatives --remove kinput2 /usr/bin/kinput2-wnn
+update-alternatives --remove xinput-ja_JP /etc/X11/xinit/xinput.d/kinput2-wnn
+
+#DEBHELPER#
+
--- kinput2-3.1.orig/debian/Kinput2.ad
+++ kinput2-3.1/debian/Kinput2.ad
@@ -0,0 +1,2 @@
+Kinput2*OverTheSpotConversion.UseOverrideShellForMode: True
+Kinput2*CcWnn.ccdef: ccdef.kinput2
--- kinput2-3.1.orig/debian/rules
+++ kinput2-3.1/debian/rules
@@ -0,0 +1,163 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper. 
+# GNU copyright 1997 by Joey Hess.
+#
+# This version is for a hypothetical package that builds an
+# architecture-dependant package, as well as an architecture-independent
+# package.
+
+# Uncomment this to turn on verbose mode. 
+#export DH_VERBOSE=1
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	# Add here commands to configure the package.
+	
+
+	touch configure-stamp
+
+build: configure-stamp build-stamp
+build-stamp:
+	dh_testdir
+
+	# Add here commands to compile the package.
+	cp debian/Kinput2-Canna.conf Kinput2.conf
+	xmkmf -a
+	$(MAKE)
+	cp cmd/kinput2 cmd/kinput2.canna
+
+	$(MAKE) clean
+
+	cp debian/Kinput2-Wnn.conf Kinput2.conf
+	xmkmf -a
+	$(MAKE)
+	cp cmd/kinput2 cmd/kinput2.wnn
+
+	$(MAKE) clean
+
+	cp debian/Kinput2-Canna-Wnn.conf Kinput2.conf
+	xmkmf -a
+	$(MAKE)
+	cp cmd/kinput2 cmd/kinput2.canna-wnn
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	# Add here commands to clean up after the build process.
+	[ ! -f Makefile ] || $(MAKE) clean
+	rm -f cmd/kinput2.canna cmd/kinput2.wnn cmd/kinput2.canna-wnn
+	find . -name Makefile -exec rm {} \;
+	cp debian/Kinput2.conf Kinput2.conf
+
+	dh_clean
+
+install: DH_OPTIONS=
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Add here commands to install the package into debian/tmp.
+	cp cmd/kinput2.canna cmd/kinput2
+	$(MAKE) install DESTDIR=`pwd`/debian/kinput2-canna
+	$(MAKE) install.man DESTDIR=`pwd`/debian/kinput2-canna
+	mv debian/kinput2-canna/usr/bin/kinput2 debian/kinput2-canna/usr/bin/kinput2-canna
+	mv debian/kinput2-canna/usr/share/man/man1/kinput2.1x debian/kinput2-canna/usr/share/man/man1/kinput2-canna.1x
+	rm -rf debian/kinput2-canna/usr/lib
+	rm -rf debian/kinput2-canna/etc
+
+	cp cmd/kinput2.wnn cmd/kinput2
+	$(MAKE) install DESTDIR=`pwd`/debian/kinput2-wnn
+	$(MAKE) install.man DESTDIR=`pwd`/debian/kinput2-wnn
+	mv debian/kinput2-wnn/usr/bin/kinput2 debian/kinput2-wnn/usr/bin/kinput2-wnn
+	mv debian/kinput2-wnn/usr/share/man/man1/kinput2.1x debian/kinput2-wnn/usr/share/man/man1/kinput2-wnn.1x
+	rm -rf debian/kinput2-wnn/usr/lib
+	rm -rf debian/kinput2-wnn/etc
+
+	cp cmd/kinput2.canna-wnn cmd/kinput2
+	$(MAKE) install DESTDIR=`pwd`/debian/kinput2-canna-wnn
+	$(MAKE) install.man DESTDIR=`pwd`/debian/kinput2-canna-wnn
+	mv debian/kinput2-canna-wnn/usr/bin/kinput2 debian/kinput2-canna-wnn/usr/bin/kinput2-canna-wnn
+	mv debian/kinput2-canna-wnn/usr/share/man/man1/kinput2.1x debian/kinput2-canna-wnn/usr/share/man/man1/kinput2-canna-wnn.1x
+	rm -rf debian/kinput2-canna-wnn/usr/lib
+	rm -rf debian/kinput2-canna-wnn/etc
+
+	$(MAKE) install DESTDIR=`pwd`/debian/tmp
+	$(MAKE) install.man DESTDIR=`pwd`/debian/tmp
+	install -m 644 doc/* debian/kinput2-common/usr/share/doc/kinput2-common
+
+	mkdir -p debian/kinput2-canna/etc/X11/xinit/xinput.d/
+	mkdir -p debian/kinput2-canna-wnn/etc/X11/xinit/xinput.d/
+	mkdir -p debian/kinput2-wnn/etc/X11/xinit/xinput.d/
+	install -o root -g root -m 644 debian/im-switch/kinput2-canna debian/kinput2-canna/etc/X11/xinit/xinput.d/
+	install -o root -g root -m 644 debian/im-switch/kinput2-canna-wnn* debian/kinput2-canna-wnn/etc/X11/xinit/xinput.d/
+	install -o root -g root -m 644 debian/im-switch/kinput2-wnn debian/kinput2-wnn/etc/X11/xinit/xinput.d/
+
+	dh_movefiles
+
+# Build architecture-independent files here.
+# Pass -i to all debhelper commands in this target to reduce clutter.
+binary-indep: build install
+	dh_testdir -i
+	dh_testroot -i
+	dh_installdebconf -i
+	dh_installdocs -i
+	dh_installexamples -i
+	dh_installmenu -i
+#	dh_installlogrotate -i
+#	dh_installemacsen -i
+#	dh_installpam -i
+#	dh_installmime -i
+#	dh_installinit -i
+	dh_installcron -i
+#	dh_installman -i
+	dh_installinfo -i
+#	dh_undocumented -i
+	dh_installchangelogs  -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+#	dh_perl -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir -a
+	dh_testroot -a
+	dh_installdebconf -a
+	dh_installdocs -a
+	dh_installexamples -a
+	dh_installmenu -a
+#	dh_installlogrotate -a
+#	dh_installemacsen -a
+#	dh_installpam -a
+#	dh_installmime -a
+#	dh_installinit -a
+	dh_installcron -a
+#	dh_installman -a
+	dh_installinfo -a
+#	dh_undocumented -a
+	dh_installchangelogs  -a
+	dh_strip -a
+	dh_link -a
+	dh_compress -a
+	dh_fixperms -a
+#	dh_makeshlibs -a
+	dh_installdeb -a
+#	dh_perl -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
--- kinput2-3.1.orig/debian/kinput2-common.docs
+++ kinput2-3.1/debian/kinput2-common.docs
@@ -0,0 +1,3 @@
+NEWS
+README
+
--- kinput2-3.1.orig/debian/Kinput2-Wnn.conf
+++ kinput2-3.1/debian/Kinput2-Wnn.conf
@@ -0,0 +1,140 @@
+XCOMM
+XCOMM Kinput2 global configuration parameters
+XCOMM
+/*
+ * Before editing following parameters, you should read 
+ * README file.
+ */
+
+/**
+ ** Conversion system configuration:
+ **	Kinput2 supports 3 conversion systems, Wnn, Canna and Sj3.
+ **	In order to install and use kinput2, you have to compile and
+ **	install at least one of them.  If you select more than one
+ **	conversion system, you can choose one at run time with a
+ **	command line option.
+ **/
+
+#define UseWnn		/* define if you are going to use Wnn (v4 or v6) */
+#define UseWnn6		/* define if you are going to use Wnn6 */
+/* #define UseCanna */	/* define if you are going to use Canna */
+/* #define UseSj3 */	/* define if you are going to use Sj3 */
+
+
+XCOMM Wnn configuration
+/*
+ * If you define UseWnn, set following 3 variables:
+ *
+ *	WNNINCDIR: Wnn include file directory
+ *	WNNLIB: Wnn client-side library
+ *	CCDEF_DIR: directory where character conversion rule
+ *		   definition files are to be installed
+ *
+ * You have to define WnnLibDir if Wnn4 configuration files
+ * are not installed in /usr/local/lib/wnn (which is the default).
+ */
+#define WnnLibDir /usr/share/wnn
+
+/* for convenience.. */
+#if defined(UseWnn6) && !defined(UseWnn)
+#define UseWnn
+#endif
+
+CCDEF_DIR = /etc/kinput2
+
+/*
+ * If you have installed Wnn..
+ *
+ * First check the directory where Wnn header files has been installed.
+ * Note that if you installed Wnn4 configuration files in a directory
+ * other than the default (/usr/local/lib/wnn), you have to define
+ * WnnLibDir above.
+ */
+XCOMM use installed header files
+WNNINCDIR = /usr/include/wnn
+XCOMM use installed library
+WNNLIB = -lwnn6
+
+/*
+ * Or, use library in the source tree..
+ */
+XCOMM use library in the source tree
+XCOMM WNNSRC = $(CONTRIBSRC)/programs/Xsi/Wnn
+XCOMM WNNINCDIR = $(WNNSRC)/include
+XCOMM WNNLIB = $(WNNSRC)/jlib/libwnn.a
+
+
+XCOMM Canna configuration
+/*
+ * If you define UseCanna, set following 2 variables:
+ *	CANNASRC: Canna source directory (or directory of installed headers)
+ *	CANNALIB: Canna user library
+ * Note that kinput2 no longer supports Canna version 1.x,
+ * which came with X11R5.  Use the new version in R6 contrib.
+ */
+
+/*
+ * If you have already installed Canna header files and libraries..
+ */
+XCOMM use installed headers/libraries
+XCOMM CANNAINSTDIR = /usr/local/canna
+XCOMM CANNASRC = $(CANNAINSTDIR)/include
+XCOMM CANNALIB = -lcanna16
+
+/*
+ * If you have compiled Canna that came with X11R6 (contrib/programs/Canna),
+ * but not installed yet..
+ */
+XCOMM use headers/libraries in the source tree
+CANNASRC = $(CONTRIBSRC)/programs/Canna32
+CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16
+
+
+XCOMM SJ3 configuration
+/*
+ * If you define UseSj3, set following 3 variables:
+ *	SJ3SRC: Sj3 source directory
+ *	SJ3LIB: Sj3 user library
+ *	SJ3DEF_DIR: directory where conversion rule
+ *		   definition files are to be installed
+ */
+
+SJ3DEF_DIR = $(LIBDIR)/sj3def
+
+/*
+ * If you have installed SJ3 library and header file,
+ * or your machine is Sony NEWS, on which SJ3 is
+ * already installed..
+ * (in this case, you don't have to care about SJ3SRC)
+ */
+XCOMM use installed header/library
+XCOMM specify the directory where libsj3.h resides as SJ3SRC.
+XCOMM SJ3SRC = /usr/local/include
+XCOMM SJ3LIB = -lsj3lib
+
+/*
+ * Use compiled library in the source tree..
+ */
+XCOMM use library in the source tree
+SJ3SRC = $(CONTRIBSRC)/programs/sj3
+SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a
+
+
+/**
+ ** Transport configuration:
+ **	Kinput2 X Input Method Protocol handler supports
+ **	3 transports, X, TCP and local (UNIX domain).
+ **	If your system does not support any of these,
+ **	add appropriate flag(s) to TRANSPORTDEFS.
+ **
+ **	-DNO_UNIX_TRANSPORT	-- if UNIX domain transport is not available
+ **	-DNO_TCP_TRANSPORT	-- if TCP/IP transport is not available
+ **	-DNO_X_TRANSPORT	-- if X transport is not available (unlikely)
+ **/
+XCOMM transport configuration
+
+TRANSPORTDEFS = 
+
+XCOMM
+XCOMM End of global configuration parameters
+XCOMM
--- kinput2-3.1.orig/debian/kinput2-canna-wnn.postinst
+++ kinput2-3.1/debian/kinput2-canna-wnn.postinst
@@ -0,0 +1,34 @@
+#!/bin/sh
+set -e
+
+update-alternatives --install /usr/bin/kinput2 kinput2 /usr/bin/kinput2-canna-wnn 30 --slave /usr/share/man/man1/kinput2.1x.gz kinput2.1x.gz /usr/share/man/man1/kinput2-canna-wnn.1x.gz
+
+update-alternatives \
+        --install /etc/X11/xinit/xinput.d/ja_JP xinput-ja_JP \
+        /etc/X11/xinit/xinput.d/kinput2-canna-wnn_canna 60
+update-alternatives \
+        --install /etc/X11/xinit/xinput.d/ja_JP xinput-ja_JP \
+        /etc/X11/xinit/xinput.d/kinput2-canna-wnn_wnn 50
+
+. /usr/share/debconf/confmodule
+
+if [ -f /etc/X11/Xresources/kinput2-common ]; then
+    rm -f /etc/X11/Xresources/kinput2-common
+fi
+
+XRESOURCE=/etc/X11/Xresources/kinput2
+
+if [ ! -f $XRESOURCE ]; then cat << EOF > $XRESOURCE
+Kinput2*CcWnn.ccdef: ccdef.kinput2
+EOF
+fi
+
+db_get shared/kinput2/wnn/keybindings
+if [ "$RET" = "Egg" ]; then
+    POSTFIX=".egg"
+fi
+sed "s/\(Kinput2\*CcWnn\.ccdef:\).*/\1\ ccdef.kinput2$POSTFIX/g" < $XRESOURCE > $XRESOURCE.new
+
+mv -f $XRESOURCE.new $XRESOURCE
+
+#DEBHELPER#
--- kinput2-3.1.orig/debian/kinput2-canna.prerm
+++ kinput2-3.1/debian/kinput2-canna.prerm
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+update-alternatives --remove kinput2 /usr/bin/kinput2-canna
+
+update-alternatives --remove xinput-ja_JP /etc/X11/xinit/xinput.d/kinput2-canna
+
+#DEBHELPER#
+
--- kinput2-3.1.orig/debian/kinput2-canna.dirs
+++ kinput2-3.1/debian/kinput2-canna.dirs
@@ -0,0 +1,2 @@
+usr/bin
+etc/X11/xinit/xinput.d
--- kinput2-3.1.orig/debian/changelog
+++ kinput2-3.1/debian/changelog
@@ -0,0 +1,255 @@
+kinput2 (3.1-10.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add a missing build-dependency on xutils-dev (Closes: #527734).
+  * B-Depend on x11proto-core-dev instead of x-dev (Closes: #515476).
+  * Upgrade watch file (Closes: #529122).
+  * Add a dependency on misc:Depends for kinput2-common
+  * Include Spanish Debconf translation (Closes: #503335).
+
+ -- Raphael Geissert <geissert@debian.org>  Wed, 08 Jul 2009 01:24:36 -0500
+
+kinput2 (3.1-10.1) unstable; urgency=low
+
+  * Non-maintainer upload to fix pending l10n issues.
+  * Debconf translations:
+    - Galician. Closes: #412864
+    - Dutch. Closes: #413881
+    - Portuguese. Closes: #432905
+    - Finnish. Closes: #469373
+    - Russian. Closes: #470793
+    - Brazilian Portuguese. Closes: #473183
+  * [Lintian] Use "Applications/System/Administration" to better fit with 
+    the "new" Debian menu layout
+  * [Lintian] No longer ignore errors from "make clean"
+  * [Lintian] No longer set DH_COMPAT in debian/rules. Use debian/compat
+    instead
+
+ -- Christian Perrier <bubulle@debian.org>  Sun, 30 Mar 2008 14:29:07 +0200
+
+kinput2 (3.1-10) unstable; urgency=low
+
+  * Updated Standards-Version to 3.7.2.
+  * Updated the debhelper compatibility level to 5.
+  * Added Vietnamese translation for debconf (closes: Bug#312169).
+  * Added German translation for debconf (closes: Bug#399147).
+
+ -- Keita Maehara <maehara@debian.org>  Sat,  9 Dec 2006 12:49:13 +0900
+
+kinput2 (3.1-9) unstable; urgency=low
+
+  * Removed libxaw8-dev from Build-Depends (closes: Bug#365404).
+
+ -- Keita Maehara <maehara@debian.org>  Sun, 30 Apr 2006 09:28:13 +0900
+
+kinput2 (3.1-8) unstable; urgency=low
+
+  * Rebuilt against libxaw7 (closes: Bug#364793).
+
+ -- Keita Maehara <maehara@debian.org>  Sat, 29 Apr 2006 11:20:50 +0900
+
+kinput2 (3.1-7) unstable; urgency=low
+
+  * Replaced xlibs-dev with the individual packages (closes:
+    Bug#347008).
+
+ -- Keita Maehara <maehara@debian.org>  Sun, 15 Jan 2006 10:49:17 +0900
+
+kinput2 (3.1-6) unstable; urgency=low
+
+  * Updated to Standards-Version: 3.6.2.
+  * Fixed debconf dependency (closes: Bug#331878).
+  * Added Czech translation for debconf (closes: Bug#318151).
+  * Added Swedish translation for debconf (closes: Bug#331544).
+  * Added dependency on libxaw8-dev.
+  * Now uses quoted strings in menu items.
+
+ -- Keita Maehara <maehara@debian.org>  Sun, 20 Nov 2005 02:36:27 +0900
+
+kinput2 (3.1-5) unstable; urgency=low
+
+  * Added im-switch support (closes: Bug#314456, thanks to Kenshi Muto).
+
+ -- Keita Maehara <maehara@debian.org>  Thu, 16 Jun 2005 22:11:13 +0900
+
+kinput2 (3.1-4) unstable; urgency=low
+
+  * Switched to gettext-based debconf templates and updated French
+    translation (closes: Bug#201236).
+
+ -- Keita Maehara <maehara@debian.org>  Thu,  8 Apr 2004 23:31:10 +0900
+
+kinput2 (3.1-3) unstable; urgency=low
+
+  * Now following X resources are set to false by default to deal with the
+    input focus problem (taken from SuSE's kinput2.app-defaults.patch,
+    thanks to Akira TAGOH).
+      - *SeparateConversion.input
+      - *selectionShell.input
+      - *auxShell.input
+  * Now the default jserver host is set to localhost by X resource
+    *CcWnn.Jserver.
+
+ -- Keita Maehara <maehara@debian.org>  Sat, 26 Apr 2003 22:59:55 +0900
+
+kinput2 (3.1-2) unstable; urgency=low
+
+  * Moved debconf template kinput2-common/defaults/keybindings to
+    shared/kinput2/wnn/keybindings since it's Wnn specific.
+
+ -- Keita Maehara <maehara@debian.org>  Sun, 20 Oct 2002 23:59:19 +0900
+
+kinput2 (3.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Keita Maehara <maehara@debian.org>  Tue,  8 Oct 2002 22:24:10 +0900
+
+kinput2 (3.0-19) unstable; urgency=low
+
+  * Added French debconf templates (closes: Bug#137920).
+
+ -- Keita Maehara <maehara@debian.org>  Wed,  3 Apr 2002 22:20:05 +0900
+
+kinput2 (3.0-18) unstable; urgency=low
+
+  * Now ccdef files are in /etc/kinput2 as conffiles (closes:
+    Bug#99653).
+
+ -- Keita Maehara <maehara@debian.org>  Sun, 23 Dec 2001 02:48:05 +0900
+
+kinput2 (3.0-17) unstable; urgency=low
+
+  * Maintainer release (closes: Bug#105064).
+
+ -- Keita Maehara <maehara@debian.org>  Sat, 21 Jul 2001 22:24:14 +0900
+
+kinput2 (3.0-16.1) unstable; urgency=low
+
+  * NMU
+  * debian/control: added build-dependency on libxaw7-dev | libxaw-dev
+    (Closes: #105064)
+  * lib/cconv.c: correct return types of malloc() and realloc()
+  * lib/wnnlib.c: same fix
+
+ -- Branden Robinson <branden@debian.org>  Wed, 18 Jul 2001 17:46:57 -0500
+
+kinput2 (3.0-16) unstable; urgency=low
+
+  * Now provides debconf-related files missing in the previous
+    version.
+
+ -- Keita Maehara <maehara@debian.org>  Wed, 18 Apr 2001 23:05:50 +0900
+
+kinput2 (3.0-15) unstable; urgency=low
+
+  * Modified WnnLibDir from /usr/lib/wnn to /usr/share/wnn to work with
+    recent freewnn packages (>= 1.1.0+1.1.1-a017-4).
+  * Now recommends xfonts-base instead of xfonts-cjk.
+  * Miscellaneous updates.
+
+ -- Keita Maehara <maehara@debian.org>  Sat, 14 Apr 2001 13:53:39 +0900
+
+kinput2 (3.0-14) unstable; urgency=low
+
+  * Fixed build-time dependency (closes Bug#86589).
+
+ -- Keita Maehara <maehara@debian.org>  Tue, 20 Feb 2001 22:33:24 +0900
+
+kinput2 (3.0-13) unstable; urgency=low
+
+  * Rebuilt to move resource file to /etc/X11/app-defaults.
+
+ -- Keita Maehara <maehara@debian.org>  Sat, 17 Feb 2001 11:50:16 +0900
+
+kinput2 (3.0-12) unstable; urgency=low
+
+  * The config script never edits any files by itself. Now it is done in
+    postinst.
+
+ -- Keita Maehara <maehara@debian.org>  Sat,  1 Jul 2000 19:06:51 +0900
+
+kinput2 (3.0-11) unstable; urgency=low
+
+  * Added system default keybindings selection support using debconf.
+  * Moved menu entries from Apps/Text to Apps/Tools.
+
+ -- Keita Maehara <maehara@debian.org>  Sat,  1 Jul 2000 01:22:17 +0900
+
+kinput2 (3.0-10) unstable; urgency=low
+
+  * Enabled workaround for buggy window managers by default.
+
+ -- Keita Maehara <maehara@debian.org>  Wed, 14 Jun 2000 23:38:12 +0900
+
+kinput2 (3.0-9) frozen unstable; urgency=low
+
+  * Now kinput2-canna-wnn and kinput2-wnn depend on freewnn-common
+    (closes: Bug#63755).
+  * If JSERVER environment variable is not set, jserver host will be
+    set to "localhost" (closes: Bug#63852).
+
+ -- Keita Maehara <maehara@debian.org>  Wed, 10 May 2000 22:33:45 +0900
+
+kinput2 (3.0-8) frozen unstable; urgency=low
+
+  * Fixed wrong build-time dependency (hopefully closes: Bug#59374).
+
+ -- Keita Maehara <maehara@debian.org>  Fri,  3 Mar 2000 00:57:19 +0900
+
+kinput2 (3.0-7) frozen unstable; urgency=low
+
+  * Recompiled with libwnn6.
+
+ -- Keita Maehara <maehara@debian.org>  Sun, 23 Jan 2000 00:07:01 +0900
+
+kinput2 (3.0-6) unstable; urgency=low
+
+  * Removed /usr/X11R6/man/man1/kinput2.1x.gz from kinput2-common,
+    since it is provided by update-alternatives (closes: Bug#51790).
+  * Modified "Suggests: wnn" to "Suggests: freewnn-jserver | wnn6".
+  * Minor package description updates.
+  * Commented out unsuitable definition from Kinput2-Canna.conf of
+    Debian source archive.
+
+ -- Keita Maehara <maehara@debian.org>  Wed, 29 Dec 1999 14:51:07 +0900
+
+kinput2 (3.0-5) unstable; urgency=low
+
+  * Updated to Standards-Version 3.1.1.
+  * Added "Build-Depends: debhelper, xlib6g-dev, libcanna1g-dev,
+    wnn6-dev".
+
+ -- Keita Maehara <maehara@debian.org>  Fri, 26 Nov 1999 00:21:54 +0900
+
+kinput2 (3.0-4) unstable; urgency=low
+
+  * Added "Recommends: xfonts-cjk" to kinput2-{canna,wnn,canna-wnn}
+    (closes: Bug#47413).
+  * Added "Suggests: canna" to kinput2-canna, "Suggests: wnn" to
+    kinput2-wnn and "Suggests: canna, wnn" to kinput2-canna-wnn.
+
+ -- Keita Maehara <maehara@debian.org>  Fri, 15 Oct 1999 01:30:10 +0900
+
+kinput2 (3.0-3) unstable; urgency=low
+
+  * Added manpages for kinput2-canna, kinput2-wnn and
+    kinput2-canna-wnn to each packages (closes: Bug#45762).
+
+ -- Keita Maehara <maehara@debian.org>  Mon,  4 Oct 1999 00:27:28 +0900
+
+kinput2 (3.0-2) unstable; urgency=low
+
+  * Updated to Standards-Version 3.0.0.
+
+ -- Keita Maehara <maehara@debian.org>  Sat, 18 Sep 1999 23:48:50 +0900
+
+kinput2 (3.0-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Keita Maehara <maehara@debian.org>  Sun, 13 Jun 1999 00:29:49 +0900
+
+Local variables:
+mode: debian-changelog
+End:
--- kinput2-3.1.orig/debian/kinput2-canna-wnn.prerm
+++ kinput2-3.1/debian/kinput2-canna-wnn.prerm
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+update-alternatives --remove kinput2 /usr/bin/kinput2-canna-wnn
+update-alternatives --remove xinput-ja_JP /etc/X11/xinit/xinput.d/kinput2-canna-wnn_canna
+update-alternatives --remove xinput-ja_JP /etc/X11/xinit/xinput.d/kinput2-canna-wnn_wnn
+
+#DEBHELPER#
+
--- kinput2-3.1.orig/debian/kinput2-common.postrm
+++ kinput2-3.1/debian/kinput2-common.postrm
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+XRESOURCE=/etc/X11/Xresources/kinput2-common
+
+if [ "$1" = "purge" ]; then
+    rm -f $XRESOURCE
+fi
+
+#DEBHELPER#
--- kinput2-3.1.orig/debian/watch
+++ kinput2-3.1/debian/watch
@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.sra.co.jp/pub/x11/kinput2/kinput2-v([\d.]+)\.tar\.gz debian uupdate
--- kinput2-3.1.orig/debian/kinput2-common.dirs
+++ kinput2-3.1/debian/kinput2-common.dirs
@@ -0,0 +1,2 @@
+usr/share/doc/kinput2-common
+etc/kinput2
--- kinput2-3.1.orig/debian/kinput2-common.files
+++ kinput2-3.1/debian/kinput2-common.files
@@ -0,0 +1,2 @@
+etc/kinput2
+etc/X11/app-defaults/Kinput2
--- kinput2-3.1.orig/debian/kinput2-wnn.templates
+++ kinput2-3.1/debian/kinput2-wnn.templates
@@ -0,0 +1,9 @@
+Template: shared/kinput2/wnn/keybindings
+Type: select
+Choices: Kinput2, Egg
+Default: Egg
+_Description: Default system keybindings of Kinput2 for Wnn
+ Debian prepackaged version of Kinput2 provides a functionality to select
+ default keybindings of Kinput2 for Wnn from "Kinput2" and "Egg". Although
+ the former is the original keybindings of Kinput2, Egg on Emacs users may
+ prefer the latter.
--- kinput2-3.1.orig/debian/compat
+++ kinput2-3.1/debian/compat
@@ -0,0 +1 @@
+5
--- kinput2-3.1.orig/debian/kinput2-wnn.config
+++ kinput2-3.1/debian/kinput2-wnn.config
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+. /usr/share/debconf/confmodule
+
+if [ -e "$XRESOURCE".new ]; then
+    rm -f "$XRESOURCE".new
+fi
+
+db_input low shared/kinput2/wnn/keybindings || true
+db_go
+
--- kinput2-3.1.orig/debian/kinput2-wnn.dirs
+++ kinput2-3.1/debian/kinput2-wnn.dirs
@@ -0,0 +1,2 @@
+usr/bin
+etc/X11/xinit/xinput.d
--- kinput2-3.1.orig/debian/kinput2-canna-wnn.dirs
+++ kinput2-3.1/debian/kinput2-canna-wnn.dirs
@@ -0,0 +1,2 @@
+usr/bin
+etc/X11/xinit/xinput.d
--- kinput2-3.1.orig/debian/po/ja.po
+++ kinput2-3.1/debian/po/ja.po
@@ -0,0 +1,48 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: kinput2@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-19 18:32+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=EUC-JP\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Description
+#: ../kinput2-canna-wnn.templates:1001 ../kinput2-wnn.templates:1001
+msgid "Default system keybindings of Kinput2 for Wnn"
+msgstr "Kinput2 ¤Î Wnn ÍÑ¥·¥¹¥Æ¥à¥Ç¥Õ¥©¥ë¥È¥­¡¼¥Ð¥¤¥ó¥Ç¥£¥ó¥°"
+
+#. Type: select
+#. Description
+#: ../kinput2-canna-wnn.templates:1001 ../kinput2-wnn.templates:1001
+msgid ""
+"Debian prepackaged version of Kinput2 provides a functionality to select "
+"default keybindings of Kinput2 for Wnn from \"Kinput2\" and \"Egg\". "
+"Although the former is the original keybindings of Kinput2, Egg on Emacs "
+"users may prefer the latter."
+msgstr ""
+"Debian ¥Ñ¥Ã¥±¡¼¥¸ÈǤΠKinput2 ¤Ç¤Ï¡¢¥·¥¹¥Æ¥à¥Ç¥Õ¥©¥ë¥È¤Ç»ÈÍѤµ¤ì¤ë Wnn ÍѤÎ"
+"¥­¡¼¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤ò \"Kinput2\" ¤È \"Egg\" ¤Î 2 ¼ïÎफ¤éÁªÂò¤¹¤ë ¤³¤È¤¬¤Ç¤­"
+"¤Þ¤¹¡£Á°¼Ô¤¬ Kinput2 ¥ª¥ê¥¸¥Ê¥ë¤Î¥­¡¼¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤Ç¤¹¤¬¡¢ Emacs ¾å¤Ç Egg ¤ò"
+"»ÈÍѤ·¤Æ¤¤¤ë¥æ¡¼¥¶¤Ë¤Ï¡¢¸å¼Ô¤ÎÊý¤¬»È¤¤¤ä¤¹¤¤¤Ç¤·¤ç¤¦¡£"
+
+#~ msgid "Kinput2, Egg"
+#~ msgstr "Kinput2, Egg"
--- kinput2-3.1.orig/debian/po/de.po
+++ kinput2-3.1/debian/po/de.po
@@ -0,0 +1,37 @@
+# translation of po-debconf template to German
+# Copyright (C) 2006, Matthias Julius
+# This file is distributed under the same license as the kinput2 package.
+#
+# Matthias Julius <mdeb@julius-net.net>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: kinput2 3.1-9\n"
+"Report-Msgid-Bugs-To: kinput2@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-19 18:32+0100\n"
+"PO-Revision-Date: 2006-11-17 21:55-0500\n"
+"Last-Translator: Matthias Julius <mdeb@julius-net.net>\n"
+"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: select
+#. Description
+#: ../kinput2-canna-wnn.templates:1001 ../kinput2-wnn.templates:1001
+msgid "Default system keybindings of Kinput2 for Wnn"
+msgstr "Voreingestellte Tastenbindung von Kinput2 für Wnn"
+
+#. Type: select
+#. Description
+#: ../kinput2-canna-wnn.templates:1001 ../kinput2-wnn.templates:1001
+msgid ""
+"Debian prepackaged version of Kinput2 provides a functionality to select "
+"default keybindings of Kinput2 for Wnn from \"Kinput2\" and \"Egg\". "
+"Although the former is the original keybindings of Kinput2, Egg on Emacs "
+"users may prefer the latter."
+msgstr ""
+"Debians Version von Kinput2 bietet die Auswahl der voreingestellten "
+"Tastenbindung von Kinput2 für Wnn an. Es kann zwischen »Kinput2« und »Egg« "
+"gewählt werden. Obwohl die erstere die originale Tastenbindung von Kinput2 "
+"ist, könnten Benutzer von Egg auf Emacs die letztere vorziehen."
--- kinput2-3.1.orig/debian/po/nl.po
+++ kinput2-3.1/debian/po/nl.po
@@ -0,0 +1,36 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kinput\n"
+"Report-Msgid-Bugs-To: kinput2@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-19 18:32+0100\n"
+"PO-Revision-Date: 2007-03-03 16:04+0100\n"
+"Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
+"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Description
+#: ../kinput2-canna-wnn.templates:1001 ../kinput2-wnn.templates:1001
+msgid "Default system keybindings of Kinput2 for Wnn"
+msgstr "Standaard KInput2 systeem-snelkoppelingen voor Wnn"
+
+#. Type: select
+#. Description
+#: ../kinput2-canna-wnn.templates:1001 ../kinput2-wnn.templates:1001
+msgid ""
+"Debian prepackaged version of Kinput2 provides a functionality to select "
+"default keybindings of Kinput2 for Wnn from \"Kinput2\" and \"Egg\". "
+"Although the former is the original keybindings of Kinput2, Egg on Emacs "
+"users may prefer the latter."
+msgstr ""
+"De door Debian verpakte versie van Kinput 2 biedt de mogelijkheid om "
+"standaard Kinput2 snelkoppelingen voor Wnn te selecteren als 'Kinput2' of "
+"'Egg'. De eerste keuze zijn de originele snelkoppelingen van Kinput2, de "
+"tweede keuze is beter voor Emacs-gebruikers."
--- kinput2-3.1.orig/debian/po/es.po
+++ kinput2-3.1/debian/po/es.po
@@ -0,0 +1,54 @@
+# kinput2 translation to spanish
+# Copyright (C) 2008 Software in the Public Interest
+# This file is distributed under the same license as the kinput2 package.
+# Changes:
+# - Initial translation
+# Ignacio Mondino <ignacio.mondino@gmail.com>, 2008
+# Traductores, si no conoce el formato PO, merece la pena leer la 
+# documentación de gettext, especialmente las secciones dedicadas a este
+# formato, por ejemplo ejecutando:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Equipo de traducción al español, por favor lean antes de traducir
+# los siguientes documentos:
+# - El proyecto de traducción de Debian al español
+# http://www.debian.org/intl/spanish
+# especialmente las notas de traducción en
+# http://www.debian.org/intl/spanish/notas
+# - La guía de traducción de po's de debconf:
+# /usr/share/doc/po-debconf/README-trans
+# o http://www.debian.org/intl/l10n/po-debconf/README-trans
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: 3.1-10.1\n"
+"Report-Msgid-Bugs-To: kinput2@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-19 18:32+0100\n"
+"PO-Revision-Date: 2008-10-20 21:51-0200\n"
+"Last-Translator: Ignacio Mondino <ignacio.mondino@gmail.com>\n"
+"Language-Team: Debian Spanish team <debian-l10n-spanish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit"
+
+#. Type: select
+#. Description
+#: ../kinput2-canna-wnn.templates:1001 ../kinput2-wnn.templates:1001
+msgid "Default system keybindings of Kinput2 for Wnn"
+msgstr "Combinación de teclas del sistema por omisión de Kinput2 para Wnn"
+
+#. Type: select
+#. Description
+#: ../kinput2-canna-wnn.templates:1001 ../kinput2-wnn.templates:1001
+msgid ""
+"Debian prepackaged version of Kinput2 provides a functionality to select "
+"default keybindings of Kinput2 for Wnn from \"Kinput2\" and \"Egg\". "
+"Although the former is the original keybindings of Kinput2, Egg on Emacs "
+"users may prefer the latter."
+msgstr ""
+"La versión empaquetada de Debian de Kinput2 provee la funcionalidad de elegir "
+"la combinación de teclas por omisión de Kinput2 para Wnn de entre «Kinput2» y "
+"«Egg». Aunque la primera sea la combinación de teclas original de Kinput2, "
+"los usuarios de «Egg» sobre Emacs preferirán la segunda."
+
--- kinput2-3.1.orig/debian/po/ru.po
+++ kinput2-3.1/debian/po/ru.po
@@ -0,0 +1,39 @@
+# translation of ru.po to Russian
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Yuri Kozlov <kozlov.y@gmail.com>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: kinput2 3.1-10\n"
+"Report-Msgid-Bugs-To: kinput2@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-19 18:32+0100\n"
+"PO-Revision-Date: 2008-03-13 21:16+0300\n"
+"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. Type: select
+#. Description
+#: ../kinput2-canna-wnn.templates:1001 ../kinput2-wnn.templates:1001
+msgid "Default system keybindings of Kinput2 for Wnn"
+msgstr "Система привязки клавиш по умолчанию в Kinput2 для Wnn:"
+
+#. Type: select
+#. Description
+#: ../kinput2-canna-wnn.templates:1001 ../kinput2-wnn.templates:1001
+msgid ""
+"Debian prepackaged version of Kinput2 provides a functionality to select "
+"default keybindings of Kinput2 for Wnn from \"Kinput2\" and \"Egg\". "
+"Although the former is the original keybindings of Kinput2, Egg on Emacs "
+"users may prefer the latter."
+msgstr ""
+"Версия Kinput2 из пакета Debian предоставляет возможность выбора привязки "
+"клавиш по умолчанию Kinput2 для Wnn: \"Kinput2\" и \"Egg\". Хотя первая из "
+"них является оригинальной привязкой Kinput2, пользователи Egg в Emacs могут "
+"предпочесть последнюю."
--- kinput2-3.1.orig/debian/po/vi.po
+++ kinput2-3.1/debian/po/vi.po
@@ -0,0 +1,37 @@
+# Vietnamese translation for kinput2.
+# Copyright © 2005 Free Software Foundation, Inc.
+# Clytie Siddall <clytie@riverland.net.au>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kinput2 3.1-4\n"
+"Report-Msgid-Bugs-To: kinput2@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-19 18:32+0100\n"
+"PO-Revision-Date: 2006-11-12 14:49+1030nLast-Translator: Clytie Siddall "
+"<clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.6fc1\n"
+
+#. Type: select
+#. Description
+#: ../kinput2-canna-wnn.templates:1001 ../kinput2-wnn.templates:1001
+msgid "Default system keybindings of Kinput2 for Wnn"
+msgstr "Tổ hợp phím hệ thống mặc định của Kinput2 cho Wnn"
+
+#. Type: select
+#. Description
+#: ../kinput2-canna-wnn.templates:1001 ../kinput2-wnn.templates:1001
+msgid ""
+"Debian prepackaged version of Kinput2 provides a functionality to select "
+"default keybindings of Kinput2 for Wnn from \"Kinput2\" and \"Egg\". "
+"Although the former is the original keybindings of Kinput2, Egg on Emacs "
+"users may prefer the latter."
+msgstr ""
+"Phiên bản đóng gói sẵn của Kinput2 cung cấp khả năng chọn tổ hợp phím mặc "
+"định của Kinput2 cho Wnn trong cả hai mục « Kinput2 » và « Egg ». Mặc dù mục "
+"trước là các tổ hợp gốc của Kinput2, người dùng Egg trên Emacs có thể thích "
+"sử dụng mục sau."
--- kinput2-3.1.orig/debian/po/cs.po
+++ kinput2-3.1/debian/po/cs.po
@@ -0,0 +1,44 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kinput2 3.1-5\n"
+"Report-Msgid-Bugs-To: kinput2@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-19 18:32+0100\n"
+"PO-Revision-Date: 2005-07-13 17:59+0200\n"
+"Last-Translator: Martin Sin <martin.sin@seznam.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Description
+#: ../kinput2-canna-wnn.templates:1001 ../kinput2-wnn.templates:1001
+msgid "Default system keybindings of Kinput2 for Wnn"
+msgstr "Výchozí systémové nastavení kláves Kinput2 pro Wnn"
+
+#. Type: select
+#. Description
+#: ../kinput2-canna-wnn.templates:1001 ../kinput2-wnn.templates:1001
+msgid ""
+"Debian prepackaged version of Kinput2 provides a functionality to select "
+"default keybindings of Kinput2 for Wnn from \"Kinput2\" and \"Egg\". "
+"Although the former is the original keybindings of Kinput2, Egg on Emacs "
+"users may prefer the latter."
+msgstr ""
+"Debianí předkompilovaná verze Kinput2 poskytuje možnost výběru výchozího "
+"nastavení kláves pro Wnn dle \"Kinput2\" a \"Egg\". Ačkoliv je původním "
+"nastavením Kinput2, uživatelé Eggu v Emacsu mohou preferovat posledně "
+"zmíněné nastavení."
--- kinput2-3.1.orig/debian/po/POTFILES.in
+++ kinput2-3.1/debian/po/POTFILES.in
@@ -0,0 +1,2 @@
+[type: gettext/rfc822deb] kinput2-canna-wnn.templates
+[type: gettext/rfc822deb] kinput2-wnn.templates
--- kinput2-3.1.orig/debian/po/sv.po
+++ kinput2-3.1/debian/po/sv.po
@@ -0,0 +1,43 @@
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# Developers do not need to manually edit POT or PO files.
+# , fuzzy
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kinput2 3.1-5\n"
+"Report-Msgid-Bugs-To: kinput2@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-19 18:32+0100\n"
+"PO-Revision-Date: 2005-10-05 00:21+0200\n"
+"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Description
+#: ../kinput2-canna-wnn.templates:1001 ../kinput2-wnn.templates:1001
+msgid "Default system keybindings of Kinput2 for Wnn"
+msgstr "Standard systemknappbindningar av Kinput2 för Wnn"
+
+#. Type: select
+#. Description
+#: ../kinput2-canna-wnn.templates:1001 ../kinput2-wnn.templates:1001
+msgid ""
+"Debian prepackaged version of Kinput2 provides a functionality to select "
+"default keybindings of Kinput2 for Wnn from \"Kinput2\" and \"Egg\". "
+"Although the former is the original keybindings of Kinput2, Egg on Emacs "
+"users may prefer the latter."
+msgstr ""
+"Debians förpaketerade version av Kinput2 ger en funktionalitet att välja "
+"standard knappbindningar i Kinput2 för Wnn från \"Kinput2\" och \"Egg\". "
+"Även om den tidigare är originala knappbindningar av Kinput2, Egg på Emacs "
+"användare kanske föredrar den senare."
--- kinput2-3.1.orig/debian/po/pt_BR.po
+++ kinput2-3.1/debian/po/pt_BR.po
@@ -0,0 +1,39 @@
+# kinput2 Brazilian Portuguese translation
+# Copyright (c) 2008 kinput2's COPYRIGHT HOLDER
+# This file is distributed under the same license as the kinput2 package.
+# Eder L. Marques (frolic) <frolic@debian-ce.org>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kinput2\n"
+"Report-Msgid-Bugs-To: kinput2@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-19 18:32+0100\n"
+"PO-Revision-Date: 2008-03-11 15:54-0300\n"
+"Last-Translator: Eder L. Marques (frolic) <frolic@debian-ce.org>\n"
+"Language-Team: l10n Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"pt_BR utf-8\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n > 1);\n"
+
+#. Type: select
+#. Description
+#: ../kinput2-canna-wnn.templates:1001 ../kinput2-wnn.templates:1001
+msgid "Default system keybindings of Kinput2 for Wnn"
+msgstr "Teclas de atalho padrão do sistema do Kinput2 para Wnn"
+
+#. Type: select
+#. Description
+#: ../kinput2-canna-wnn.templates:1001 ../kinput2-wnn.templates:1001
+msgid ""
+"Debian prepackaged version of Kinput2 provides a functionality to select "
+"default keybindings of Kinput2 for Wnn from \"Kinput2\" and \"Egg\". "
+"Although the former is the original keybindings of Kinput2, Egg on Emacs "
+"users may prefer the latter."
+msgstr ""
+"A versão pré empacotada do Kinput2 fornece uma funcionalidade de selecionar "
+"teclas de atalho padrão do Kinput2 para Wnn de \"Kinput2\" e \"Egg\". Embora "
+"a primeira seja as teclas de atalho originais do Kinput2, os usuários de Egg "
+"no Emacs podem preferir a segunda."
--- kinput2-3.1.orig/debian/po/pt.po
+++ kinput2-3.1/debian/po/pt.po
@@ -0,0 +1,35 @@
+# Portuguese translation of kinput2 debconf messages.
+# Copyright (C) 2007 Ana Grama
+# This file is distributed under the same license as the kinput2 package.
+# Ana Grama <aquarina@rasparta.org>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: 3.1-10\n"
+"Report-Msgid-Bugs-To: kinput2@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-19 18:32+0100\n"
+"PO-Revision-Date: 2007-07-12 23:54+0100\n"
+"Last-Translator: Paulo Lapa <spam@rasparta.org>\n"
+"Language-Team: Portuguese <traduz@debianpt.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Description
+#: ../kinput2-canna-wnn.templates:1001 ../kinput2-wnn.templates:1001
+msgid "Default system keybindings of Kinput2 for Wnn"
+msgstr "Teclas de atalho de sistema por omissão do Kinput2 para Wnn"
+
+#. Type: select
+#. Description
+#: ../kinput2-canna-wnn.templates:1001 ../kinput2-wnn.templates:1001
+msgid ""
+"Debian prepackaged version of Kinput2 provides a functionality to select "
+"default keybindings of Kinput2 for Wnn from \"Kinput2\" and \"Egg\". "
+"Although the former is the original keybindings of Kinput2, Egg on Emacs "
+"users may prefer the latter."
+msgstr ""
+"A versão Debian do Kinput2 oferece a funcionalidade de seleccionarteclas de "
+"atalho por omissão do kinput2 para Wnn de \"Kinput2\" e \"Egg\".Apesar de a "
+"primeira ser a selecção original do Kinput2, os utilizadores deEgg no Emacs "
+"poderão preferir a segunda."
--- kinput2-3.1.orig/debian/po/fr.po
+++ kinput2-3.1/debian/po/fr.po
@@ -0,0 +1,48 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kinput2 3.1-3\n"
+"Report-Msgid-Bugs-To: kinput2@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-19 18:32+0100\n"
+"PO-Revision-Date: 2003-07-12 14:53+0100\n"
+"Last-Translator: Laurence Colombet <Laurence.Colombet@idealx.com>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Description
+#: ../kinput2-canna-wnn.templates:1001 ../kinput2-wnn.templates:1001
+msgid "Default system keybindings of Kinput2 for Wnn"
+msgstr "Affectation par défaut des touches de Kinput2 pour Wnn"
+
+#. Type: select
+#. Description
+#: ../kinput2-canna-wnn.templates:1001 ../kinput2-wnn.templates:1001
+msgid ""
+"Debian prepackaged version of Kinput2 provides a functionality to select "
+"default keybindings of Kinput2 for Wnn from \"Kinput2\" and \"Egg\". "
+"Although the former is the original keybindings of Kinput2, Egg on Emacs "
+"users may prefer the latter."
+msgstr ""
+"La version Debian de Kinput2 ajoute une fonction permettant de choisir le "
+"système d'affectation des touches (« keybindings ») par défaut pour Kinput2 "
+"entre « Kinput2 » et « Egg ». Bien que le premier choix corresponde aux "
+"affectations originelles de Kinput2, les utilisateurs d'Egg sur Emacs "
+"préféreront peut-être l'autre choix."
+
+#~ msgid "Kinput2, Egg"
+#~ msgstr "Kinput2, Egg"
--- kinput2-3.1.orig/debian/po/gl.po
+++ kinput2-3.1/debian/po/gl.po
@@ -0,0 +1,35 @@
+# Galician translation of kinput2's debconf templates
+# This file is distributed under the same license as the kinput2 package.
+# Jacobo Tarrio <jtarrio@debian.org>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kinput2\n"
+"Report-Msgid-Bugs-To: kinput2@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-19 18:32+0100\n"
+"PO-Revision-Date: 2007-02-28 16:50+0100\n"
+"Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
+"Language-Team: Galician <proxecto@trasno.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Description
+#: ../kinput2-canna-wnn.templates:1001 ../kinput2-wnn.templates:1001
+msgid "Default system keybindings of Kinput2 for Wnn"
+msgstr "Asignacións de teclas por defecto de Kinput2 para Wnn"
+
+#. Type: select
+#. Description
+#: ../kinput2-canna-wnn.templates:1001 ../kinput2-wnn.templates:1001
+msgid ""
+"Debian prepackaged version of Kinput2 provides a functionality to select "
+"default keybindings of Kinput2 for Wnn from \"Kinput2\" and \"Egg\". "
+"Although the former is the original keybindings of Kinput2, Egg on Emacs "
+"users may prefer the latter."
+msgstr ""
+"A versión empaquetada por Debian de Kinput2 fornece unha función para "
+"seleccionar as asignacións de teclas por defecto de Kinput2 para Wnn entre "
+"\"Kinput2\" e \"Egg\". Aínda que as primeiras son as asignacións de teclas "
+"orixinais de Kinput2, os usuarios de Egg en Emacs poden preferir as outras."
--- kinput2-3.1.orig/debian/po/templates.pot
+++ kinput2-3.1/debian/po/templates.pot
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: kinput2@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-19 18:32+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Description
+#: ../kinput2-canna-wnn.templates:1001 ../kinput2-wnn.templates:1001
+msgid "Default system keybindings of Kinput2 for Wnn"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../kinput2-canna-wnn.templates:1001 ../kinput2-wnn.templates:1001
+msgid ""
+"Debian prepackaged version of Kinput2 provides a functionality to select "
+"default keybindings of Kinput2 for Wnn from \"Kinput2\" and \"Egg\". "
+"Although the former is the original keybindings of Kinput2, Egg on Emacs "
+"users may prefer the latter."
+msgstr ""
--- kinput2-3.1.orig/debian/po/fi.po
+++ kinput2-3.1/debian/po/fi.po
@@ -0,0 +1,33 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: kinput2 3.1-10\n"
+"Report-Msgid-Bugs-To: kinput2@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-19 18:32+0100\n"
+"PO-Revision-Date: 2008-03-04 23:24+0200\n"
+"Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
+"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Finnish\n"
+"X-Poedit-Country: FINLAND\n"
+
+#. Type: select
+#. Description
+#: ../kinput2-canna-wnn.templates:1001 ../kinput2-wnn.templates:1001
+msgid "Default system keybindings of Kinput2 for Wnn"
+msgstr "Kinput2 for Wnn:n järjestelmän oletuspikanäppäimet"
+
+#. Type: select
+#. Description
+#: ../kinput2-canna-wnn.templates:1001 ../kinput2-wnn.templates:1001
+msgid ""
+"Debian prepackaged version of Kinput2 provides a functionality to select "
+"default keybindings of Kinput2 for Wnn from \"Kinput2\" and \"Egg\". "
+"Although the former is the original keybindings of Kinput2, Egg on Emacs "
+"users may prefer the latter."
+msgstr ""
+"Debianin valmiiksi paketoitu versio Kinput2:sta antaa mahdollisuuden valita "
+"Kinput2 for Wnn:n oletuspikanäppäimet vaihtoehdoista ”Kinput2” ja ”Egg”. "
+"Ensimmäinen käsittää Kinput2:n alkuperäiset pikanäppäimet, toinen taas sopii "
+"erityisesti Egg on Emacsin käyttäjille."
--- kinput2-3.1.orig/debian/im-switch/kinput2-canna
+++ kinput2-3.1/debian/im-switch/kinput2-canna
@@ -0,0 +1,5 @@
+XIM=kinput2
+XIM_PROGRAM=/usr/bin/kinput2-canna
+XIM_ARGS="-xim"
+GTK_IM_MODULE=
+DEPENDS=canna
--- kinput2-3.1.orig/debian/im-switch/kinput2-canna-wnn_canna
+++ kinput2-3.1/debian/im-switch/kinput2-canna-wnn_canna
@@ -0,0 +1,5 @@
+XIM=kinput2
+XIM_PROGRAM=/usr/bin/kinput2-canna-wnn
+XIM_ARGS="-canna -xim"
+GTK_IM_MODULE=
+DEPENDS=canna
--- kinput2-3.1.orig/debian/im-switch/kinput2-canna-wnn_wnn
+++ kinput2-3.1/debian/im-switch/kinput2-canna-wnn_wnn
@@ -0,0 +1,5 @@
+XIM=kinput2
+XIM_PROGRAM=/usr/bin/kinput2-canna-wnn
+XIM_ARGS="-wnn -xim"
+GTK_IM_MODULE=
+DEPENDS=freewnn-jserver
--- kinput2-3.1.orig/debian/im-switch/kinput2-wnn
+++ kinput2-3.1/debian/im-switch/kinput2-wnn
@@ -0,0 +1,5 @@
+XIM=kinput2
+XIM_PROGRAM=/usr/bin/kinput2-wnn
+XIM_ARGS="-xim"
+GTK_IM_MODULE=
+DEPENDS=freewnn-jserver