[uim-commit] r2372 - in trunk: . po

ekato at freedesktop.org ekato at freedesktop.org
Mon Dec 5 05:02:43 PST 2005 

Author: ekato
Date: 2005-12-05 05:02:34 -0800 (Mon, 05 Dec 2005)
New Revision: 2372

Added:
   trunk/uim.desktop.in.in
Removed:
   trunk/uim.desktop.in
Modified:
   trunk/Makefile.am
   trunk/configure.ac
   trunk/po/POTFILES.in
   trunk/uim.spec.in
Log:
* uim.spec.in : Update.
* configure.ac : Add uim.spec and uim.desktop.in and remove
  uim.desktop from AC_CONFIG_FILES.
* uim.desktop.in : Removed.
* uim.desktop.in.in : New.  Moved from uim.desktop.in.
* Makefile.am : Use INTLTOOL to produce uim.desktop.  Bug #5246
  (Daichi Kawahata).
* po/POTFILES.in : Update (Bug #5246 Daichi Kawahata).


Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2005-12-05 10:04:21 UTC (rev 2371)
+++ trunk/Makefile.am	2005-12-05 13:02:34 UTC (rev 2372)
@@ -11,7 +11,9 @@
 pkgconfig_DATA = uim.pc
 
 desktopdir = $(datadir)/applications
-desktop_DATA = uim.desktop
+desktop_in_files = uim.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ at INTLTOOL_DESKTOP_RULE@
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -80,3 +82,6 @@
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+
+dist-hook: uim.spec
+	cp uim.spec $(distdir)

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2005-12-05 10:04:21 UTC (rev 2371)
+++ trunk/configure.ac	2005-12-05 13:02:34 UTC (rev 2372)
@@ -845,7 +845,8 @@
 		 pixmaps/Makefile
 		 replace/Makefile
 		 uim.pc
-		 uim.desktop
+		 uim.desktop.in
+		 uim.spec
 		 ])
 
 AC_OUTPUT

Modified: trunk/po/POTFILES.in
===================================================================
--- trunk/po/POTFILES.in	2005-12-05 10:04:21 UTC (rev 2371)
+++ trunk/po/POTFILES.in	2005-12-05 13:02:34 UTC (rev 2372)
@@ -1,90 +1,54 @@
 helper/GNOME_UimApplet.server.in.in
-helper/im-switcher-gtk.c
-helper/dict-main-gtk.c
 helper/dict-anthy.c
-helper/dict-anthy.h
-helper/dict-canna.c
-helper/dict-canna.h
-helper/dict-word-win-gtk.c
-helper/dict-word-win-gtk.h
-helper/dict-word-list-win-gtk.c
-helper/dict-word-list-win-gtk.h
-helper/dict-util.c
-helper/dict-word-list-view-gtk.c
-helper/dict-word-list-view-gtk.h
-helper/dict-word.c
-helper/dict-word.h
-helper/dict-dict.c
-helper/dict-dict.h
 helper/dict-cclass-dialog.c
-helper/dict-cclass-dialog.h
-helper/pref-gtk.c
+helper/dict-main-gtk.c
+helper/dict-word-list-view-gtk.c
+helper/dict-word-list-win-gtk.c
+helper/dict-word-win-gtk.c
+helper/im-switcher-gtk.c
+helper/input-pad-ja.c
 helper/pref-gtk-custom-widgets.c
-helper/pref-gtk-custom-widgets.h
+helper/pref-gtk.c
+helper/toolbar-applet-gnome.c
 helper/toolbar-common-gtk.c
-helper/input-pad-ja.c
-qt/candwin-qt.cpp
+helper/toolbar-standalone-gtk.c
+qt/chardict-bushuviewwidget.cpp
+qt/chardict-qt.cpp
+qt/chardict-unicodeviewwidget.cpp
+qt/pref-customwidgets.cpp
+qt/pref-qt.cpp
+qt/qtgettext.h
 qt/switcher-qt.cpp
 qt/toolbar-common-quimhelpertoolbar.cpp
-qt/toolbar-standalone-qt.cpp
-qt/pref-qt.cpp
-qt/pref-customwidgets.cpp
-scm/py.scm
 scm/action.scm
 scm/anthy-custom.scm
 scm/anthy-key-custom.scm
-scm/anthy.scm
 scm/byeoru-custom.scm
-scm/byeoru-dic.scm
 scm/byeoru-key-custom.scm
-scm/byeoru-symbols.scm
-scm/byeoru.scm
 scm/canna-custom.scm
 scm/canna-key-custom.scm
