--- Begin Message ---
Package: ibus
Version: 1.4.0-2
Severity: normal
Tags: patch
Hello!
This patch provides full Multi-Arch support for ibus and the libraries and
plugins it ships.
Thanks!
-Kees
--
Kees Cook @debian.org
diff -Nru ibus-1.4.0/debian/changelog ibus-1.4.0/debian/changelog
--- ibus-1.4.0/debian/changelog 2011-12-07 06:39:11.000000000 -0800
+++ ibus-1.4.0/debian/changelog 2011-12-08 18:26:34.000000000 -0800
@@ -1,3 +1,15 @@
+ibus (1.4.0-3) UNRELEASED; urgency=low
+
+ * debian/{control,*.install}: Convert to Multi-Arch.
+ * debian/patches/use_pkglibexec.patch: modify upstream build to use
+ pkglibexec instead of libexec, since this provides the ibus/
+ subdirectory.
+ * debian/xinput/ibus: adjust detection script for plugin locations.
+ * proper-gtk-plugin-path.patch: adjust to leave gtk3 where it thinks
+ it should be.
+
+ -- Kees Cook <[email protected]> Thu, 08 Dec 2011 17:26:22 -0800
+
ibus (1.4.0-2) unstable; urgency=low
* Fix "The xim doesn't work; the location to install gtk im modules
diff -Nru ibus-1.4.0/debian/compat ibus-1.4.0/debian/compat
--- ibus-1.4.0/debian/compat 2011-12-07 05:29:37.000000000 -0800
+++ ibus-1.4.0/debian/compat 2011-12-08 17:24:37.000000000 -0800
@@ -1 +1 @@
-7
+9
diff -Nru ibus-1.4.0/debian/control ibus-1.4.0/debian/control
--- ibus-1.4.0/debian/control 2011-12-07 06:35:38.000000000 -0800
+++ ibus-1.4.0/debian/control 2011-12-08 18:16:35.000000000 -0800
@@ -7,7 +7,7 @@
Zhengpeng Hou <[email protected]>,
Asias He <[email protected]>,
Osamu Aoki <[email protected]>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 8.1.3~),
autotools-dev,
autoconf,
automake,
@@ -47,6 +47,8 @@
Package: libibus-1.0-0
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Intelligent Input Bus - shared library
IBus is an Intelligent Input Bus. It is a new input framework for the Linux
@@ -58,6 +60,7 @@
Package: libibus-1.0-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends: libibus-1.0-0 (= ${binary:Version}), libglib2.0-dev, libdbus-1-dev,
${shlibs:Depends}, ${misc:Depends}
Replaces: libibus-dev
Description: Intelligent Input Bus - development file
@@ -81,6 +84,7 @@
Package: ibus-gtk3
Architecture: any
+Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Intelligent Input Bus - GTK+3 support
IBus is an Intelligent Input Bus. It is a new input framework for the Linux
diff -Nru ibus-1.4.0/debian/ibus-gtk3.install
ibus-1.4.0/debian/ibus-gtk3.install
--- ibus-1.4.0/debian/ibus-gtk3.install 2011-12-07 05:29:37.000000000 -0800
+++ ibus-1.4.0/debian/ibus-gtk3.install 2011-12-08 18:28:56.000000000 -0800
@@ -1 +1 @@
-usr/lib/gtk-3.0/3.0.0/immodules/im-ibus.so
+usr/lib/*/gtk-3.0/3.0.0/immodules/im-ibus.so
diff -Nru ibus-1.4.0/debian/ibus.install ibus-1.4.0/debian/ibus.install
--- ibus-1.4.0/debian/ibus.install 2011-12-07 05:29:37.000000000 -0800
+++ ibus-1.4.0/debian/ibus.install 2011-12-08 17:32:35.000000000 -0800
@@ -1,6 +1,6 @@
debian/tmp/etc/gconf/schemas/*
debian/tmp/usr/bin/*
-debian/tmp/usr/lib/ibus/*
+debian/tmp/usr/lib/*/ibus/*
debian/xinput/* etc/X11/xinit/xinput.d
debian/tmp/usr/share/applications/*
debian/tmp/usr/share/ibus/*
diff -Nru ibus-1.4.0/debian/libibus-1.0-0.install
ibus-1.4.0/debian/libibus-1.0-0.install
--- ibus-1.4.0/debian/libibus-1.0-0.install 2011-12-07 05:29:37.000000000
-0800
+++ ibus-1.4.0/debian/libibus-1.0-0.install 2011-12-08 17:25:41.000000000
-0800
@@ -1 +1 @@
-debian/tmp/usr/lib/libibus-1.0.so.*
+debian/tmp/usr/lib/*/libibus-1.0.so.*
diff -Nru ibus-1.4.0/debian/libibus-1.0-dev.install
ibus-1.4.0/debian/libibus-1.0-dev.install
--- ibus-1.4.0/debian/libibus-1.0-dev.install 2011-12-07 05:29:37.000000000
-0800
+++ ibus-1.4.0/debian/libibus-1.0-dev.install 2011-12-08 17:25:54.000000000
-0800
@@ -1,5 +1,5 @@
debian/tmp/usr/include/*
-debian/tmp/usr/lib/libibus-1.0.so
-debian/tmp/usr/lib/libibus-1.0.a
-debian/tmp/usr/lib/pkgconfig/*
+debian/tmp/usr/lib/*/libibus-1.0.so
+debian/tmp/usr/lib/*/libibus-1.0.a
+debian/tmp/usr/lib/*/pkgconfig/*
debian/tmp/usr/share/vala/*
diff -Nru ibus-1.4.0/debian/patches/proper-gtk-plugin-path.patch
ibus-1.4.0/debian/patches/proper-gtk-plugin-path.patch
--- ibus-1.4.0/debian/patches/proper-gtk-plugin-path.patch 2011-12-07
05:29:37.000000000 -0800
+++ ibus-1.4.0/debian/patches/proper-gtk-plugin-path.patch 2011-12-08
18:25:42.000000000 -0800
@@ -1,7 +1,7 @@
-Index: trunk/configure.ac
+Index: ibus-1.4.0/configure.ac
===================================================================
---- trunk.orig/configure.ac
-+++ trunk/configure.ac
+--- ibus-1.4.0.orig/configure.ac 2011-12-08 18:09:52.752499052 -0800
++++ ibus-1.4.0/configure.ac 2011-12-08 18:25:24.484738739 -0800
@@ -186,7 +186,8 @@
if test x"$enable_gtk2" = x"yes"; then
# check for gdk2
@@ -12,10 +12,20 @@
PKG_CHECK_MODULES(GDK2, [
gdk-2.0
-Index: trunk/configure
+@@ -202,7 +203,8 @@
+ ])
+
+ gtk3_binary_version=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`
+- GTK3_IM_MODULEDIR="$libdir"/gtk-3.0/$gtk3_binary_version/immodules
++ gtk3_libdir=`$PKG_CONFIG --variable=libdir gtk+-3.0`
++ GTK3_IM_MODULEDIR="$gtk3_libdir"/gtk-3.0/$gtk3_binary_version/immodules
+
+ PKG_CHECK_MODULES(GDK3, [
+ gdk-3.0
+Index: ibus-1.4.0/configure
===================================================================
---- trunk.orig/configure
-+++ trunk/configure
+--- ibus-1.4.0.orig/configure 2011-12-08 18:09:52.740498894 -0800
++++ ibus-1.4.0/configure 2011-12-08 18:25:40.144945175 -0800
@@ -15207,7 +15207,8 @@
if test x"$enable_gtk2" = x"yes"; then
# check for gdk2
@@ -26,3 +36,13 @@
pkg_failed=no
+@@ -15435,7 +15436,8 @@
+ fi
+
+ gtk3_binary_version=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`
+- GTK3_IM_MODULEDIR="$libdir"/gtk-3.0/$gtk3_binary_version/immodules
++ gtk3_libdir=`$PKG_CONFIG --variable=libdir gtk+-3.0`
++ GTK3_IM_MODULEDIR="$gtk3_libdir"/gtk-3.0/$gtk3_binary_version/immodules
+
+
+ pkg_failed=no
diff -Nru ibus-1.4.0/debian/patches/series ibus-1.4.0/debian/patches/series
--- ibus-1.4.0/debian/patches/series 2011-12-07 05:29:37.000000000 -0800
+++ ibus-1.4.0/debian/patches/series 2011-12-08 17:45:26.000000000 -0800
@@ -1 +1,2 @@
proper-gtk-plugin-path.patch
+use_pkglibexec.patch
diff -Nru ibus-1.4.0/debian/patches/use_pkglibexec.patch
ibus-1.4.0/debian/patches/use_pkglibexec.patch
--- ibus-1.4.0/debian/patches/use_pkglibexec.patch 1969-12-31
16:00:00.000000000 -0800
+++ ibus-1.4.0/debian/patches/use_pkglibexec.patch 2011-12-08
18:01:06.000000000 -0800
@@ -0,0 +1,506 @@
+Description: The upstream build was not expecting the triplet in the
+ libexec directory, so the pkglibexec directory wasn't being used for
+ executables when moving libdir for Multi-Arch.
+Author: Kees Cook <[email protected]>
+
+Index: ibus-1.4.0/ui/gtk/Makefile.am
+===================================================================
+--- ibus-1.4.0.orig/ui/gtk/Makefile.am 2011-12-08 17:45:38.641359149 -0800
++++ ibus-1.4.0/ui/gtk/Makefile.am 2011-12-08 17:51:22.221922487 -0800
+@@ -36,7 +36,7 @@
+ $(NULL)
+ ui_gtkdir = $(pkgdatadir)/ui/gtk
+
+-libexec_SCRIPTS = \
++pkglibexec_SCRIPTS = \
+ ibus-ui-gtk \
+ $(NULL)
+
+@@ -58,7 +58,7 @@
+ gtkpanel.xml: gtkpanel.xml.in
+ $(AM_V_GEN) \
+ ( \
+- libexecdir=${libexecdir}; \
++ pkglibexecdir=${pkglibexecdir}; \
+ s=`cat $<`; \
+ eval "echo \"$${s}\""; \
+ ) > $@
+Index: ibus-1.4.0/ui/gtk/Makefile.in
+===================================================================
+--- ibus-1.4.0.orig/ui/gtk/Makefile.in 2011-12-08 17:45:38.657359362 -0800
++++ ibus-1.4.0/ui/gtk/Makefile.in 2011-12-08 17:55:02.120808814 -0800
+@@ -94,9 +94,9 @@
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+-am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(ui_gtkdir)" \
+- "$(DESTDIR)$(componentdir)"
+-SCRIPTS = $(libexec_SCRIPTS)
++am__installdirs = "$(DESTDIR)$(pkglibexecdir)" \
++ "$(DESTDIR)$(ui_gtkdir)" "$(DESTDIR)$(componentdir)"
++SCRIPTS = $(pkglibexec_SCRIPTS)
+ AM_V_GEN = $(am__v_GEN_$(V))
+ am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+ am__v_GEN_0 = @echo " GEN " $@;
+@@ -346,7 +346,7 @@
+ $(NULL)
+
+ ui_gtkdir = $(pkgdatadir)/ui/gtk
+-libexec_SCRIPTS = \
++pkglibexec_SCRIPTS = \
+ ibus-ui-gtk \
+ $(NULL)
+
+@@ -402,10 +402,10 @@
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ gtkpanel.xml.in: $(top_builddir)/config.status $(srcdir)/gtkpanel.xml.in.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+-install-libexecSCRIPTS: $(libexec_SCRIPTS)
++install-pkglibexecSCRIPTS: $(pkglibexec_SCRIPTS)
+ @$(NORMAL_INSTALL)
+- test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
+- @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || list=; \
++ test -z "$(pkglibexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibexecdir)"
++ @list='$(pkglibexec_SCRIPTS)'; test -n "$(pkglibexecdir)" || list=; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+@@ -423,19 +423,19 @@
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+- echo " $(INSTALL_SCRIPT) $$files
'$(DESTDIR)$(libexecdir)$$dir'"; \
+- $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit
$$?; \
++ echo " $(INSTALL_SCRIPT) $$files
'$(DESTDIR)$(pkglibexecdir)$$dir'"; \
++ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(pkglibexecdir)$$dir" ||
exit $$?; \
+ } \
+ ; done
+
+-uninstall-libexecSCRIPTS:
++uninstall-pkglibexecSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+- @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || exit 0; \
++ @list='$(pkglibexec_SCRIPTS)'; test -n "$(pkglibexecdir)" || exit 0; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 's,.*/,,;$(transform)'`; \
+ test -n "$$list" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
++ echo " ( cd '$(DESTDIR)$(pkglibexecdir)' && rm -f" $$files ")"; \
++ cd "$(DESTDIR)$(pkglibexecdir)" && rm -f $$files
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -541,7 +541,7 @@
+ check: check-am
+ all-am: Makefile $(SCRIPTS) $(DATA)
+ installdirs:
+- for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(ui_gtkdir)"
"$(DESTDIR)$(componentdir)"; do \
++ for dir in "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(ui_gtkdir)"
"$(DESTDIR)$(componentdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: install-am
+@@ -596,7 +596,7 @@
+
+ install-dvi-am:
+
+-install-exec-am: install-libexecSCRIPTS
++install-exec-am: install-pkglibexecSCRIPTS
+
+ install-html: install-html-am
+
+@@ -634,7 +634,7 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-componentDATA uninstall-libexecSCRIPTS \
++uninstall-am: uninstall-componentDATA uninstall-pkglibexecSCRIPTS \
+ uninstall-ui_gtkPYTHON
+
+ .MAKE: install-am install-strip
+@@ -644,20 +644,20 @@
+ dvi-am html html-am info info-am install install-am \
+ install-componentDATA install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-info install-info-am \
+- install-libexecSCRIPTS install-man install-pdf install-pdf-am \
++ install-html-am install-info install-info-am install-man \
++ install-pdf install-pdf-am install-pkglibexecSCRIPTS \
+ install-ps install-ps-am install-strip install-ui_gtkPYTHON \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+- uninstall-componentDATA uninstall-libexecSCRIPTS \
++ uninstall-componentDATA uninstall-pkglibexecSCRIPTS \
+ uninstall-ui_gtkPYTHON
+
+
+ gtkpanel.xml: gtkpanel.xml.in
+ $(AM_V_GEN) \
+ ( \
+- libexecdir=${libexecdir}; \
++ pkglibexecdir=${pkglibexecdir}; \
+ s=`cat $<`; \
+ eval "echo \"$${s}\""; \
+ ) > $@
+Index: ibus-1.4.0/gconf/Makefile.am
+===================================================================
+--- ibus-1.4.0.orig/gconf/Makefile.am 2011-12-08 17:49:33.492484522 -0800
++++ ibus-1.4.0/gconf/Makefile.am 2011-12-08 17:50:48.965485988 -0800
+@@ -22,7 +22,7 @@
+
+ libibus = $(top_builddir)/src/libibus-@[email protected]
+
+-libexec_PROGRAMS = \
++pkglibexec_PROGRAMS = \
+ ibus-gconf \
+ $(NULL)
+
+@@ -68,7 +68,7 @@
+ gconf.xml: gconf.xml.in
+ $(AM_V_GEN) \
+ ( \
+- libexecdir=${libexecdir}; \
++ pkglibexecdir=${pkglibexecdir}; \
+ s=`cat $<`; \
+ eval "echo \"$${s}\""; \
+ ) > $@
+Index: ibus-1.4.0/gconf/Makefile.in
+===================================================================
+--- ibus-1.4.0.orig/gconf/Makefile.in 2011-12-08 17:49:33.512484788 -0800
++++ ibus-1.4.0/gconf/Makefile.in 2011-12-08 17:55:01.484800466 -0800
+@@ -57,7 +57,7 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-libexec_PROGRAMS = ibus-gconf$(EXEEXT)
++pkglibexec_PROGRAMS = ibus-gconf$(EXEEXT)
+ subdir = gconf
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(srcdir)/gconf.xml.in.in
+@@ -73,9 +73,9 @@
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES = gconf.xml.in
+ CONFIG_CLEAN_VPATH_FILES =
+-am__installdirs = "$(DESTDIR)$(libexecdir)" \
++am__installdirs = "$(DESTDIR)$(pkglibexecdir)" \
+ "$(DESTDIR)$(componentdir)"
+-PROGRAMS = $(libexec_PROGRAMS)
++PROGRAMS = $(pkglibexec_PROGRAMS)
+ am_ibus_gconf_OBJECTS = ibus_gconf-main.$(OBJEXT) \
+ ibus_gconf-config.$(OBJEXT)
+ ibus_gconf_OBJECTS = $(am_ibus_gconf_OBJECTS)
+@@ -438,10 +438,10 @@
+ $(am__aclocal_m4_deps):
+ gconf.xml.in: $(top_builddir)/config.status $(srcdir)/gconf.xml.in.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+-install-libexecPROGRAMS: $(libexec_PROGRAMS)
++install-pkglibexecPROGRAMS: $(pkglibexec_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
+- @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
++ test -z "$(pkglibexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibexecdir)"
++ @list='$(pkglibexec_PROGRAMS)'; test -n "$(pkglibexecdir)" || list=; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p || test -f $$p1; \
+@@ -458,23 +458,23 @@
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files
'$(DESTDIR)$(libexecdir)$$dir'"; \
+- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files
"$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files
'$(DESTDIR)$(pkglibexecdir)$$dir'"; \
++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files
"$(DESTDIR)$(pkglibexecdir)$$dir" || exit $$?; \
+ } \
+ ; done
+
+-uninstall-libexecPROGRAMS:
++uninstall-pkglibexecPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+- @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
++ @list='$(pkglibexec_PROGRAMS)'; test -n "$(pkglibexecdir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+ -e 's/$$/$(EXEEXT)/' `; \
+ test -n "$$list" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
++ echo " ( cd '$(DESTDIR)$(pkglibexecdir)' && rm -f" $$files ")"; \
++ cd "$(DESTDIR)$(pkglibexecdir)" && rm -f $$files
+
+-clean-libexecPROGRAMS:
+- @list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
++clean-pkglibexecPROGRAMS:
++ @list='$(pkglibexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+ echo " rm -f" $$list; \
+ rm -f $$list || exit $$?; \
+ test -n "$(EXEEXT)" || exit 0; \
+@@ -662,7 +662,7 @@
+ check: check-am
+ all-am: Makefile $(PROGRAMS) $(DATA)
+ installdirs:
+- for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(componentdir)"; do \
++ for dir in "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(componentdir)"; do
\
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: install-am
+@@ -693,7 +693,7 @@
+ @echo "it deletes files that may require special tools to rebuild."
+ clean: clean-am
+
+-clean-am: clean-generic clean-libexecPROGRAMS clean-libtool \
++clean-am: clean-generic clean-libtool clean-pkglibexecPROGRAMS \
+ mostlyclean-am
+
+ distclean: distclean-am
+@@ -720,7 +720,7 @@
+
+ install-dvi-am:
+
+-install-exec-am: install-libexecPROGRAMS
++install-exec-am: install-pkglibexecPROGRAMS
+
+ install-html: install-html-am
+
+@@ -760,30 +760,30 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-componentDATA uninstall-libexecPROGRAMS
++uninstall-am: uninstall-componentDATA uninstall-pkglibexecPROGRAMS
+
+ .MAKE: install-am install-strip
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libexecPROGRAMS clean-libtool ctags distclean \
++ clean-libtool clean-pkglibexecPROGRAMS ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-componentDATA install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+- install-info-am install-libexecPROGRAMS install-man \
+- install-pdf install-pdf-am install-ps install-ps-am \
++ install-info-am install-man install-pdf install-pdf-am \
++ install-pkglibexecPROGRAMS install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags uninstall uninstall-am \
+- uninstall-componentDATA uninstall-libexecPROGRAMS
++ uninstall-componentDATA uninstall-pkglibexecPROGRAMS
+
+
+ gconf.xml: gconf.xml.in
+ $(AM_V_GEN) \
+ ( \
+- libexecdir=${libexecdir}; \
++ pkglibexecdir=${pkglibexecdir}; \
+ s=`cat $<`; \
+ eval "echo \"$${s}\""; \
+ ) > $@
+Index: ibus-1.4.0/gconf/gconf.xml.in
+===================================================================
+--- ibus-1.4.0.orig/gconf/gconf.xml.in.in 2011-12-08 17:50:26.301186988
-0800
++++ ibus-1.4.0/gconf/gconf.xml.in.in 2011-12-08 17:50:32.201265464 -0800
+@@ -3,7 +3,7 @@
+ <component>
+ <name>org.freedesktop.IBus.Config</name>
+ <description>GConf Config Component</description>
+- <exec>${libexecdir}/ibus-gconf</exec>
++ <exec>${pkglibexecdir}/ibus-gconf</exec>
+ <version>@VERSION@</version>
+ <author>Peng Huang <[email protected]></author>
+ <license>GPL</license>
+Index: ibus-1.4.0/client/x11/Makefile.am
+===================================================================
+--- ibus-1.4.0.orig/client/x11/Makefile.am 2011-12-08 17:52:05.962496600
-0800
++++ ibus-1.4.0/client/x11/Makefile.am 2011-12-08 17:52:48.859059640 -0800
+@@ -24,7 +24,7 @@
+ libIMdkit = $(top_builddir)/util/IMdkit/libIMdkit.la
+ libibus = $(top_builddir)/src/libibus-@[email protected]
+
+-libexec_PROGRAMS = ibus-x11
++pkglibexec_PROGRAMS = ibus-x11
+
+ ibus_x11_SOURCES = \
+ main.c \
+Index: ibus-1.4.0/client/x11/Makefile.in
+===================================================================
+--- ibus-1.4.0.orig/client/x11/Makefile.in 2011-12-08 17:52:05.982496862
-0800
++++ ibus-1.4.0/client/x11/Makefile.in 2011-12-08 17:55:00.876792486 -0800
+@@ -57,7 +57,7 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-libexec_PROGRAMS = ibus-x11$(EXEEXT)
++pkglibexec_PROGRAMS = ibus-x11$(EXEEXT)
+ subdir = client/x11
+ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in
+@@ -73,8 +73,8 @@
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+-am__installdirs = "$(DESTDIR)$(libexecdir)"
+-PROGRAMS = $(libexec_PROGRAMS)
++am__installdirs = "$(DESTDIR)$(pkglibexecdir)"
++PROGRAMS = $(pkglibexec_PROGRAMS)
+ am_ibus_x11_OBJECTS = ibus_x11-main.$(OBJEXT) \
+ ibus_x11-gdk-private.$(OBJEXT)
+ ibus_x11_OBJECTS = $(am_ibus_x11_OBJECTS)
+@@ -405,10 +405,10 @@
+ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ $(am__aclocal_m4_deps):
+-install-libexecPROGRAMS: $(libexec_PROGRAMS)
++install-pkglibexecPROGRAMS: $(pkglibexec_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
+- @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
++ test -z "$(pkglibexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibexecdir)"
++ @list='$(pkglibexec_PROGRAMS)'; test -n "$(pkglibexecdir)" || list=; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p || test -f $$p1; \
+@@ -425,23 +425,23 @@
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files
'$(DESTDIR)$(libexecdir)$$dir'"; \
+- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files
"$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files
'$(DESTDIR)$(pkglibexecdir)$$dir'"; \
++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files
"$(DESTDIR)$(pkglibexecdir)$$dir" || exit $$?; \
+ } \
+ ; done
+
+-uninstall-libexecPROGRAMS:
++uninstall-pkglibexecPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+- @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
++ @list='$(pkglibexec_PROGRAMS)'; test -n "$(pkglibexecdir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+ -e 's/$$/$(EXEEXT)/' `; \
+ test -n "$$list" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
++ echo " ( cd '$(DESTDIR)$(pkglibexecdir)' && rm -f" $$files ")"; \
++ cd "$(DESTDIR)$(pkglibexecdir)" && rm -f $$files
+
+-clean-libexecPROGRAMS:
+- @list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
++clean-pkglibexecPROGRAMS:
++ @list='$(pkglibexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+ echo " rm -f" $$list; \
+ rm -f $$list || exit $$?; \
+ test -n "$(EXEEXT)" || exit 0; \
+@@ -609,7 +609,7 @@
+ check: check-am
+ all-am: Makefile $(PROGRAMS) $(HEADERS)
+ installdirs:
+- for dir in "$(DESTDIR)$(libexecdir)"; do \
++ for dir in "$(DESTDIR)$(pkglibexecdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: install-am
+@@ -639,7 +639,7 @@
+ @echo "it deletes files that may require special tools to rebuild."
+ clean: clean-am
+
+-clean-am: clean-generic clean-libexecPROGRAMS clean-libtool \
++clean-am: clean-generic clean-libtool clean-pkglibexecPROGRAMS \
+ mostlyclean-am
+
+ distclean: distclean-am
+@@ -666,7 +666,7 @@
+
+ install-dvi-am:
+
+-install-exec-am: install-libexecPROGRAMS
++install-exec-am: install-pkglibexecPROGRAMS
+
+ install-html: install-html-am
+
+@@ -706,23 +706,23 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-libexecPROGRAMS
++uninstall-am: uninstall-pkglibexecPROGRAMS
+
+ .MAKE: install-am install-strip
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libexecPROGRAMS clean-libtool ctags distclean \
++ clean-libtool clean-pkglibexecPROGRAMS ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-info install-info-am \
+- install-libexecPROGRAMS install-man install-pdf install-pdf-am \
++ install-html-am install-info install-info-am install-man \
++ install-pdf install-pdf-am install-pkglibexecPROGRAMS \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-libexecPROGRAMS
++ tags uninstall uninstall-am uninstall-pkglibexecPROGRAMS
+
+
+ $(IMdkit):
+Index: ibus-1.4.0/ui/gtk/gtkpanel.xml.in.in
+===================================================================
+--- ibus-1.4.0.orig/ui/gtk/gtkpanel.xml.in.in 2011-12-08 17:51:36.554110603
-0800
++++ ibus-1.4.0/ui/gtk/gtkpanel.xml.in.in 2011-12-08 17:51:43.490201641
-0800
+@@ -3,7 +3,7 @@
+ <component>
+ <name>org.freedesktop.IBus.Panel</name>
+ <description>Gtk Panel Component</description>
+- <exec>${libexecdir}/ibus-ui-gtk</exec>
++ <exec>${pkglibexecdir}/ibus-ui-gtk</exec>
+ <version>@VERSION@</version>
+ <author>Peng Huang <[email protected]></author>
+ <license>GPL</license>
+Index: ibus-1.4.0/bus/Makefile.am
+===================================================================
+--- ibus-1.4.0.orig/bus/Makefile.am 2011-12-08 17:54:01.952019040 -0800
++++ ibus-1.4.0/bus/Makefile.am 2011-12-08 17:54:21.672277887 -0800
+@@ -35,7 +35,7 @@
+ @GTHREAD2_CFLAGS@ \
+ -DG_LOG_DOMAIN=\"IBUS\" \
+ -DPKGDATADIR=\"$(pkgdatadir)\" \
+- -DLIBEXECDIR=\"$(libexecdir)\" \
++ -DPKGLIBEXECDIR=\"$(pkglibexecdir)\" \
+ -DBINDIR=\"@bindir@\" \
+ $(INCLUDES) \
+ $(NULL)
+Index: ibus-1.4.0/bus/Makefile.in
+===================================================================
+--- ibus-1.4.0.orig/bus/Makefile.in 2011-12-08 17:54:01.972019303 -0800
++++ ibus-1.4.0/bus/Makefile.in 2011-12-08 17:55:00.580788600 -0800
+@@ -383,7 +383,7 @@
+ @GTHREAD2_CFLAGS@ \
+ -DG_LOG_DOMAIN=\"IBUS\" \
+ -DPKGDATADIR=\"$(pkgdatadir)\" \
+- -DLIBEXECDIR=\"$(libexecdir)\" \
++ -DPKGLIBEXECDIR=\"$(pkglibexecdir)\" \
+ -DBINDIR=\"@bindir@\" \
+ $(INCLUDES) \
+ $(NULL)
+Index: ibus-1.4.0/bus/main.c
+===================================================================
+--- ibus-1.4.0.orig/bus/main.c 2011-12-08 17:54:38.952504707 -0800
++++ ibus-1.4.0/bus/main.c 2011-12-08 17:54:49.792646994 -0800
+@@ -284,7 +284,7 @@
+
+ /* execute ibus xim server */
+ if (xim) {
+- if (!execute_cmdline (LIBEXECDIR "/ibus-x11 --kill-daemon"))
++ if (!execute_cmdline (PKGLIBEXECDIR "/ibus-x11 --kill-daemon"))
+ exit (-1);
+ }
+
diff -Nru ibus-1.4.0/debian/xinput/ibus ibus-1.4.0/debian/xinput/ibus
--- ibus-1.4.0/debian/xinput/ibus 2011-12-07 05:29:37.000000000 -0800
+++ ibus-1.4.0/debian/xinput/ibus 2011-12-08 18:28:41.000000000 -0800
@@ -1,15 +1,16 @@
XIM=ibus
XIM_PROGRAM=/usr/bin/ibus-daemon
XIM_ARGS="--xim"
-if [ -e /usr/lib/gtk-3.0/*/immodules/im-ibus.so ] \
- && [ -e /usr/lib/gtk-2.0/*/immodules/im-ibus.so ]
+DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+if [ -e /usr/lib/"$DEB_HOST_MULTIARCH"/gtk-3.0/*/immodules/im-ibus.so ] \
+ && [ -e /usr/lib/"$DEB_HOST_MULTIARCH"/gtk-2.0/*/immodules/im-ibus.so ]
then
GTK_IM_MODULE=ibus
else
GTK_IM_MODULE=xim
fi
-if [ -e /usr/lib/qt4/plugins/inputmethods/libqtim-ibus.so ]; then
+if [ -e
/usr/lib/"$DEB_HOST_MULTIARCH"/qt4/plugins/inputmethods/libqtim-ibus.so ]; then
QT_IM_MODULE=ibus
else
QT_IM_MODULE=xim
--- End Message ---
