Package: scim-bridge
Version: 0.4.16-2
Followup-For: Bug #640625
User: [email protected]
Usertags: origin-ubuntu oneiric ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following:
* debian/{rules,scim-bridge-client-gtk.install}: Use GTK+ multiarch
lib path. Fixes FTBFS. (LP: #832786) (Closes: #640625)
Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers oneiric-updates
APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500,
'oneiric-proposed'), (500, 'oneiric')
Architecture: amd64 (x86_64)
Kernel: Linux 3.0.0-11-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u scim-bridge-0.4.16/debian/rules scim-bridge-0.4.16/debian/rules
--- scim-bridge-0.4.16/debian/rules
+++ scim-bridge-0.4.16/debian/rules
@@ -8,6 +8,7 @@
# 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))
@@ -75,8 +76,8 @@
# 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/gtk-2.0/*/immodules/im-scim-bridge.a
- rm debian/tmp/usr/lib/gtk-2.0/*/immodules/im-scim-bridge.la
+ 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
diff -u scim-bridge-0.4.16/debian/scim-bridge-client-gtk.install scim-bridge-0.4.16/debian/scim-bridge-client-gtk.install
--- scim-bridge-0.4.16/debian/scim-bridge-client-gtk.install
+++ scim-bridge-0.4.16/debian/scim-bridge-client-gtk.install
@@ -1 +1 @@
-usr/lib/gtk-2.0/*/immodules/im-scim-bridge.so
+usr/lib/*/gtk-2.0/*/immodules/im-scim-bridge.so