-scm/canna.scm
-scm/default.scm
+scm/custom.scm
 scm/direct.scm
 scm/generic-custom.scm
 scm/generic-key-custom.scm
 scm/generic.scm
 scm/hangul.scm
-scm/hangul2.scm
-scm/hangul3.scm
-scm/i18n.scm
 scm/im-custom.scm
-scm/im.scm
 scm/ipa-x-sampa.scm
-scm/japanese-azik.scm
-scm/japanese-kana.scm
-scm/japanese.scm
-scm/key.scm
 scm/latin.scm
-scm/lazy-load.scm
-scm/load-action.scm
-scm/init.scm
 scm/m17nlib.scm
-scm/pinyin-big5.scm
+scm/mana-custom.scm
+scm/mana-key-custom.scm
 scm/prime-custom.scm
 scm/prime-key-custom.scm
-scm/prime.scm
 scm/pyload.scm
-scm/pyunihan.scm
-scm/rk.scm
-scm/romaja.scm
+scm/scim.scm
 scm/skk-custom.scm
-scm/skk-dialog.scm
-scm/skk-editor.scm
 scm/skk-key-custom.scm
-scm/skk.scm
 scm/spellcheck-custom.scm
-scm/spellcheck.scm
 scm/tcode.scm
-scm/tutcode.scm
 scm/tutcode-key-custom.scm
-scm/uim-sh.scm
-scm/ustr.scm
-scm/util.scm
+scm/tutcode.scm
 scm/viqr.scm
-scm/zaurus.scm
-gtk/gtk-im-uim.c
+uim.desktop.in.in
 uim/iso-639-1.def

Deleted: trunk/uim.desktop.in
===================================================================
--- trunk/uim.desktop.in	2005-12-05 10:04:21 UTC (rev 2371)
+++ trunk/uim.desktop.in	2005-12-05 13:02:34 UTC (rev 2372)
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=Preference of uim
-Name[ja]=uimの設定
-Comment=
-Comment[ja]=
-Exec=uim-pref-gtk
-Icon=@uim_pixmapsdir@/uim-icon.png
-Terminal=false
-MimeType=text/plain
-Categories=Settings

Copied: trunk/uim.desktop.in.in (from rev 2370, trunk/uim.desktop.in)
===================================================================
--- trunk/uim.desktop.in	2005-12-04 22:38:45 UTC (rev 2370)
+++ trunk/uim.desktop.in.in	2005-12-05 13:02:34 UTC (rev 2372)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+_Name=Preference of uim
+_Comment=Input method settings
+Exec=uim-pref-gtk
+Icon=@uim_pixmapsdir@/uim-icon.png
+Terminal=false
+MimeType=text/plain
+Categories=Settings

Modified: trunk/uim.spec.in
===================================================================
--- trunk/uim.spec.in	2005-12-05 10:04:21 UTC (rev 2371)
+++ trunk/uim.spec.in	2005-12-05 13:02:34 UTC (rev 2372)
@@ -1,13 +1,12 @@
-Summary: UIM an input method library
+Summary: A multilingual input method library
 Name: uim
 Version: @VERSION@
 Release: 1
-URL: http://anthy.sourceforge.jp
+URL: http://uim.freedesktop.org/
 Source0: %{name}-%{version}.tar.gz
-License: GPL or BSD
-Group: 不明
+License: BSD
+Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
-Requires: gtk2
 
 %description
 
@@ -15,7 +14,7 @@
 %setup -q
 
 %build
-./configure --prefix=/usr --sysconfdir=/etc --without-canna
+%configure
 make
 
 %install
@@ -30,11 +29,21 @@
 
 %files
 %defattr(-,root,root)
-/usr/lib
-/usr/share/uim
-/usr/include/uim
+%doc AUTHORS ChangeLog* COPYING NEWS README doc
+%{_bindir}/uim-*
+%{_libdir}/libuim*
+%{_libdir}/uim/plugin/*
+%{_libdir}/gtk-2.0/*/immodules/im-uim.*
+%{_libdir}/bonobo/servers/GNOME_UimApplet.server
+%{_libdir}/pkgconfig/uim.pc
+%{_libexecdir}/uim-*
+%{_includedir}/uim
+%{_datadir}/uim
+%{_datadir}/locale/*/LC_MESSAGES/uim.mo
+%{_datadir}/applications/uim.desktop
+%{_datadir}/emacs/site-lisp/uim-el
+%{_mandir}/man1/uim-xim.*
 
-
 %changelog
 * Sat Dec  7 2002 TABATA Yusuke <yusuke at localhost.localdomain>
 - Initial build.

More information about the uim-commit mailing list