提交: 095ee2f416cabe2254c4bd7e144146fc269bb993 - uim (git)

A multilingual input method framework

Commit MetaInfo

• 修訂: 095ee2f416cabe2254c4bd7e144146fc269bb993 (tree)
• 時間: 2010-08-11 16:18:44
• 作者: ek.kato <ek.kato@ff9a...>
• Commiter: ek.kato

Log Message

* Tag uim-1.6.0 from branches/1.6 r6716.

Change Summary

• modified: make-dist.sh
• modified: po/POTFILES.in
• modified: po/POTFILES.skip

差異

--- a/make-dist.sh
+++ b/make-dist.sh
@@ -20,7 +20,7 @@ CONF_DEFAULT="$CONF_COMMON"
 # --without-scim since it is broken
 # --without-qt
 # FIXME: hardcoded --with-eb-conf
-CONF_FULL_WO_MAINT="$CONF_NOWERROR --enable-debug --enable-fep --enable-emacs --enable-gnome-applet --enable-kde-applet --enable-pref --enable-dict --enable-notify --with-anthy --with-canna --with-wnn --with-sj3 --with-mana --with-prime --with-m17nlib --without-scim --with-gtk2 --with-gnome2 --without-qt --without-qt-immodule --enable-compat-scm --with-eb --with-eb-conf=/etc/eb.conf --with-libedit"
+CONF_FULL_WO_MAINT="$CONF_NOWERROR --enable-debug --enable-fep --enable-emacs --enable-gnome-applet --enable-kde-applet --enable-pref --enable-dict --enable-notify --with-anthy --with-canna --with-wnn --with-sj3 --with-mana --with-prime --with-m17nlib --without-scim --with-gtk2 --with-gnome2 --without-qt --without-qt-immodule --enable-compat-scm --with-eb --with-eb-conf=/etc/eb.conf --with-libedit --with-qt4 --with-qt4-immodule"
 CONF_FULL="$CONF_MAINT $CONF_FULL_WO_MAINT"
 
 
@@ -50,8 +50,7 @@ for conf_args in "$CONF_NONE" "$CONF_DEFAULT"; do
       || { echo 'make dist failed'; exit 1; }
 done
 
-# N.B. make check in test/ requires debug, nls and most of IMs enabled
-# Also do make check without --enable-maintainer-mode
+# do make check without --enable-maintainer-mode
 export DISTCHECK_CONFIGURE_FLAGS="$CONF_FULL_WO_MAINT"
 for conf_args in "$CONF_FULL"; do
     echo "configure $conf_args"

--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -21,8 +21,6 @@ qt/switcher-qt.cpp
 qt/toolbar-common-quimhelpertoolbar.cpp
 qt4/pref/customwidgets.cpp
 qt4/pref/qt4.cpp
-qt4/pref/ui_keyeditformbase.h
-qt4/pref/ui_olisteditformbase.h
 qt4/switcher/qt4.cpp
 qt4/toolbar/common-quimhelpertoolbar.cpp
 scm/action.scm

--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,2 +1,4 @@
 helper/GNOME_UimApplet.server.in
 uim.desktop.in
+qt4/pref/ui_keyeditformbase.h
+qt4/pref/ui_olisteditformbase.h