diff -ruN org/kinput2-3.1/debian/control kinput2-3.1/debian/control
--- org/kinput2-3.1/debian/control	2005-06-16 20:51:15.476000619 +0900
+++ kinput2-3.1/debian/control	2005-06-16 19:45:50.074813977 +0900
@@ -8,6 +8,7 @@
 Package: kinput2-common
 Architecture: all
 Conflicts: xbase (<< 3.3.2.3a-2)
+Depends: im-switch
 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).
diff -ruN org/kinput2-3.1/debian/im-switch/kinput2-canna kinput2-3.1/debian/im-switch/kinput2-canna
--- org/kinput2-3.1/debian/im-switch/kinput2-canna	1970-01-01 09:00:00.000000000 +0900
+++ kinput2-3.1/debian/im-switch/kinput2-canna	2005-06-16 19:45:50.081812743 +0900
@@ -0,0 +1,5 @@
+XIM=kinput2
+XIM_PROGRAM=/usr/X11R6/bin/kinput2-canna
+XIM_ARGS="+xim"
+GTK_IM_MODULE=
+DEPENDS=canna
diff -ruN org/kinput2-3.1/debian/im-switch/kinput2-canna-wnn_canna kinput2-3.1/debian/im-switch/kinput2-canna-wnn_canna
--- org/kinput2-3.1/debian/im-switch/kinput2-canna-wnn_canna	1970-01-01 09:00:00.000000000 +0900
+++ kinput2-3.1/debian/im-switch/kinput2-canna-wnn_canna	2005-06-16 19:45:50.082812567 +0900
@@ -0,0 +1,5 @@
+XIM=kinput2
+XIM_PROGRAM=/usr/X11R6/bin/kinput2-canna-wnn
+XIM_ARGS="-canna +xim"
+GTK_IM_MODULE=
+DEPENDS=canna
diff -ruN org/kinput2-3.1/debian/im-switch/kinput2-canna-wnn_wnn kinput2-3.1/debian/im-switch/kinput2-canna-wnn_wnn
--- org/kinput2-3.1/debian/im-switch/kinput2-canna-wnn_wnn	1970-01-01 09:00:00.000000000 +0900
+++ kinput2-3.1/debian/im-switch/kinput2-canna-wnn_wnn	2005-06-16 19:45:50.081812743 +0900
@@ -0,0 +1,5 @@
+XIM=kinput2
+XIM_PROGRAM=/usr/X11R6/bin/kinput2-canna-wnn
+XIM_ARGS="-wnn +xim"
+GTK_IM_MODULE=
+DEPENDS=freewnn-jserver
diff -ruN org/kinput2-3.1/debian/im-switch/kinput2-wnn kinput2-3.1/debian/im-switch/kinput2-wnn
--- org/kinput2-3.1/debian/im-switch/kinput2-wnn	1970-01-01 09:00:00.000000000 +0900
+++ kinput2-3.1/debian/im-switch/kinput2-wnn	2005-06-16 19:45:50.082812567 +0900
@@ -0,0 +1,5 @@
+XIM=kinput2
+XIM_PROGRAM=/usr/X11R6/bin/kinput2-wnn
+XIM_ARGS="+xim"
+GTK_IM_MODULE=
+DEPENDS=freewnn-jserver
diff -ruN org/kinput2-3.1/debian/kinput2-canna-wnn.dirs kinput2-3.1/debian/kinput2-canna-wnn.dirs
--- org/kinput2-3.1/debian/kinput2-canna-wnn.dirs	2005-06-16 20:51:15.478999843 +0900
+++ kinput2-3.1/debian/kinput2-canna-wnn.dirs	2005-06-16 19:45:50.070814681 +0900
@@ -1 +1,2 @@
 usr/X11R6/bin
+etc/X11/xinit/xinput.d
diff -ruN org/kinput2-3.1/debian/kinput2-canna-wnn.postinst kinput2-3.1/debian/kinput2-canna-wnn.postinst
--- org/kinput2-3.1/debian/kinput2-canna-wnn.postinst	2005-06-16 20:51:15.479999584 +0900
+++ kinput2-3.1/debian/kinput2-canna-wnn.postinst	2005-06-16 19:45:50.069814858 +0900
@@ -3,6 +3,13 @@
 
 update-alternatives --install /usr/X11R6/bin/kinput2 kinput2 /usr/X11R6/bin/kinput2-canna-wnn 30 --slave /usr/X11R6/man/man1/kinput2.1x.gz kinput2.1x.gz /usr/X11R6/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
