diff -Nru scim-1.4.9/debian/changelog scim-1.4.9/debian/changelog --- scim-1.4.9/debian/changelog 2010-10-25 20:43:22.000000000 +0000 +++ scim-1.4.9/debian/changelog 2011-09-19 17:09:15.000000000 +0000 @@ -1,3 +1,10 @@ +scim (1.4.9-7) unstable; urgency=medium + + * fix FTBFS from introduction of multi-arch. Closes: #640629, LP: #832945. + full multi-arch support still needs further work. + + -- Rolf Leggewie Tue, 13 Sep 2011 23:53:16 +0900 + scim (1.4.9-6) unstable; urgency=low * debian/im-switch/scim-immodule: test for readability instead of diff -Nru scim-1.4.9/debian/control scim-1.4.9/debian/control --- scim-1.4.9/debian/control 2010-08-11 16:36:43.000000000 +0000 +++ scim-1.4.9/debian/control 2011-09-19 17:04:26.000000000 +0000 @@ -7,7 +7,7 @@ Osamu Aoki , LI Daobing , Ming Hua -Build-Depends: dpkg-dev (>= 1.14.6), debhelper (>= 7.0.50~), autotools-dev, pkg-config, x11proto-core-dev, libx11-dev, libpango1.0-dev, libglib2.0-dev, libgtk2.0-dev (>= 2.10.1), dh-autoreconf, libltdl-dev +Build-Depends: dpkg-dev (>= 1.14.6), debhelper (>= 8.1.3~), autotools-dev, pkg-config, x11proto-core-dev, libx11-dev, libpango1.0-dev, libglib2.0-dev, libgtk2.0-dev (>= 2.10.1), dh-autoreconf, libltdl-dev Standards-Version: 3.9.1 Homepage: http://www.scim-im.org/ Vcs-git: git://git.debian.org/git/collab-maint/scim.git @@ -15,6 +15,8 @@ Package: scim Architecture: any +Multi-Arch: foreign +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: scim-gtk2-immodule (= ${binary:Version}), im-config | im-switch, scim-bridge-agent Suggests: scim-uim, scim-pinyin, scim-hangul, scim-chewing, scim-m17n, scim-prime, scim-anthy, scim-skk, scim-canna, scim-tables-additional, scim-tables-ja, scim-tables-ko, scim-tables-zh, scim-thai @@ -53,6 +55,7 @@ Package: libscim8c2a Section: libs Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: scim (<< 1.2.0), libscim8, scim-gtk2-immodule (<< 1.4.9-2) Replaces: scim (<< 1.2.0), libscim8 @@ -66,6 +69,7 @@ Package: libscim-dev Section: libdevel Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: libscim8c2a (= ${binary:Version}), libx11-dev, libgtk2.0-dev, libpango1.0-dev, ${misc:Depends} Conflicts: scim-dev (<< 1.2.0) Replaces: scim-dev (<< 1.2.0) @@ -89,6 +93,7 @@ Package: scim-gtk2-immodule Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: scim, scim-modules-socket (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Enhances: scim Description: GTK+2 input method module with SCIM as backend @@ -106,6 +111,7 @@ Package: scim-modules-socket Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: scim-config-socket, scim-frontend-socket, scim-server-socket Replaces: scim-config-socket, scim-frontend-socket, scim-server-socket diff -Nru scim-1.4.9/debian/rules scim-1.4.9/debian/rules --- scim-1.4.9/debian/rules 2010-08-08 19:34:39.000000000 +0000 +++ scim-1.4.9/debian/rules 2011-09-19 17:56:30.000000000 +0000 @@ -1,6 +1,7 @@ #!/usr/bin/make -f export DH_VERBOSE=1 export DH_OPTIONS=-v +export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) %: dh --with autotools-dev --with autoreconf $@ @@ -26,16 +27,16 @@ sed -i "/dependency_libs/ s/'.*'/''/" $$FILE; \ done # move libraries based on gtk_binary_version - mkdir -p debian/tmp/usr/lib/gtk-2.0/`pkg-config --variable=gtk_binary_version gtk+-2.0`/ - mv debian/tmp/usr/lib/gtk-2.0/immodules \ - debian/tmp/usr/lib/gtk-2.0/`pkg-config --variable=gtk_binary_version gtk+-2.0`/ + mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gtk-2.0/`pkg-config --variable=gtk_binary_version gtk+-2.0`/ + mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gtk-2.0/immodules \ + debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gtk-2.0/`pkg-config --variable=gtk_binary_version gtk+-2.0`/ override_dh_installdocs: dh_installdocs -X Makefile override_dh_install: dh_install - LD_LIBRARY_PATH=debian/libscim8c2a/usr/lib:$(LD_LIBRARY_PATH) \ + LD_LIBRARY_PATH=debian/libscim8c2a/usr/lib/$(DEB_HOST_MULTIARCH):$(LD_LIBRARY_PATH) \ dh_gtkmodules -p scim-gtk2-immodule override_dh_makeshlibs: diff -Nru scim-1.4.9/debian/scim-gtk2-immodule.install scim-1.4.9/debian/scim-gtk2-immodule.install --- scim-1.4.9/debian/scim-gtk2-immodule.install 2010-07-03 13:46:59.000000000 +0000 +++ scim-1.4.9/debian/scim-gtk2-immodule.install 2011-09-19 17:05:49.000000000 +0000 @@ -1 +1 @@ -usr/lib/gtk-2.0/*/immodules/im-scim.so +usr/lib/*/gtk-2.0/*/immodules/im-scim.so diff -Nru scim-1.4.9/debian/TODO.Debian scim-1.4.9/debian/TODO.Debian --- scim-1.4.9/debian/TODO.Debian 2010-07-03 13:46:59.000000000 +0000 +++ scim-1.4.9/debian/TODO.Debian 2011-09-13 14:51:45.000000000 +0000 @@ -1,7 +1,5 @@ Short Term ---------- -Add lintian override for the soname-and-library-name-mismatch error. - Add scim-setup.desktop handling in postinst and postrm. Use AM_MAINTAINER_MODE in configure.ac to avoid timestamp skews.