--- scim-bridge-0.4.16.orig/debian/scim-bridge-client-qt4.install +++ scim-bridge-0.4.16/debian/scim-bridge-client-qt4.install @@ -0,0 +1,2 @@ +usr/lib/qt4/plugins/inputmethods/im-scim-bridge.so + --- scim-bridge-0.4.16.orig/debian/scim-bridge.1 +++ scim-bridge-0.4.16/debian/scim-bridge.1 @@ -0,0 +1,45 @@ +.\" Copyright 2006 ZhengPeng Hou , +.\" This man page is distributed under the same license as scim-bridge package. +.\" +.TH "SCIM-BRIDGE-AGENT" "1" +.SH "NAME" +scim-bridge \(em Yet another IM client of SCIM. The im-module of scim-bridge communicates with scim via socket. +.SH "SYNOPSIS" +.PP +\fBscim-bridge;\fR [\fB-h \fI\-\-help\fR\fP] [\fB-v\fI\-\-verbose\fR\fP] [\fB-q\fI\-\-quiet\fR\fP] [\fB-b\fI\-\-debugflags\fR\fP] [\fB-l\fI\-\-debuglevel\fR\fP] [\fB-standalone\fI\-\-standalone\fR\fP] [\fB-n\fI\-\-noexit\fR\fP] +.SH "DESCRIPTION" +.PP +This manual page documents briefly the +\fBscim-bridge-agent;\fR and \fBbar\fR commands. +.PP +This manual page was written for the \fBDebian\fP distribution +because the original program does not have a manual page. +.SH "OPTIONS" +.PP +These programs follow the usual GNU command line syntax, +with long options starting with two dashes (`\-'). A summary of +options is included below. +.IP "\fB-h\fP \fB\-\-help\fP " 10 +Give this help list. +.IP "\fB-v\fP \fB\-\-verbose\fP " 10 +Verbosely print out the debug message into standard output.This option equals to '\-\-debuglevel=9 \-\-debugflags=all'. +.IP "\fB-q\fP \fB\-\-quiet\fP " 10 +Make it print no debug message at all.This option equals to '\-\-debuglevel=0 \-\-debugflags=none'. +.IP "\fB-b\fP \fB\-\-debugflags\fP " 10 +Set which category of debug output do you need.Select one or more from 'all', 'none', 'agent', 'messenger', 'imcontext', and 'scim'. +.IP "\fB-l\fP \fB\-\-debuglevel\fP " 10 +Set how verbosely should it print debug output.'\-\-debuglevel=0' equals to '\-\-queit', and '\-\-debuglevel=9' equals to '\-\-verbose'. +.IP "\fB-standalone\fP \fB\-\-standalone\fP " 10 +Given this, scim-brige-agent won't daemonize itself. +.IP "\fB-n\fP \fB\-\-noexit\fP " 10 +Given this, scim-brige-agent won't exit when there is no client. +.SH "AUTHOR" +scim-bridge is writen by Ryo Dairiki. +.PP +This manual page was written by Zhengpeng Hou zhengpeng-hou@ubuntu.com for +the \fBDebian\fP system (but may be used by others). Permission is +granted to copy, distribute and/or modify this document under +the terms of the GNU General Public License, Version 2 any +later version published by the Free Software Foundation. + +.\" created by instant / docbook-to-man, Mon 03 Apr 2006, 10:00 --- scim-bridge-0.4.16.orig/debian/scim-bridge-agent.install +++ scim-bridge-0.4.16/debian/scim-bridge-agent.install @@ -0,0 +1,2 @@ +usr/bin/scim-bridge +etc/X11/xinit/xinput.d/scim-bridge --- scim-bridge-0.4.16.orig/debian/compat +++ scim-bridge-0.4.16/debian/compat @@ -0,0 +1 @@ +5 --- scim-bridge-0.4.16.orig/debian/scim-bridge-agent.prerm +++ scim-bridge-0.4.16/debian/scim-bridge-agent.prerm @@ -0,0 +1,30 @@ +#!/bin/sh +set -e + +ua_remove () { + update-alternatives \ + --remove xinput-$1 \ + /etc/X11/xinit/xinput.d/$2 ; +} + +case "$1" in + remove|upgrade|deconfigure) + ua_remove all_ALL scim-bridge + ua_remove ja_JP scim-bridge + ua_remove ko_KR scim-bridge + ua_remove zh_CN scim-bridge + ua_remove zh_TW scim-bridge + ua_remove zh_HK scim-bridge + ua_remove zh_SG scim-bridge + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- scim-bridge-0.4.16.orig/debian/scim-bridge-client-gtk.install +++ scim-bridge-0.4.16/debian/scim-bridge-client-gtk.install @@ -0,0 +1 @@ +usr/lib/*/gtk-2.0/*/immodules/im-scim-bridge.so --- scim-bridge-0.4.16.orig/debian/copyright +++ scim-bridge-0.4.16/debian/copyright @@ -0,0 +1,50 @@ +This package was debianized by Hou ZhengPeng + on +Sun, 2 Apr 2006 18:07:30 +0800. + +It was downloaded from http://www.scim-im.org + +Upstream Authors: Ryo Dairiki + + + - - - - - copyright notice and license for Debian packaging - - - - - + +Copyright: + Copyright (C) 2006 by ZhengPeng Hou + +License: + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the + Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. + + - - - - - copyright notice and license for upstream - - - - - + +Copyright: + Copyright (C) 2006 by Ryo Dairiki + +License: + + This package of scim-bridge is released under the dual + license of GPL 2 and LGPL 2.1. + + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. --- scim-bridge-0.4.16.orig/debian/scim-bridge-agent.postinst +++ scim-bridge-0.4.16/debian/scim-bridge-agent.postinst @@ -0,0 +1,33 @@ +#!/bin/sh +set -e + +ua_inst () { + update-alternatives \ + --install /etc/X11/xinit/xinput.d/$1 xinput-$1 \ + /etc/X11/xinit/xinput.d/$2 $3 ; +} + +case "$1" in + configure) + #ua_inst all_ALL scim-bridge 0 + ua_inst ja_JP scim-bridge 60 + ua_inst ko_KR scim-bridge 60 + ua_inst zh_CN scim-bridge 60 + ua_inst zh_TW scim-bridge 60 + ua_inst zh_HK scim-bridge 60 + ua_inst zh_SG scim-bridge 60 + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + + --- scim-bridge-0.4.16.orig/debian/control +++ scim-bridge-0.4.16/debian/control @@ -0,0 +1,57 @@ +Source: scim-bridge +Section: utils +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Zhengpeng Hou +Uploaders: Anthony Fok +Build-Depends: debhelper (>= 7.0), autotools-dev, libgtk2.0-dev (>= 2.10.1), libscim-dev (>= 1.4.6), dpatch, libqt3-mt-dev (>= 3.3.6), libqt4-dev, chrpath +Standards-Version: 3.8.1 +Homepage: http://www.scim-im.org + +Package: scim-bridge-agent +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, scim-modules-socket, scim +Recommends: scim-bridge-client-gtk | scim-bridge-client-qt | scim-bridge-client-qt4 +Description: IME server of scim-bridge communicate with SCIM + scim-bridge is a wrapper library for SCIM, written in C. + . + SCIM (Smart Common Input Method) is an input method (IM) platform. + . + Scim-bridge has two parts: agent and client. scim-bridge-agent stands + between SCIM and the clients (IMModules), so the clients only need + communicate with scim-bridge-agent, because scim-bridge-agent was written + in C, it will solve some C++ ABI problems. + +Package: scim-bridge-client-gtk +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, scim-bridge-agent +Replaces: scim-bridge (= 0.2.4-1) +Description: IME server of scim-bridge communicate with SCIM + scim-bridge is a wrapper libray for SCIM, written in C. + . + SCIM (Smart Common Input Method) is an input method (IM) platform. + . + Scim-bridge-client-gtk is the gtk client of scim-bridge, it provides + another gtk-immodule for SCIM. + +Package: scim-bridge-client-qt +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, scim-bridge-agent +Description: IME server of scim-bridge communicate with SCIM + scim-bridge is a wrapper library for SCIM, written in C. + . + SCIM (Smart Common Input Method) is an input method (IM) platform. + . + Scim-bridge-client-qt is the qt client of scim-bridge, it provides + another qt-immodule for SCIM. + +Package: scim-bridge-client-qt4 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, scim-bridge-agent +Description: IME server of scim-bridge communicate with SCIM + scim-bridge is a wrapper library for SCIM, written in C. + . + SCIM (Smart Common Input Method) is an input method (IM) platform. + . + Scim-bridge-client-qt4 is the qt4 client of scim-bridge, it provides + another qt-immodule for SCIM. --- scim-bridge-0.4.16.orig/debian/scim-bridge-client-qt.install +++ scim-bridge-0.4.16/debian/scim-bridge-client-qt.install @@ -0,0 +1,2 @@ +usr/lib/qt3/plugins/inputmethods/im-scim-bridge.so + --- scim-bridge-0.4.16.orig/debian/README.Debian +++ scim-bridge-0.4.16/debian/README.Debian @@ -0,0 +1,30 @@ +If you want to use scim-bridge, I assume that you have installed related +packages, like scim-bridge-agent, scim-bridge-client-{gtk,qt}. +To use it, you shall set your corresponding environment variable, such +as, GTK_IM_MODULE and QT_IM_MODULE. In most recently Debian/Ubuntu, if +you have im-switch installed, you can provide a configure file in +~/.xinput.d/, which contain as below: +##=================Begin============================================ + XIM=SCIM + if [ -e /usr/bin/skim ]; then + XIM_PROGRAM=/usr/bin/skim + else + XIM_PROGRAM=/usr/bin/scim + fi + XIM_ARGS="-d" + GTK_IM_MODULE=scim-bridge + QT_IM_MODULE=scim-bridge + DEPENDS="scim | skim, scim-bridge-agent, scim-bridge-client-gtk | scim-bridge-client-qt" +##=================End============================================== +You may open a terminal, and do: locale |grep LANGUAGE, then you will get +the value of ll_CC. In above configure file, we make GTK and Qt programs all +use scim-bridge, but you can decide whether to use them both. + +It looks like many old-time users of scim and scim-bridge experience frequent +crashes (cf. https://launchpad.net/bugs/338217). The reason is not completely +clear, but seems to stem from incompatible data structures in old config files +that crash more recent versions of scim-bridge. The best known remedy is to +"rm -Rf ~/.scim" (or backup that directory somewhere else if you prefer) and +optionally reinstall scim and other affected packages. + +If you have any problem, you may contact me: zhengpeng-hou AT ubuntu .com. --- scim-bridge-0.4.16.orig/debian/changelog +++ scim-bridge-0.4.16/debian/changelog @@ -0,0 +1,242 @@ +scim-bridge (0.4.16-2ubuntu5) oneiric; urgency=low + + * debian/{rules,scim-bridge-client-gtk.install}: Use GTK+ multiarch + lib path. Fixes FTBFS. (LP: #832786) (Closes: #640625) + + -- Daniel T Chen Thu, 22 Sep 2011 07:35:29 -0400 + +scim-bridge (0.4.16-2ubuntu4) maverick; urgency=low + + * add some information to the README about crashes induced apparently by + incompatible data structures in old config files. (LP: #338217) + + -- Rolf Leggewie Sun, 21 Feb 2010 22:28:50 +0100 + +scim-bridge (0.4.16-2ubuntu3) karmic; urgency=low + + * add scim-bridge-client-qt4 to Recommends (LP: #400049) + * fix some minor spelling mistakes in the control file + + -- Rolf Leggewie Thu, 16 Jul 2009 04:34:27 +0200 + +scim-bridge (0.4.16-2ubuntu2) karmic; urgency=low + + * debian/im-switch/scim-bridge: fixed search path of Qt immodule to work + with Qt 4. (LP: #305452) + + -- Ikuya Awashiro Wed, 01 Jul 2009 13:45:05 +0000 + +scim-bridge (0.4.16-2ubuntu1) karmic; urgency=low + + * Resynchronise with Debian. Remaining changes: + - 50_check_scim_binary.dpatch: Fix 10-20s delay in launching apps when + scim is not running. + - 50_fix_qt4_focus.dpatch: Fix focus loss under KDE 4. + - 51_quiet.dpatch: Turn some error messages into debug lines. + - Just have scim-bridge-agent depend on scim, not scim | skim. + + -- Colin Watson Thu, 25 Jun 2009 22:02:52 +0100 + +scim-bridge (0.4.16-2) unstable; urgency=low + + * Fix FTBFS by add proper parameter to chrpath. (Closes: #529571) + - Thanks for Deng Xiyue + + -- Zhengpeng Hou Wed, 20 May 2009 16:52:35 +0000 + +scim-bridge (0.4.16-1) unstable; urgency=low + + * New upstream release + * update all patches due to upstreams change. + * Correct my First name in maintainer field. + * use chrpath to replace configure parameter. + + -- Zhengpeng Hou Sat, 25 Apr 2009 15:22:36 +0000 + +scim-bridge (0.4.14-2ubuntu5) intrepid; urgency=low + + * 50_check_scim_binary.dpatch: Enable again, since the Qt agent really + does get upset if scim is installed but not running (as is the case in + many locales). This time, check for whether the scim-helper-manager + process is running. + + -- Colin Watson Sun, 26 Oct 2008 16:07:56 +0000 + +scim-bridge (0.4.14-2ubuntu4) intrepid; urgency=low + + All changes thanks to Zheng Peng-Hou. + * Disable 50_check_scim_binary.dpatch since only a dependency on scim is + enough. Actually only a running scim-helper is needed, which is in the + scim package and gets started (and restarted if it dies) automatically. + However, modified the patch to check for schim-helper instead in case the + patch becomes necessary again. (LP: #286923) + * Add patch 50_fix_qt4_focus.dpatch to fix focus loss under KDE4. (LP: + #250046) + * Update debian/control to fix dependencies and the Name of the Original + Maintainer. + + -- Arne Goetje Wed, 22 Oct 2008 10:44:39 +0800 + +scim-bridge (0.4.14-2ubuntu3) intrepid; urgency=low + + * Update 50_check_scim_binary.dpatch to check for running scim + + -- Jonathan Riddell Mon, 20 Oct 2008 10:38:48 +0100 + +scim-bridge (0.4.14-2ubuntu2) intrepid; urgency=low + + * Add 51_quiet.dpatch, turns some error into debug lines, stop it + outputting lots of unnecessary text. + + -- Jonathan Riddell Fri, 19 Sep 2008 13:37:03 +0100 + +scim-bridge (0.4.14-2ubuntu1) intrepid; urgency=low + + * Fixes 10-20s delay in launching apps when scim-bridge-client(s) installed + but scim is not + - 50_check_scim_binary.dpatch (LP: 203334) + + -- Roderick B. Greening Mon, 15 Sep 2008 17:15:29 -0230 + +scim-bridge (0.4.14-2) unstable; urgency=low + + * Merged with 0.4.14-1ubuntu2, which in particular fixes a dangling + /etc/alternatives/xinput-zh_CN upon package removal. Thanks, Arne! + * debian/control: + - Build-Depends on libscim-dev rather than scim-dev. + - Fixed Lintian warning: build-depends-on-1-revision + - Bumped Standards-Version to 3.8.0. No change required. + * Adding myself to Uploaders. + + -- Anthony Fok Sat, 26 Jul 2008 11:17:37 +0800 + +scim-bridge (0.4.14-1ubuntu2) hardy; urgency=low + + * debian/scim-bridge-agent.postinst: set scim-bridge with priority of 60 for + all CJK locales + * added debian/scim-bridge-agenst.prerm: remove the u-a settings for + scim-bridge + + -- Arne Goetje Thu, 06 Mar 2008 22:57:40 +0800 + +scim-bridge (0.4.14-1ubuntu1) hardy; urgency=low + + * debian/rules: + + Remove empty po/scim.pot before building to make pkgstriptranslations + happy (Fix FTBFS; LP: #181029). + * debian/control: + + Modify Maintainer value to match DebianMaintainerField spec. + + -- Marco Rodrigues Mon, 14 Jan 2008 01:19:33 +0000 + +scim-bridge (0.4.14-1) unstable; urgency=low + + * New upstream release + * Add Depends to scim-modules-socket. Closes: #442114 + Thanks for Ming Hua's bug report. + * 40_correct_gtk_client_missing_include.dpatch. Closes: #453175 + * Fixed build with Gcc-4.3 in upstream. Closes: #417683 + * Add conffile for im-switch. Closes: #451938 + Thanks for Deng Xiyue's bug report. + * Closes: #442172 Fixed in upstream. + * Disable build documents. Closes: #442726 + * Upgrade Standards-Version to 3.7.3. + + -- ZhengPeng Hou Sun, 23 Dec 2007 11:52:06 +0000 + +scim-bridge (0.4.13-1) unstable; urgency=low + + * New upstream release. (Closes: #417683) + * Add a binary pacakge: scim-bridge-client-qt4. + * update 20_correct_qt_client_install_dir.dpatch. + * Fix some typos in debian/control + * Drop scim-bridge dumy package.(Thanks Ming Hua) + * Add libqt4-dev to build-deps. + * Add 30_correct_moc.dpatch. + + -- ZhengPeng Hou Thu, 09 Aug 2007 12:41:33 +0000 + +scim-bridge (0.4.12-1) unstable; urgency=low + + * New upstream release + * Polish description. (Closes: #416352) + * Provide an README.Debian for users. (Closes: #420234) + * Make scim-bridge Build-depend on scim-dev (>= 1.4.6-1). + + -- ZhengPeng Hou Fri, 18 May 2007 05:48:22 +0000 + +scim-bridge (0.4.10-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Gtk 2.10 transition; closes: #419313. + - Build-depend on libgtk2.0-dev >= 2.10.1-1. + - Don't hardcode the Gtk+ module ABI version. + . Use a wildcard in debian/scim-bridge-client-gtk.install. + . Update dpatches 01_gtk-immodule-install-dir (disabled) and + 10_gtk-immodule-install-dir to use $(GTK_BINARY_VERSION). + - Call dh_gtkmodules in binary-arch. + - Drop scim-bridge-client-gtk.postinst, scim-bridge-client-gtk.postrm, + scim-bridge.postinst, and scim-bridge.postrm which only had + update-gtk-immodules calls. + - Drop libgtk2.0-bin dependency of scim-bridge-client-gtk. + + -- Loic Minier Sun, 29 Apr 2007 20:41:31 +0200 + +scim-bridge (0.4.10-1) unstable; urgency=low + + * New upstream release + + -- ZhengPeng Hou Tue, 27 Feb 2007 14:25:13 +0800 + +scim-bridge (0.4.8-1) unstable; urgency=low + + * New upstream release. + * Close #398376, add depends on libgtk2.0-bin. + * Separate into three packages due to the upstream's change. + * Add 20_correct_qt_client_install_dir.dpatch, for install + the qt clinet to the right place. + * Rename scim-bridge-agent.1 to scim-bridge.1, and polish it. + * Remove the 30_readme.dpatch and 40_fsf-address.dpatch, because + of the changes in upstream tarball. (thanks Anthony. Fok) + + -- ZhengPeng Hou Sun, 26 Nov 2006 13:10:49 +0800 + +scim-bridge (0.2.4-1) unstable; urgency=low + + [ Hou ZhengPeng ] + * Initial release for Debian (Closes: Bug#360439) + (scim-bridge already in Ubuntu Dapper universe) + * New upstream release + * Fix typo in debian/copyright: change GPL-2 to LGPL + * Upgrade Standards-Version from 3.6.2 to 3.7.2 + + [ Anthony Fok ] + * Added myself as an Uploader. :-) + * Fixed some minor typos in README etc. + * Fixed the full-text of debian/copyright. Thanks to FTP Master + Joerg Jaspert for catching the mistake. :-) + * Updated the upstream COPYRIGHT file too to update FSF mailing address. + + -- Anthony Fok Wed, 26 Jul 2006 01:01:32 +0800 + +scim-bridge (0.1.4-0ubuntu2) dapper; urgency=low + + * Add dependency on scim or skim + * Rewrite the Description in debian/control + + -- Hou ZhengPeng Wed, 12 Apr 2006 16:45:10 +0800 + +scim-bridge (0.1.4-0ubuntu1) dapper; urgency=low + + * New upstream release + + -- Hou ZhengPeng Mon, 3 Apr 2006 22:45:11 +0800 + +scim-bridge (0.1.3-0ubuntu1) dapper; urgency=low + + * Initial release Closes #360439 + * Add 10_gtk-immodule-install-dir.dpatch for correct + the install dir from /usr/lib/gtk-2.0/immodules to + /usr/lib/gtk-2.0/2.4.0/immodules + + -- Hou ZhengPeng Sun, 2 Apr 2006 18:07:30 +0800 --- scim-bridge-0.4.16.orig/debian/watch +++ scim-bridge-0.4.16/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/scim/scim-bridge-([\d\.]*)\.tar\.gz debian uupdate --- scim-bridge-0.4.16.orig/debian/rules +++ scim-bridge-0.4.16/debian/rules @@ -0,0 +1,109 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + +ONFFLAGS = +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + CONFFLAGS += --build $(DEB_HOST_GNU_TYPE) +else + CONFFLAGS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +endif + +DEBUGFLAGS=-g +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + DEBUGFLAGS += -O0 +else + DEBUGFLAGS += -O2 +endif + +CFLAGS:=-Wall -pipe $(DEBUGFLAGS) +CXXFLAGS:=$(CFLAGS) + +configure: patch +config.status: configure + dh_testdir + # Add here commands to configure the package. + ./configure CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(CONFFLAGS) \ + --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \ + --enable-qt4-immodule --disable-documents --disable-tests + + +build: build-stamp + +build-stamp: config.status + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + #docbook-to-man debian/scim-bridge-agent.sgml > scim-bridge-agent.1 + + touch build-stamp + +clean: clean-patched unpatch +clean-patched: + dh_testdir + dh_testroot + rm -f build-stamp + [ ! -f Makefile ] || $(MAKE) distclean + +# find po -empty -exec rm {} \; + + dh_clean + +patch: patch-stamp +patch-stamp: + dpatch apply-all + +unpatch: + dpatch deapply-all + rm -rf patch-stamp debian/patched + + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/scim-bridge. + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + chrpath -d debian/tmp/usr/bin/scim-bridge + rm debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gtk-2.0/*/immodules/im-scim-bridge.a + rm debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gtk-2.0/*/immodules/im-scim-bridge.la + rm debian/tmp/usr/lib/qt3/plugins/inputmethods/im-scim-bridge.a + rm debian/tmp/usr/lib/qt3/plugins/inputmethods/im-scim-bridge.la + rm debian/tmp/usr/lib/qt4/plugins/inputmethods/im-scim-bridge.a + rm debian/tmp/usr/lib/qt4/plugins/inputmethods/im-scim-bridge.la + install -d $(CURDIR)/debian/tmp/etc/X11/xinit/xinput.d/ + install -m 644 debian/im-switch/scim-bridge debian/tmp/etc/X11/xinit/xinput.d/ + + dh_install --sourcedir=debian/tmp --fail-missing +binary-indep: build install +binary-arch: build install + dh_testdir + dh_testroot + dh_gtkmodules + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples + dh_installman debian/scim-bridge.1 + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- scim-bridge-0.4.16.orig/debian/docs +++ scim-bridge-0.4.16/debian/docs @@ -0,0 +1 @@ +NEWS --- scim-bridge-0.4.16.orig/debian/patches/40_correct_gtk_client_missing_include.dpatch +++ scim-bridge-0.4.16/debian/patches/40_correct_gtk_client_missing_include.dpatch @@ -0,0 +1,46 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 40_correct_gtk_client_missing_include.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: + +@DPATCH@ +diff -ruNad scim-bridge-0.4.16.orig/client-gtk/Makefile.am scim-bridge-0.4.16/client-gtk/Makefile.am +--- scim-bridge-0.4.16.orig/client-gtk/Makefile.am 2009-04-28 12:55:13.000000000 +0800 ++++ scim-bridge-0.4.16/client-gtk/Makefile.am 2009-04-28 13:13:09.000000000 +0800 +@@ -33,13 +33,13 @@ + scim-bridge-client-imcontext-gtk.c \ + scim-bridge-client-key-event-utility-gtk.c + +-im_scim_bridge_la_CXXFLAGS=@GTK2_CFLAGS@ +-im_scim_bridge_la_CFLAGS =@GTK2_CFLAGS@ ++im_scim_bridge_la_CXXFLAGS= -I/usr/include/X11 @GTK2_CFLAGS@ ++im_scim_bridge_la_CFLAGS = -I/usr/include/X11 @GTK2_CFLAGS@ + + im_scim_bridge_la_LDFLAGS = -rpath $(moduledir) \ + -avoid-version -no-undefined \ + -module \ +- @GTK2_LIBS@ ++ -lX11 @GTK2_LIBS@ + + im_scim_bridge_la_LIBADD = $(top_srcdir)/common/libscimbridgecommon.la \ + $(top_srcdir)/client-common/libscimbridgeclientcommon.la +diff -ruNad scim-bridge-0.4.16.orig/client-gtk/Makefile.in scim-bridge-0.4.16/client-gtk/Makefile.in +--- scim-bridge-0.4.16.orig/client-gtk/Makefile.in 2009-04-28 12:55:13.000000000 +0800 ++++ scim-bridge-0.4.16/client-gtk/Makefile.in 2009-04-28 13:15:31.000000000 +0800 +@@ -246,12 +246,12 @@ + @SCIM_BRIDGE_BUILD_GTK2_IMMODULE_TRUE@ scim-bridge-client-imcontext-gtk.c \ + @SCIM_BRIDGE_BUILD_GTK2_IMMODULE_TRUE@ scim-bridge-client-key-event-utility-gtk.c + +-@SCIM_BRIDGE_BUILD_GTK2_IMMODULE_TRUE@im_scim_bridge_la_CXXFLAGS = @GTK2_CFLAGS@ +-@SCIM_BRIDGE_BUILD_GTK2_IMMODULE_TRUE@im_scim_bridge_la_CFLAGS = @GTK2_CFLAGS@ ++@SCIM_BRIDGE_BUILD_GTK2_IMMODULE_TRUE@im_scim_bridge_la_CXXFLAGS = -I/usr/include/X11 @GTK2_CFLAGS@ ++@SCIM_BRIDGE_BUILD_GTK2_IMMODULE_TRUE@im_scim_bridge_la_CFLAGS = -I/usr/include/X11 @GTK2_CFLAGS@ + @SCIM_BRIDGE_BUILD_GTK2_IMMODULE_TRUE@im_scim_bridge_la_LDFLAGS = -rpath $(moduledir) \ + @SCIM_BRIDGE_BUILD_GTK2_IMMODULE_TRUE@ -avoid-version -no-undefined \ + @SCIM_BRIDGE_BUILD_GTK2_IMMODULE_TRUE@ -module \ +-@SCIM_BRIDGE_BUILD_GTK2_IMMODULE_TRUE@ @GTK2_LIBS@ ++@SCIM_BRIDGE_BUILD_GTK2_IMMODULE_TRUE@ -lX11 @GTK2_LIBS@ + + @SCIM_BRIDGE_BUILD_GTK2_IMMODULE_TRUE@im_scim_bridge_la_LIBADD = $(top_srcdir)/common/libscimbridgecommon.la \ + @SCIM_BRIDGE_BUILD_GTK2_IMMODULE_TRUE@ $(top_srcdir)/client-common/libscimbridgeclientcommon.la --- scim-bridge-0.4.16.orig/debian/patches/51_quiet.dpatch +++ scim-bridge-0.4.16/debian/patches/51_quiet.dpatch @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 51_quiet.dpatch by Jonathan Riddell +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fixes 10-20s delay in launching apps when scim-bridge-client(s) installed but scim is not + +@DPATCH@ +diff -urNad scim-bridge-0.4.14~/client-qt/scim-bridge-client-imcontext-qt.cpp scim-bridge-0.4.14/client-qt/scim-bridge-client-imcontext-qt.cpp +--- scim-bridge-0.4.14~client-qt/client-qt/scim-bridge-client-imcontext-qt.cpp 2007-07-07 03:30:10.000000000 +0100 ++++ scim-bridge-0.4.14client-qt/client-qt/scim-bridge-client-imcontext-qt.cpp 2008-09-19 13:24:48.000000000 +0100 +@@ -173,7 +173,7 @@ + #endif + + if (!scim_bridge_client_is_messenger_opened ()) { +- scim_bridge_perrorln ("The messenger is now down"); ++ scim_bridge_pdebugln (1, "The messenger is now down"); + } else if (scim_bridge_client_register_imcontext (this)) { + scim_bridge_perrorln ("Failed to register the IMContext"); + } else { +@@ -189,7 +189,7 @@ + if (this == focused_imcontext) focus_out (); + + if (!scim_bridge_client_is_messenger_opened ()) { +- scim_bridge_perrorln ("The messenger is now down"); ++ scim_bridge_pdebugln (1, "The messenger is now down"); + } else if (scim_bridge_client_deregister_imcontext (this)) { + scim_bridge_perrorln ("Failed to deregister an IMContext"); + } else { --- scim-bridge-0.4.16.orig/debian/patches/00list +++ scim-bridge-0.4.16/debian/patches/00list @@ -0,0 +1,8 @@ +10_gtk-immodule-install-dir.dpatch +20_correct_qt_client_install_dir.dpatch +30_correct_moc.dpatch +40_correct_gtk_client_missing_include.dpatch +50_fix_FTBFS_with_gcc44.dpatch +50_check_scim_binary.dpatch +50_fix_qt4_focus.dpatch +51_quiet.dpatch --- scim-bridge-0.4.16.orig/debian/patches/50_fix_qt4_focus.dpatch +++ scim-bridge-0.4.16/debian/patches/50_fix_qt4_focus.dpatch @@ -0,0 +1,38 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 50_fix_qt4_focus.dpatch by Hou ZhengPeng +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix immodule install dir + +@DPATCH@ + +diff -ruNad scim-bridge-0.4.15/client-qt/scim-bridge-client-imcontext-qt.cpp scim-bridge-0.4.15-work/client-qt/scim-bridge-client-imcontext-qt.cpp +--- scim-bridge-0.4.15/client-qt/scim-bridge-client-imcontext-qt.cpp 2007-07-07 02:30:10.000000000 +0000 ++++ scim-bridge-0.4.15-work/client-qt/scim-bridge-client-imcontext-qt.cpp 2008-09-24 13:32:45.000000000 +0000 +@@ -220,7 +220,12 @@ + { + scim_bridge_pdebugln (4, "ScimBridgeClientIMContextImpl::setFocusWidget ()"); + QInputContext::setFocusWidget (widget); +- focus_in (); ++ if (widget == NULL) { ++ focus_out (); ++ } ++ else { ++ focus_in (); ++ } + update (); + } + +@@ -442,8 +447,10 @@ + } + } + +- set_preedit_shown (false); +- update_preedit (); ++ if (preedit_shown) { ++ set_preedit_shown (false); ++ update_preedit (); ++ } + + focused_imcontext = NULL; + } --- scim-bridge-0.4.16.orig/debian/patches/01_gtk-immodule-install-dir.dpatch +++ scim-bridge-0.4.16/debian/patches/01_gtk-immodule-install-dir.dpatch @@ -0,0 +1,32 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_gtk-immodule-install-dir .dpatch by Hou ZhengPeng +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix immodule install dir + +@DPATCH@ + +diff -ruNad scim-bridge-0.2.4-orig/client-gtk/Makefile.am scim-bridge-0.2.4/client-gtk/Makefile.am +--- scim-bridge-0.2.4-orig/client-gtk/Makefile.am 2006-07-14 01:26:11.000000000 +0800 ++++ scim-bridge-0.2.4/client-gtk/Makefile.am 2006-07-14 01:26:51.000000000 +0800 +@@ -7,7 +7,7 @@ + + noinst_HEADERS = scim-bridge-client-gtk.h scim-bridge-client-imcontext-gtk.h scim-bridge-client-key-event-utility-gtk.h + +-moduledir = @GTK_LIBDIR@/gtk-2.0/immodules ++moduledir = $(GTK_LIBDIR)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules + + module_LTLIBRARIES = im-scim-bridge.la + +diff -ruNad scim-bridge-0.2.4-orig/client-gtk/Makefile.in scim-bridge-0.2.4/client-gtk/Makefile.in +--- scim-bridge-0.2.4-orig/client-gtk/Makefile.in 2006-07-14 01:26:11.000000000 +0800 ++++ scim-bridge-0.2.4/client-gtk/Makefile.in 2006-07-14 01:27:17.000000000 +0800 +@@ -231,7 +231,7 @@ + -I$(top_srcdir)/client-common + + noinst_HEADERS = scim-bridge-client-gtk.h scim-bridge-client-imcontext-gtk.h scim-bridge-client-key-event-utility-gtk.h +-moduledir = @GTK_LIBDIR@/gtk-2.0/immodules ++moduledir = $(GTK_LIBDIR)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules + module_LTLIBRARIES = im-scim-bridge.la + im_scim_bridge_la_SOURCES = im-scim-bridge-gtk.c \ + scim-bridge-client-gtk.c \ --- scim-bridge-0.4.16.orig/debian/patches/20_correct_qt_client_install_dir.dpatch +++ scim-bridge-0.4.16/debian/patches/20_correct_qt_client_install_dir.dpatch @@ -0,0 +1,55 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_correct_qt_client_install_dir.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: + +@DPATCH@ +diff -ruNad scim-bridge-0.4.16.orig/client-qt/qt3/Makefile.am scim-bridge-0.4.16/client-qt/qt3/Makefile.am +--- scim-bridge-0.4.16.orig/client-qt/qt3/Makefile.am 2009-04-28 12:55:13.000000000 +0800 ++++ scim-bridge-0.4.16/client-qt/qt3/Makefile.am 2009-04-28 12:59:56.000000000 +0800 +@@ -24,7 +24,7 @@ + + noinst_HEADERS = ../scim-bridge-client-qt.h ../scim-bridge-client-imcontext-qt.h ../scim-bridge-client-key-event-utility-qt.h ../scim-bridge-client-common-qt.h + +-moduledir = @QT3_PREFIX@/plugins/inputmethods ++moduledir = /usr/lib/qt3/plugins/inputmethods + module_LTLIBRARIES = im-scim-bridge.la + + im_scim_bridge_la_SOURCES = ../im-scim-bridge-qt.cpp \ +diff -ruNad scim-bridge-0.4.16.orig/client-qt/qt3/Makefile.in scim-bridge-0.4.16/client-qt/qt3/Makefile.in +--- scim-bridge-0.4.16.orig/client-qt/qt3/Makefile.in 2009-04-28 12:55:13.000000000 +0800 ++++ scim-bridge-0.4.16/client-qt/qt3/Makefile.in 2009-04-28 13:01:52.000000000 +0800 +@@ -243,7 +243,7 @@ + @SCIM_BRIDGE_BUILD_QT3_IMMODULE_TRUE@ -I$(top_srcdir)/client-common + + @SCIM_BRIDGE_BUILD_QT3_IMMODULE_TRUE@noinst_HEADERS = ../scim-bridge-client-qt.h ../scim-bridge-client-imcontext-qt.h ../scim-bridge-client-key-event-utility-qt.h ../scim-bridge-client-common-qt.h +-@SCIM_BRIDGE_BUILD_QT3_IMMODULE_TRUE@moduledir = @QT3_PREFIX@/plugins/inputmethods ++@SCIM_BRIDGE_BUILD_QT3_IMMODULE_TRUE@moduledir = /usr/lib/qt3/plugins/inputmethods + @SCIM_BRIDGE_BUILD_QT3_IMMODULE_TRUE@module_LTLIBRARIES = im-scim-bridge.la + @SCIM_BRIDGE_BUILD_QT3_IMMODULE_TRUE@im_scim_bridge_la_SOURCES = ../im-scim-bridge-qt.cpp \ + @SCIM_BRIDGE_BUILD_QT3_IMMODULE_TRUE@ ../scim-bridge-client-qt.cpp \ +diff -ruNad scim-bridge-0.4.16.orig/client-qt/qt4/Makefile.am scim-bridge-0.4.16/client-qt/qt4/Makefile.am +--- scim-bridge-0.4.16.orig/client-qt/qt4/Makefile.am 2009-04-28 12:55:13.000000000 +0800 ++++ scim-bridge-0.4.16/client-qt/qt4/Makefile.am 2009-04-28 13:02:23.000000000 +0800 +@@ -24,7 +24,7 @@ + + noinst_HEADERS = ../scim-bridge-client-qt.h ../scim-bridge-client-imcontext-qt.h ../scim-bridge-client-key-event-utility-qt.h ../scim-bridge-client-common-qt.h + +-moduledir = @QT4_PREFIX@/plugins/inputmethods ++moduledir = /usr/lib/qt4/plugins/inputmethods + module_LTLIBRARIES = im-scim-bridge.la + + im_scim_bridge_la_SOURCES = ../im-scim-bridge-qt.cpp \ +diff -ruNad scim-bridge-0.4.16.orig/client-qt/qt4/Makefile.in scim-bridge-0.4.16/client-qt/qt4/Makefile.in +--- scim-bridge-0.4.16.orig/client-qt/qt4/Makefile.in 2009-04-28 12:55:13.000000000 +0800 ++++ scim-bridge-0.4.16/client-qt/qt4/Makefile.in 2009-04-28 13:02:50.000000000 +0800 +@@ -243,7 +243,7 @@ + @SCIM_BRIDGE_BUILD_QT4_IMMODULE_TRUE@ -I$(top_srcdir)/client-common + + @SCIM_BRIDGE_BUILD_QT4_IMMODULE_TRUE@noinst_HEADERS = ../scim-bridge-client-qt.h ../scim-bridge-client-imcontext-qt.h ../scim-bridge-client-key-event-utility-qt.h ../scim-bridge-client-common-qt.h +-@SCIM_BRIDGE_BUILD_QT4_IMMODULE_TRUE@moduledir = @QT4_PREFIX@/plugins/inputmethods ++@SCIM_BRIDGE_BUILD_QT4_IMMODULE_TRUE@moduledir = /usr/lib/qt4/plugins/inputmethods + @SCIM_BRIDGE_BUILD_QT4_IMMODULE_TRUE@module_LTLIBRARIES = im-scim-bridge.la + @SCIM_BRIDGE_BUILD_QT4_IMMODULE_TRUE@im_scim_bridge_la_SOURCES = ../im-scim-bridge-qt.cpp \ + @SCIM_BRIDGE_BUILD_QT4_IMMODULE_TRUE@ ../scim-bridge-client-qt.cpp \ --- scim-bridge-0.4.16.orig/debian/patches/10_gtk-immodule-install-dir.dpatch +++ scim-bridge-0.4.16/debian/patches/10_gtk-immodule-install-dir.dpatch @@ -0,0 +1,32 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_gtk-immodule-install-dir .dpatch by Hou ZhengPeng +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix immodule install dir + +@DPATCH@ + +diff -ruNad scim-bridge-0.4.16.orig/client-gtk/Makefile.am scim-bridge-0.4.16/client-gtk/Makefile.am +--- scim-bridge-0.4.16.orig/client-gtk/Makefile.am 2009-04-28 12:55:13.000000000 +0800 ++++ scim-bridge-0.4.16/client-gtk/Makefile.am 2009-04-28 12:55:41.000000000 +0800 +@@ -24,7 +24,7 @@ + + noinst_HEADERS = scim-bridge-client-gtk.h scim-bridge-client-imcontext-gtk.h scim-bridge-client-key-event-utility-gtk.h + +-moduledir = @GTK_LIBDIR@/gtk-2.0/immodules ++moduledir = $(GTK_LIBDIR)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules + + module_LTLIBRARIES = im-scim-bridge.la + +diff -ruNad scim-bridge-0.4.16.orig/client-gtk/Makefile.in scim-bridge-0.4.16/client-gtk/Makefile.in +--- scim-bridge-0.4.16.orig/client-gtk/Makefile.in 2009-04-28 12:55:13.000000000 +0800 ++++ scim-bridge-0.4.16/client-gtk/Makefile.in 2009-04-28 12:56:11.000000000 +0800 +@@ -239,7 +239,7 @@ + @SCIM_BRIDGE_BUILD_GTK2_IMMODULE_TRUE@ -I$(top_srcdir)/client-common + + @SCIM_BRIDGE_BUILD_GTK2_IMMODULE_TRUE@noinst_HEADERS = scim-bridge-client-gtk.h scim-bridge-client-imcontext-gtk.h scim-bridge-client-key-event-utility-gtk.h +-@SCIM_BRIDGE_BUILD_GTK2_IMMODULE_TRUE@moduledir = @GTK_LIBDIR@/gtk-2.0/immodules ++@SCIM_BRIDGE_BUILD_GTK2_IMMODULE_TRUE@moduledir = $(GTK_LIBDIR)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules + @SCIM_BRIDGE_BUILD_GTK2_IMMODULE_TRUE@module_LTLIBRARIES = im-scim-bridge.la + @SCIM_BRIDGE_BUILD_GTK2_IMMODULE_TRUE@im_scim_bridge_la_SOURCES = im-scim-bridge-gtk.c \ + @SCIM_BRIDGE_BUILD_GTK2_IMMODULE_TRUE@ scim-bridge-client-gtk.c \ --- scim-bridge-0.4.16.orig/debian/patches/50_fix_FTBFS_with_gcc44.dpatch +++ scim-bridge-0.4.16/debian/patches/50_fix_FTBFS_with_gcc44.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 50_fix_FTBFS_with_gcc44.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: + +@DPATCH@ +diff -ruNad scim-bridge-0.4.16.orig/agent/scim-bridge-agent-application.cpp scim-bridge-0.4.16/agent/scim-bridge-agent-application.cpp +--- scim-bridge-0.4.16.orig/agent/scim-bridge-agent-application.cpp 2009-04-28 04:55:13.000000000 +0000 ++++ scim-bridge-0.4.16/agent/scim-bridge-agent-application.cpp 2009-05-03 14:40:50.000000000 +0000 +@@ -22,7 +22,7 @@ + #include + #include + #include +- ++#include + #include + + #include "scim-bridge-agent.h" --- scim-bridge-0.4.16.orig/debian/patches/30_correct_moc.dpatch +++ scim-bridge-0.4.16/debian/patches/30_correct_moc.dpatch @@ -0,0 +1,55 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_correct_moc.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: + +@DPATCH@ +diff -ruNad scim-bridge-0.4.16.orig/client-qt/qt3/Makefile.am scim-bridge-0.4.16/client-qt/qt3/Makefile.am +--- scim-bridge-0.4.16.orig/client-qt/qt3/Makefile.am 2009-04-28 12:55:13.000000000 +0800 ++++ scim-bridge-0.4.16/client-qt/qt3/Makefile.am 2009-04-28 13:07:15.000000000 +0800 +@@ -44,7 +44,7 @@ + im_scim_bridge_la_LIBADD = $(top_srcdir)/common/libscimbridgecommon.la \ + $(top_srcdir)/client-common/libscimbridgeclientcommon.la + +-MOC = @QT3_PREFIX@/bin/moc ++MOC = /usr/bin/moc-qt3 + + moc_scim-bridge-client-qt.cpp: ../scim-bridge-client-qt.h + $(MOC) $< -o $@ +diff -ruNad scim-bridge-0.4.16.orig/client-qt/qt3/Makefile.in scim-bridge-0.4.16/client-qt/qt3/Makefile.in +--- scim-bridge-0.4.16.orig/client-qt/qt3/Makefile.in 2009-04-28 12:55:13.000000000 +0800 ++++ scim-bridge-0.4.16/client-qt/qt3/Makefile.in 2009-04-28 13:07:43.000000000 +0800 +@@ -261,7 +261,7 @@ + @SCIM_BRIDGE_BUILD_QT3_IMMODULE_TRUE@im_scim_bridge_la_LIBADD = $(top_srcdir)/common/libscimbridgecommon.la \ + @SCIM_BRIDGE_BUILD_QT3_IMMODULE_TRUE@ $(top_srcdir)/client-common/libscimbridgeclientcommon.la + +-@SCIM_BRIDGE_BUILD_QT3_IMMODULE_TRUE@MOC = @QT3_PREFIX@/bin/moc ++@SCIM_BRIDGE_BUILD_QT3_IMMODULE_TRUE@MOC = /usr/bin/moc-qt3 + MAINTAINERCLEANFILES = Makefile.in + CLEANFILES = moc_scim-bridge-client-qt.cpp + all: all-am +diff -ruNad scim-bridge-0.4.16.orig/client-qt/qt4/Makefile.am scim-bridge-0.4.16/client-qt/qt4/Makefile.am +--- scim-bridge-0.4.16.orig/client-qt/qt4/Makefile.am 2009-04-28 12:55:13.000000000 +0800 ++++ scim-bridge-0.4.16/client-qt/qt4/Makefile.am 2009-04-28 13:06:01.000000000 +0800 +@@ -44,7 +44,7 @@ + im_scim_bridge_la_LIBADD = $(top_srcdir)/common/libscimbridgecommon.la \ + $(top_srcdir)/client-common/libscimbridgeclientcommon.la + +-MOC = @QT4_PREFIX@/bin/moc ++MOC = /usr/bin/moc-qt4 + + moc_scim-bridge-client-qt.cpp: ../scim-bridge-client-qt.h + $(MOC) $< -o $@ +diff -ruNad scim-bridge-0.4.16.orig/client-qt/qt4/Makefile.in scim-bridge-0.4.16/client-qt/qt4/Makefile.in +--- scim-bridge-0.4.16.orig/client-qt/qt4/Makefile.in 2009-04-28 12:55:13.000000000 +0800 ++++ scim-bridge-0.4.16/client-qt/qt4/Makefile.in 2009-04-28 13:06:47.000000000 +0800 +@@ -261,7 +261,7 @@ + @SCIM_BRIDGE_BUILD_QT4_IMMODULE_TRUE@im_scim_bridge_la_LIBADD = $(top_srcdir)/common/libscimbridgecommon.la \ + @SCIM_BRIDGE_BUILD_QT4_IMMODULE_TRUE@ $(top_srcdir)/client-common/libscimbridgeclientcommon.la + +-@SCIM_BRIDGE_BUILD_QT4_IMMODULE_TRUE@MOC = @QT4_PREFIX@/bin/moc ++@SCIM_BRIDGE_BUILD_QT4_IMMODULE_TRUE@MOC = /usr/bin/moc-qt4 + MAINTAINERCLEANFILES = Makefile.in + CLEANFILES = moc_scim-bridge-client-qt.cpp + all: all-am --- scim-bridge-0.4.16.orig/debian/patches/50_check_scim_binary.dpatch +++ scim-bridge-0.4.16/debian/patches/50_check_scim_binary.dpatch @@ -0,0 +1,25 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 50_check_scim_binary.dpatch by , +## Zhengpeng Hou , Arne Goetje , +## and Colin Watson +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fixes 10-20s delay in launching apps when scim-bridge-client(s) installed but scim is not running + +@DPATCH@ +diff -urNad scim-bridge-0.4.16-2ubuntu1~/client-common/scim-bridge-client.c scim-bridge-0.4.16-2ubuntu1/client-common/scim-bridge-client.c +--- scim-bridge-0.4.16-2ubuntu1~/client-common/scim-bridge-client.c 2009-06-25 21:54:26.000000000 +0100 ++++ scim-bridge-0.4.16-2ubuntu1/client-common/scim-bridge-client.c 2009-06-25 21:54:36.000000000 +0100 +@@ -1039,6 +1039,12 @@ + return RETVAL_FAILED; + } + ++ /* This is a quick fix. "pidof scim-helper-manager >/dev/null" should probably be defined somewhere instead of coded like below - RG */ ++ if (system ("pidof scim-helper-manager >/dev/null") != 0) { ++ scim_bridge_pdebugln (8, "There is no scim-helper-manager binary running"); ++ return RETVAL_FAILED; ++ } ++ + int i; + for (i = 0; i < 10; ++i) { + int socket_fd = socket (PF_UNIX, SOCK_STREAM, 0); --- scim-bridge-0.4.16.orig/debian/im-switch/scim-bridge +++ scim-bridge-0.4.16/debian/im-switch/scim-bridge @@ -0,0 +1,22 @@ +XIM=SCIM +if [ -e /usr/bin/skim ]; then + XIM_PROGRAM=" " +else + XIM_PROGRAM=/usr/bin/scim +fi +XIM_ARGS="-d" +if [ -e /usr/lib/gtk-2.0/*/immodules/im-scim-bridge.so ]; then + GTK_IM_MODULE=scim-bridge +else + GTK_IM_MODULE=xim +fi +if [ -e /usr/lib/qt4/plugins/inputmethods/im-scim-bridge.so ]; then + QT_IM_MODULE=scim-bridge +elif [ -e /usr/lib/qt3/plugins/inputmethods/im-scim-bridge.so ]; then + QT_IM_MODULE=scim-bridge +else + QT_IM_MODULE=xim +fi + +DEPENDS="scim | skim, scim-bridge-agent, scim-bridge-client-gtk | scim-bridge-client-qt" +