diff -ruN org/kinput2-3.1/debian/kinput2-canna-wnn.prerm kinput2-3.1/debian/kinput2-canna-wnn.prerm
--- org/kinput2-3.1/debian/kinput2-canna-wnn.prerm	2005-06-16 20:51:15.479999584 +0900
+++ kinput2-3.1/debian/kinput2-canna-wnn.prerm	2005-06-16 19:45:50.068815034 +0900
@@ -2,6 +2,8 @@
 set -e
 
 update-alternatives --remove kinput2 /usr/X11R6/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#
 
diff -ruN org/kinput2-3.1/debian/kinput2-canna.dirs kinput2-3.1/debian/kinput2-canna.dirs
--- org/kinput2-3.1/debian/kinput2-canna.dirs	2005-06-16 20:51:15.478999843 +0900
+++ kinput2-3.1/debian/kinput2-canna.dirs	2005-06-16 19:45:50.070814681 +0900
@@ -1 +1,2 @@
 usr/X11R6/bin
+etc/X11/xinit/xinput.d
diff -ruN org/kinput2-3.1/debian/kinput2-canna.postinst kinput2-3.1/debian/kinput2-canna.postinst
--- org/kinput2-3.1/debian/kinput2-canna.postinst	2005-06-16 20:51:15.478000102 +0900
+++ kinput2-3.1/debian/kinput2-canna.postinst	2005-06-16 19:45:50.071814505 +0900
@@ -3,5 +3,9 @@
 
 update-alternatives --install /usr/X11R6/bin/kinput2 kinput2 /usr/X11R6/bin/kinput2-canna 30 --slave /usr/X11R6/man/man1/kinput2.1x.gz kinput2.1x.gz /usr/X11R6/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#
 
diff -ruN org/kinput2-3.1/debian/kinput2-canna.prerm kinput2-3.1/debian/kinput2-canna.prerm
--- org/kinput2-3.1/debian/kinput2-canna.prerm	2005-06-16 20:51:15.479999584 +0900
+++ kinput2-3.1/debian/kinput2-canna.prerm	2005-06-16 19:45:50.068815034 +0900
@@ -3,5 +3,7 @@
 
 update-alternatives --remove kinput2 /usr/X11R6/bin/kinput2-canna
 
+update-alternatives --remove xinput-ja_JP /etc/X11/xinit/xinput.d/kinput2-canna
+
 #DEBHELPER#
 
diff -ruN org/kinput2-3.1/debian/kinput2-wnn.dirs kinput2-3.1/debian/kinput2-wnn.dirs
--- org/kinput2-3.1/debian/kinput2-wnn.dirs	2005-06-16 20:51:15.478000102 +0900
+++ kinput2-3.1/debian/kinput2-wnn.dirs	2005-06-16 19:45:50.071814505 +0900
@@ -1 +1,2 @@
 usr/X11R6/bin
+etc/X11/xinit/xinput.d
diff -ruN org/kinput2-3.1/debian/kinput2-wnn.postinst kinput2-3.1/debian/kinput2-wnn.postinst
--- org/kinput2-3.1/debian/kinput2-wnn.postinst	2005-06-16 20:51:15.478999843 +0900
+++ kinput2-3.1/debian/kinput2-wnn.postinst	2005-06-16 19:45:50.069814858 +0900
@@ -2,6 +2,9 @@
 set -e
 
 update-alternatives --install /usr/X11R6/bin/kinput2 kinput2 /usr/X11R6/bin/kinput2-wnn 30 --slave /usr/X11R6/man/man1/kinput2.1x.gz kinput2.1x.gz /usr/X11R6/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
 
diff -ruN org/kinput2-3.1/debian/kinput2-wnn.prerm kinput2-3.1/debian/kinput2-wnn.prerm
--- org/kinput2-3.1/debian/kinput2-wnn.prerm	2005-06-16 20:51:15.479999584 +0900
+++ kinput2-3.1/debian/kinput2-wnn.prerm	2005-06-16 19:45:50.067815210 +0900
@@ -2,6 +2,7 @@
 set -e
 
 update-alternatives --remove kinput2 /usr/X11R6/bin/kinput2-wnn
+update-alternatives --remove xinput-ja_JP /etc/X11/xinit/xinput.d/kinput2-wnn
 
 #DEBHELPER#
 
diff -ruN org/kinput2-3.1/debian/rules kinput2-3.1/debian/rules
--- org/kinput2-3.1/debian/rules	2005-06-16 20:51:15.476000619 +0900
+++ kinput2-3.1/debian/rules	2005-06-16 19:45:50.075813800 +0900
@@ -95,6 +95,13 @@
 	$(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.