Package: uim
Version: 1:1.1.0-1
Followup-For: Bug #368147

Once my pbuilder dependency issue is resolved with newer sid archive, I
will do NMU with attahed patch.  This is to improve im-switch usage.

-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.16-2-686
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)

Versions of packages uim depends on:
ii  uim-common                    1:1.1.0-1  Common files for uim
ii  uim-fep                       1:1.1.0-1  uim Front End Processor
ii  uim-gtk2.0                    1:1.1.0-1  GTK+2.x immodule for uim
ii  uim-utils                     1:1.1.0-1  Utilities for uim
ii  uim-xim                       1:1.1.0-1  A bridge between uim and XIM

uim recommends no packages.

-- no debconf information

-- 
~\^o^/~~~ ~\^.^/~~~ ~\^*^/~~~ ~\^_^/~~~ ~\^+^/~~~ ~\^:^/~~~ ~\^v^/~~~ +++++
        Osamu Aoki <[EMAIL PROTECTED]>  Yokohama Japan, GPG-key: A8061F32
 .''`.  Debian Reference: post-installation user's guide for non-developers
 : :' : http://qref.sf.net and http://people.debian.org/~osamu
 `. `'  "Our Priorities are Our Users and Free Software" --- Social Contract

diff -Nru uim-1.1.0-old/debian/changelog uim-1.1.0/debian/changelog
--- uim-1.1.0-old/debian/changelog      2006-06-16 10:54:49.000000000 +0900
+++ uim-1.1.0/debian/changelog  2006-06-16 10:54:10.000000000 +0900
@@ -1,3 +1,12 @@
+uim (1:1.1.0-1.0.1) unstable; urgency=low
+
+  * NMU.
+  * im-switch scripts are improved to start safely and in 
+    different modes.
+  * README.Debian updated.
+
+ -- Osamu Aoki <[EMAIL PROTECTED]>  Fri, 16 Jun 2006 10:51:15 +0900
+
 uim (1:1.1.0-1) unstable; urgency=low
 
   * New upstream release
diff -Nru uim-1.1.0-old/debian/im-switch/uim uim-1.1.0/debian/im-switch/uim
--- uim-1.1.0-old/debian/im-switch/uim  2006-06-16 10:54:49.000000000 +0900
+++ uim-1.1.0/debian/im-switch/uim      2006-06-16 10:10:43.000000000 +0900
@@ -1,9 +1,10 @@
+# UIM without toolbar indicator
 XIM=uim
 XIM_PROGRAM=/usr/bin/uim-xim
 XIM_ARGS=
-GTK_IM_MODULE=uim
-QT_IM_MODULE=uim
-# Use this configuration always with im-switch
-# Start GUI indicator programs (toolbar/sysstray,..) with session manager.
-XIM_PROGRAM_XTRA=
+GTK_IM_MODULE=xim
+QT_IM_MODULE=xim
+# It seems to me that the system needs to be initialized.
+# Folowing trick will wait 10 seconds without slowing down X start up.
+#XIM_PROGRAM_XTRA="(sleep 10; uim-toolbar-gtk)"
 
DEPENDS="uim-xim,uim-gtk2.0|uim-qt,uim-anthy|uim-canna|uim-prime|uim-skk|uim-m17nlib"
diff -Nru uim-1.1.0-old/debian/im-switch/uim-systray 
uim-1.1.0/debian/im-switch/uim-systray
--- uim-1.1.0-old/debian/im-switch/uim-systray  1970-01-01 09:00:00.000000000 
+0900
+++ uim-1.1.0/debian/im-switch/uim-systray      2006-06-16 10:09:22.000000000 
+0900
@@ -0,0 +1,10 @@
+# UIM with GTK systray indicator
+XIM=uim
+XIM_PROGRAM=/usr/bin/uim-xim
+XIM_ARGS=
+GTK_IM_MODULE=xim
+QT_IM_MODULE=xim
+# It seems to me that the system needs to be initialized.
+# Folowing trick will wait 10 seconds without slowing down X start up.
+XIM_PROGRAM_XTRA="(sleep 10; uim-toolbar-gtk-systray)"
+DEPENDS="uim-xim,uim-gtk2.0|uim-qt,uim-anthy|uim-canna|uim-prime|uim-skk|uim-m17nlib"
diff -Nru uim-1.1.0-old/debian/im-switch/uim-toolbar 
uim-1.1.0/debian/im-switch/uim-toolbar
--- uim-1.1.0-old/debian/im-switch/uim-toolbar  1970-01-01 09:00:00.000000000 
+0900
+++ uim-1.1.0/debian/im-switch/uim-toolbar      2006-06-16 10:09:05.000000000 
+0900
@@ -0,0 +1,10 @@
+# UIM with GTK toolbar indicator
+XIM=uim
+XIM_PROGRAM=/usr/bin/uim-xim
+XIM_ARGS=
+GTK_IM_MODULE=xim
+QT_IM_MODULE=xim
+# It seems to me that the system needs to be initialized.
+# Folowing trick will wait 10 seconds without slowing down X start up.
+XIM_PROGRAM_XTRA="(sleep 10; uim-toolbar-gtk)"
+DEPENDS="uim-xim,uim-gtk2.0|uim-qt,uim-anthy|uim-canna|uim-prime|uim-skk|uim-m17nlib"
diff -Nru uim-1.1.0-old/debian/im-switch/uim-toolbar-qt 
uim-1.1.0/debian/im-switch/uim-toolbar-qt
--- uim-1.1.0-old/debian/im-switch/uim-toolbar-qt       1970-01-01 
09:00:00.000000000 +0900
+++ uim-1.1.0/debian/im-switch/uim-toolbar-qt   2006-06-16 10:08:33.000000000 
+0900
@@ -0,0 +1,10 @@
+# UIM with Qt toolbar indicator
+XIM=uim
+XIM_PROGRAM=/usr/bin/uim-xim
+XIM_ARGS=
+GTK_IM_MODULE=xim
+QT_IM_MODULE=xim
+# It seems to me that the system needs to be initialized.
+# Folowing trick will wait 10 seconds without slowing down X start up.
+XIM_PROGRAM_XTRA="(sleep 10; uim-toolbar-qt)"
+DEPENDS="uim-xim,uim-gtk2.0|uim-qt,uim-anthy|uim-canna|uim-prime|uim-skk|uim-m17nlib"
diff -Nru uim-1.1.0-old/debian/README.Debian uim-1.1.0/debian/README.Debian
--- uim-1.1.0-old/debian/README.Debian  2006-06-16 10:54:49.000000000 +0900
+++ uim-1.1.0/debian/README.Debian      2006-06-16 11:03:03.000000000 +0900
@@ -1,37 +1,61 @@
 uim for Debian
 --------------
-* Using immodule
-  - Before using, you have to install each package by yourself.
-
-    anthy: anthy, uim-anthy.
-    canna: canna, uim-canna.
-    skk: skkdic, uim-skk.
-    prime: prime, uim-prime.
-    m17nlib: libm17n-0, m17n-db, m17n-lib-bin, uim-m17nlib
-
-  - You have to set environmental variables as following.
-    GTK_IM_MODULE=uim; export GTK_IM_MODULE
-    [EMAIL PROTECTED]; export XMODIFIERS
-
-    If you do not want to do this, im-swich package will do for you.
-    Just type following and restart X session.
-      $ im-switch -s uim
-    For more, read its documentation.
+* Related packages
+  - You have to install conversion engines and interface packages to
+    make uim useful for Japanese, etc..
+    Japanese:
+      anthy: anthy, uim-anthy.
+      canna: canna, uim-canna.
+      skk: skkdic, uim-skk.
+      prime: prime, uim-prime.
+    Others:
+      m17nlib: libm17n-0, m17n-db, m17n-lib-bin, uim-m17nlib
+
+* Configuration (easy way)
+  - im-swich package will do for you.
+    Just type following and restart X session under the same locale.
+      * Start uim without any toolbars:
+        $ im-switch -s uim
+      * Start uim with GTK systray:
+        $ im-switch -s uim-systray
+      * Start uim with GTK toolbar (recommended):
+        $ im-switch -s uim-toolbar
+      * Start uim with Qt toolbar:
+        $ im-switch -s uim-toolbar-qt
+      * Start no uim:
+        $ im-switch -s none
+    For more, read the im-switch documentation.
 
   - Use GUI tool, e.g., uim-pref-gtk which comes in uim-gtk2.0
-    to set up IM. Desktop -> Preferences -> Preference of uim
+    to set up uim (choice between conversion engines etc.):
+      Desktop -> Preferences -> Preference of uim
 
-  - Deprecated method: Write down default IM in ~/.uim. 
-     (if only you will never use GUI configuration described above)
-    e.g) Set Anthy as default input method.
-         (define default-im-name 'anthy)
-
-  - If you want nice status indicator, configure to start one of 
-    uim-toolbar-gtk, uim-toolbar-gtk-systray, or uim-toolbar-qt in the 
-    seesion start. e.g.) Gnome: install uim-gtk2.0 and set as follows:
-       Desktop -> Preferences -> Sessions -> Click tab for Startup Programs
-        -> Add /usr/bin/uim-toolbar-gtk
+    Right clicking toolbar will also get you to "Preference".
 
- -- Masahito Omote <[EMAIL PROTECTED]>, Sun,  6 Oct 2002 17:21:21 +0900
- -- Osamu Aoki <[EMAIL PROTECTED]>, Fri, 19 May 2006 17:41:15 +0900
+* Configuration (manual way)
+  - You have to set environmental variable as following for
+    classic X applications to use uim:
+      [EMAIL PROTECTED]; export XMODIFIERS
+
+  - You may set environmental variable as following if you 
+    wish to use uim via XIM for GTK applications as the default. 
+
+      GTK_IM_MODULE=xim; export GTK_IM_MODULE
+
+    Chosing XIM is considered to be less problematic.  You can 
+    change IM by right clicking the GTK applications too.
 
+  - You may set environmental variable as following if you 
+    wish to use uim IM module for GTK applications as the default.
+
+      GTK_IM_MODULE=uim; export GTK_IM_MODULE
+
+  - Deprecated method of uim configuration: 
+      * Write down default IM in ~/.uim. 
+        e.g)  Set Anthy as default input method.
+           (define default-im-name 'anthy)
+    This is not compatible with GUI configuration described above.
+
+
+ -- Masahito Omote <[EMAIL PROTECTED]>, Sun,  6 Oct 2002 17:21:21 +0900
+ -- Osamu Aoki <[EMAIL PROTECTED]>, Fri, 16 Jun 2006 10:16:34 +0900
diff -Nru uim-1.1.0-old/debian/rules uim-1.1.0/debian/rules
--- uim-1.1.0-old/debian/rules  2006-06-16 10:54:49.000000000 +0900
+++ uim-1.1.0/debian/rules      2006-06-16 10:25:47.000000000 +0900
@@ -92,6 +92,15 @@
        install -D -o root -g root -m 644 \
                $(CURDIR)/debian/im-switch/uim \
                $(CURDIR)/debian/uim-xim/etc/X11/xinit/xinput.d/uim; \
+       install -D -o root -g root -m 644 \
+               $(CURDIR)/debian/im-switch/uim-toolbar \
+               $(CURDIR)/debian/uim-xim/etc/X11/xinit/xinput.d/uim-toolbar; \
+       install -D -o root -g root -m 644 \
+               $(CURDIR)/debian/im-switch/uim-systray \
+               $(CURDIR)/debian/uim-xim/etc/X11/xinit/xinput.d/uim-systray; \
+       install -D -o root -g root -m 644 \
+               $(CURDIR)/debian/im-switch/uim-toolbar-qt \
+               $(CURDIR)/debian/uim-xim/etc/X11/xinit/xinput.d/uim-toolbar-qt; 
\
 
 # Build architecture-independent files here.
 binary-indep: build install
diff -Nru uim-1.1.0-old/debian/uim-xim.postinst 
uim-1.1.0/debian/uim-xim.postinst
--- uim-1.1.0-old/debian/uim-xim.postinst       2006-06-16 10:54:49.000000000 
+0900
+++ uim-1.1.0/debian/uim-xim.postinst   2006-06-16 11:07:45.000000000 +0900
@@ -32,12 +32,33 @@
     configure)
         # Set up default
         ua_inst all_ALL uim  0
-        ua_inst ja_JP   uim 50
-        ua_inst ko_KR   uim 50
-        ua_inst zh_CN   uim 50
-        ua_inst zh_TW   uim 50
-        ua_inst zh_HK   uim 50
-        ua_inst zh_SG   uim 50
+        ua_inst ja_JP   uim 30
+        ua_inst ko_KR   uim 30
+        ua_inst zh_CN   uim 30
+        ua_inst zh_TW   uim 30
+        ua_inst zh_HK   uim 30
+        ua_inst zh_SG   uim 30
+        ua_inst all_ALL uim-toolbar  0
+        ua_inst ja_JP   uim-toolbar 40
+        ua_inst ko_KR   uim-toolbar 40
+        ua_inst zh_CN   uim-toolbar 40
+        ua_inst zh_TW   uim-toolbar 40
+        ua_inst zh_HK   uim-toolbar 40
+        ua_inst zh_SG   uim-toolbar 40
+        ua_inst all_ALL uim-systray  0
+        ua_inst ja_JP   uim-systray 30
+        ua_inst ko_KR   uim-systray 30
+        ua_inst zh_CN   uim-systray 30
+        ua_inst zh_TW   uim-systray 30
+        ua_inst zh_HK   uim-systray 30
+        ua_inst zh_SG   uim-systray 30
+        ua_inst all_ALL uim-toolbar-qt  0
+        ua_inst ja_JP   uim-toolbar-qt 30
+        ua_inst ko_KR   uim-toolbar-qt 30
+        ua_inst zh_CN   uim-toolbar-qt 30
+        ua_inst zh_TW   uim-toolbar-qt 30
+        ua_inst zh_HK   uim-toolbar-qt 30
+        ua_inst zh_SG   uim-toolbar-qt 30
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff -Nru uim-1.1.0-old/debian/uim-xim.prerm uim-1.1.0/debian/uim-xim.prerm
--- uim-1.1.0-old/debian/uim-xim.prerm  2006-06-16 10:54:49.000000000 +0900
+++ uim-1.1.0/debian/uim-xim.prerm      2006-06-16 10:31:47.000000000 +0900
@@ -16,6 +16,27 @@
         ua_remove zh_TW   uim
         ua_remove zh_HK   uim
         ua_remove zh_SG   uim
+        ua_remove all_ALL uim-toolbar
+        ua_remove ja_JP   uim-toolbar
+        ua_remove ko_KR   uim-toolbar
+        ua_remove zh_CN   uim-toolbar
+        ua_remove zh_TW   uim-toolbar
+        ua_remove zh_HK   uim-toolbar
+        ua_remove zh_SG   uim-toolbar
+        ua_remove all_ALL uim-systray
+        ua_remove ja_JP   uim-systray
+        ua_remove ko_KR   uim-systray
+        ua_remove zh_CN   uim-systray
+        ua_remove zh_TW   uim-systray
+        ua_remove zh_HK   uim-systray
+        ua_remove zh_SG   uim-systray
+        ua_remove all_ALL uim-toolbar-qt
+        ua_remove ja_JP   uim-toolbar-qt
+        ua_remove ko_KR   uim-toolbar-qt
+        ua_remove zh_CN   uim-toolbar-qt
+        ua_remove zh_TW   uim-toolbar-qt
+        ua_remove zh_HK   uim-toolbar-qt
+        ua_remove zh_SG   uim-toolbar-qt
        ;;
     failed-upgrade)
        ;;

Reply via email to