Update to 1.1.0:

Overview of changes from 1.1.0-beta to 1.1.0
==
* Fixes
  o Critical
    - libuim
      - fix a GC corruption that causes SEGV (YamaKen)

  o Minor
    - Qt immodule
      - proper deadkey and compose key handling (bug #3988, Etsushi)
      - adapted to the menu-based IM switcher (Etsushi)

    - m17n-lib IM
      - fix key handling with modifier keys (Etsushi)

* Others
  - tidy up automake/autoconf related scripts

Overview of changes from 1.1.0-alpha to 1.1.0-beta
==
* New features
  o Minor
    - Anthy
      - hankaku katakana conversion with Anthy-7802 (Etsushi)

* Fixes
  o Minor
    - uim-toolbar-gtk
      - prevent startup hang in a rare case (Etsushi)

    - Latin IM
      - update table (Etsushi)

Overview of changes from 1.0.x to 1.1.0-alpha
==
* New features
  o Major
    - icon support for toolbar (Etsushi, YamaKen)
    - menu-based quick IM switching from toolbar (YamaKen, Etsushi)

  o Minor
    - hotkey-based IM toggle has been able to hold per-context state
      (YamaKen)

  o IM related
    - Anthy, Canna, Mana
      - circular Hiragana, Katakana, Hankaku-kana conversion with
	"Muhenkan" key (Shun-ichi TAHARA)
    - Mana
      - support conversion-result learning with mana-0.2.0 (Shun-ichi
        TAHARA, Masanari)

* Fixes
  o Minor
    - general
      - handle 'Kanji' and 'Hiragana_Katakana' keys (Shun-ichi TAHARA)

    - uim-dict-gtk
      - refresh the word list when removing and updating the existing
        items (Etsushi)
    - uim-im-switcher-gtk
      - respond to the cursor movement from keyboard (Etsushi)
    - uim-pref-gtk
      - handle <Meta>, <Super>, and <Hyper> modifiers in the key
	capture widget (Etsushi)
      - distinguish directories and regular files on pathname custom
	widget (Etsushi, YamaKen)
    - uim-pref-qt
      - distinguish directories and regular files on pathname custom
	widget (Etsushi, YamaKen)

    - GTK+ immodule
      - enable <Alt>, <Meta>, <Super>, and <Hyper> modifier key
	handling on X11 (bug #2468, Etsushi)
      - disuse key snooper to improve shortcut key handling (Etsushi)
    - uim-xim
      - fix event handling with flashplayer plugin (Etsushi)
    - uim-fep
      - fix "commit_string" handling and make uim-input-ja working
        again (Konosuke, Masanari)
    - uim.el
      - handle "commit_string" from helper programs and make
        uim-input-ja working (Konosuke)

* Others
  - improve code properness with -Werror flag

  - contributed and new input method icons (SHIMODA Hiroshi, FUJITA
    Yuji, Jae-hyeon, YamaKen)

  - new icons for input state indicator in the toolbar (YamaKen,
    Jae-hyeon)

  - strip IM name multiplexed in iconic-label of input modes of skk and
    tutcode that confuses users (YamaKen)

  - update translations
    - ja (Daichi Kawahata, YamaKen)
    - ko (Jae-hyeon)

5 files changed, 91 insertions, 15 deletions

diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile
index 2cbdbea81eb..3cf7d2932a7 100644
--- a/inputmethod/uim/Makefile
+++ b/inputmethod/uim/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2006/05/08 22:57:20 hira Exp $
+# $NetBSD: Makefile,v 1.22 2006/06/12 16:35:20 wiz Exp $
 #
 
-DISTNAME=		uim-1.0.1
-PKGREVISION=		4
+DISTNAME=		uim-1.1.0
 CATEGORIES=		inputmethod
 MASTER_SITES=		http://uim.freedesktop.org/releases/
 
diff --git a/inputmethod/uim/PLIST.common b/inputmethod/uim/PLIST.common
index 47d9ff88001..e0beb22b2f0 100644
--- a/inputmethod/uim/PLIST.common
+++ b/inputmethod/uim/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.6 2006/04/17 07:07:23 jlam Exp $
+@comment $NetBSD: PLIST.common,v 1.7 2006/06/12 16:35:20 wiz Exp $
 bin/uim-fep
 bin/uim-fep-tick
 bin/uim-module-manager
@@ -31,7 +31,6 @@ share/doc/uim/UIM-SH
 share/doc/uim/uim-fep/README
 share/doc/uim/uim-fep/README.ja
 share/locale/fr/LC_MESSAGES/uim.mo
-share/locale/ja/LC_MESSAGES/uim-chardict-qt.mo
 share/locale/ja/LC_MESSAGES/uim.mo
 share/locale/ko/LC_MESSAGES/uim.mo
 share/uim/action.scm
@@ -58,6 +57,7 @@ share/uim/hangul2.scm
 share/uim/hangul3.scm
 share/uim/i18n.scm
 share/uim/im-custom.scm
+share/uim/im-switcher.scm
 share/uim/im.scm
 share/uim/init.scm
 share/uim/installed-modules.scm
@@ -74,11 +74,89 @@ share/uim/m17nlib.scm
 share/uim/mana-custom.scm
 share/uim/mana-key-custom.scm
 share/uim/mana.scm
-share/uim/manage-modules.scm
 share/uim/pinyin-big5.scm
-share/uim/pixmaps/configure-qt.png
+share/uim/pixmaps/anthy.png
+share/uim/pixmaps/byeoru.png
+share/uim/pixmaps/byeoru.svg
+share/uim/pixmaps/canna.png
+share/uim/pixmaps/direct.png
+share/uim/pixmaps/direct.svg
+share/uim/pixmaps/direct_input.png
+share/uim/pixmaps/direct_input.svg
+share/uim/pixmaps/hangul2.png
+share/uim/pixmaps/hangul2.svg
+share/uim/pixmaps/hangul3.png
+share/uim/pixmaps/hangul3.svg
+share/uim/pixmaps/im_subst.svg
+share/uim/pixmaps/ipa-x-sampa.png
+share/uim/pixmaps/ipa-x-sampa.svg
+share/uim/pixmaps/ja_azik.png
+share/uim/pixmaps/ja_azik.svg
+share/uim/pixmaps/ja_direct.png
+share/uim/pixmaps/ja_direct.svg
+share/uim/pixmaps/ja_fullwidth_alnum.png
+share/uim/pixmaps/ja_fullwidth_alnum.svg
+share/uim/pixmaps/ja_halfwidth_alnum.png
+share/uim/pixmaps/ja_halfwidth_alnum.svg
+share/uim/pixmaps/ja_halfwidth_katakana.png
+share/uim/pixmaps/ja_halfwidth_katakana.svg
+share/uim/pixmaps/ja_hiragana.png
+share/uim/pixmaps/ja_hiragana.svg
+share/uim/pixmaps/ja_kana.png
+share/uim/pixmaps/ja_kana.svg
+share/uim/pixmaps/ja_katakana.png
+share/uim/pixmaps/ja_katakana.svg
+share/uim/pixmaps/ja_nicola.png
+share/uim/pixmaps/ja_nicola.svg
+share/uim/pixmaps/ja_pocketbell.png
+share/uim/pixmaps/ja_pocketbell.svg
+share/uim/pixmaps/ja_romaji.png
+share/uim/pixmaps/ja_romaji.svg
+share/uim/pixmaps/ko_direct.png
+share/uim/pixmaps/ko_direct.svg
+share/uim/pixmaps/ko_hangulchar.png
+share/uim/pixmaps/ko_hangulchar.svg
+share/uim/pixmaps/ko_hangulword.png
+share/uim/pixmaps/ko_hangulword.svg
+share/uim/pixmaps/latin.png
+share/uim/pixmaps/latin.svg
+share/uim/pixmaps/mana.png
+share/uim/pixmaps/mana.svg
+share/uim/pixmaps/null.png
+share/uim/pixmaps/off.png
+share/uim/pixmaps/off.svg
+share/uim/pixmaps/on.png
+share/uim/pixmaps/on.svg
+share/uim/pixmaps/pinyin-big5.png
+share/uim/pixmaps/pinyin-big5.svg
+share/uim/pixmaps/prime.png
+share/uim/pixmaps/prime_mode_application.png
+share/uim/pixmaps/prime_mode_application.svg
+share/uim/pixmaps/py.png
+share/uim/pixmaps/py.svg
+share/uim/pixmaps/pyunihan.png
+share/uim/pixmaps/pyunihan.svg
+share/uim/pixmaps/romaja.png
+share/uim/pixmaps/romaja.svg
+share/uim/pixmaps/scim.png
+share/uim/pixmaps/scim.svg
+share/uim/pixmaps/skk.png
+share/uim/pixmaps/skk.svg
 share/uim/pixmaps/switcher-icon.png
+share/uim/pixmaps/tcode.png
+share/uim/pixmaps/tcode.svg
+share/uim/pixmaps/tutcode.png
+share/uim/pixmaps/tutcode.svg
+share/uim/pixmaps/uim-dict.png
+share/uim/pixmaps/uim-dict.svg
+share/uim/pixmaps/uim-gray.png
 share/uim/pixmaps/uim-icon.png
+share/uim/pixmaps/uim-icon48.png
+share/uim/pixmaps/uim-icon64.png
+share/uim/pixmaps/unknown.png
+share/uim/pixmaps/unknown.svg
+share/uim/pixmaps/viqr.png
+share/uim/pixmaps/viqr.svg
 share/uim/plugin.scm
 share/uim/prime-custom.scm
 share/uim/prime-key-custom.scm
diff --git a/inputmethod/uim/PLIST.gtk b/inputmethod/uim/PLIST.gtk
index d9f84d492d0..cd356513b20 100644
--- a/inputmethod/uim/PLIST.gtk
+++ b/inputmethod/uim/PLIST.gtk
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST.gtk,v 1.3 2006/03/09 18:04:32 wiz Exp $
-bin/uim-helper-toolbar-gtk
-bin/uim-helper-toolbar-gtk-systray
+@comment $NetBSD: PLIST.gtk,v 1.4 2006/06/12 16:35:20 wiz Exp $
 bin/uim-im-switcher-gtk
 bin/uim-input-pad-ja
 bin/uim-pref-gtk
diff --git a/inputmethod/uim/PLIST.qt b/inputmethod/uim/PLIST.qt
index 07a1f78bd93..8b3e64f6cb3 100644
--- a/inputmethod/uim/PLIST.qt
+++ b/inputmethod/uim/PLIST.qt
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST.qt,v 1.2 2006/03/09 18:04:32 wiz Exp $
+@comment $NetBSD: PLIST.qt,v 1.3 2006/06/12 16:35:20 wiz Exp $
 bin/uim-chardict-qt
 bin/uim-im-switcher-qt
 bin/uim-pref-qt
 bin/uim-toolbar-qt
 libexec/uim-candwin-qt
 share/uim/helperdata/bushu.t
+share/locale/ja/LC_MESSAGES/uim-chardict-qt.mo
 @dirrm share/uim/helperdata
diff --git a/inputmethod/uim/distinfo b/inputmethod/uim/distinfo
index 6cad9e7cd96..73167ccce07 100644
--- a/inputmethod/uim/distinfo
+++ b/inputmethod/uim/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2005/12/31 00:04:28 wiz Exp $
+$NetBSD: distinfo,v 1.8 2006/06/12 16:35:20 wiz Exp $
 
-SHA1 (uim-1.0.1.tar.gz) = a81e208856793edb6bfe748f6a5400ac03bf07b2
-RMD160 (uim-1.0.1.tar.gz) = fa0e0057a554382c06dc1f8c7287617db203bcee
-Size (uim-1.0.1.tar.gz) = 1924484 bytes
+SHA1 (uim-1.1.0.tar.gz) = 4d33a244ee7e432aa93fbde550048590da40cf5f
+RMD160 (uim-1.1.0.tar.gz) = 110f89de3218776fd862021147bf5a13b728689d
+Size (uim-1.1.0.tar.gz) = 2092779 bytes