On Fri, Apr 27, 2007 at 04:28:11PM -0500, minghua wrote: > I've attached the patch (SVN change r842)
Oops. Really attached this time. Ming 2007.04.27
Index: debian/patches/10_gtk-immodule-install-dir.dpatch =================================================================== --- debian/patches/10_gtk-immodule-install-dir.dpatch (revision 841) +++ debian/patches/10_gtk-immodule-install-dir.dpatch (revision 842) @@ -4,32 +4,35 @@ ## All lines beginning with `## DP:' are a description of the patch. ## ## DP: Change the gtk immodule installation directory from -## DP: /usr/lib/gtk-2.0/immodules/ to /usr/lib/gtk-2.0/2.4.0/immodules/. +## DP: /usr/lib/gtk-2.0/immodules/ to +## DP: /usr/lib/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/. ## DP: -## DP: This is just a workaround for the problem that -## DP: /usr/sbin/update-gtk-immodules used by GTK+ packages only looks -## DP: for the specific versioned directory (so that 2.2.x and 2.4.x can -## DP: coexist, probably). I can't use /usr/bin/gtk-query-immodules-2.0 -## DP: instead because it completely rewrites /etc/gtk-2.0/gtk.immodules -## DP: (therefore break other packages), and the change won't survive -## DP: upgrades of libgtk2.0-0 and other input method packages that use -## DP: /usr/sbin/update-gtk-immodules. +## DP: The GTK+ IM module should be installed in the ABI-specific +## DP: directory instead of the general one to avoid ABI mismatch during +## DP: GTK+ ABI upgrade. ## DP: -## DP: This patch only changes extras/gtk_immodule/Makefile.am, and the -## DP: change necessary for extras/gtk_immodule/Makefile.in is -## DP: incorporated in 11_relibtoolize.dpatch. If the relibtoolize +## DP: Since GTK+ 2.10, Debian has changed the way to handle the ABI for +## DP: IM modules and GdkPixbuf loaders. For IM modules, the +## DP: /usr/sbin/update-gtk-immodules tool is deprecated and the IM +## DP: module information is not stored in /etc/gtk-2.0/gtk.immodules +## DP: anymore. The debhelper program dh_gtkmodules should be used +## DP: instead to update the IM module information. +## DP: +## DP: NOTE: This patch only changes extras/gtk_immodule/Makefile.am, +## DP: and the change necessary for extras/gtk_immodule/Makefile.in is +## DP: incorporated in 90_relibtoolize.dpatch. If the relibtoolize ## DP: patch is removed, this patch should change Makefile.in as well. @DPATCH@ -diff -urNad scim-1.4.4~/extras/gtk2_immodule/Makefile.am scim-1.4.4/extras/gtk2_immodule/Makefile.am ---- scim-1.4.4~/extras/gtk2_immodule/Makefile.am 2007-04-14 21:42:10.000000000 -0500 -+++ scim-1.4.4/extras/gtk2_immodule/Makefile.am 2007-04-14 21:46:17.000000000 -0500 +diff -urNad scim-1.4.6~/extras/gtk2_immodule/Makefile.am scim-1.4.6/extras/gtk2_immodule/Makefile.am +--- scim-1.4.6~/extras/gtk2_immodule/Makefile.am 2007-04-10 03:07:55.000000000 -0500 ++++ scim-1.4.6/extras/gtk2_immodule/Makefile.am 2007-04-23 13:42:21.000000000 -0500 @@ -32,7 +32,7 @@ noinst_HEADERS = gtkimcontextscim.h -moduledir = @GTK_LIBDIR@/gtk-2.0/immodules -+moduledir = @GTK_LIBDIR@/gtk-2.0/2.10.0/immodules ++moduledir = @GTK_LIBDIR@/gtk-2.0/@GTK_BINARY_VERSION@/immodules module_LTLIBRARIES = $(CONFIG_GTK2_IMMODULE) Index: debian/changelog =================================================================== --- debian/changelog (revision 841) +++ debian/changelog (revision 842) @@ -1,3 +1,19 @@ +scim (1.4.6-0+SVN) UNRELEASED; urgency=low + + * New upstream release. (Closes: #399736) + - Include <climits> header in src/scim_iconv.cpp, fixing FTBFS with GCC + 4.3. Thanks to Martin Michlmayr for testing and the patch. + (Closes: #417686) + - The "Exit" item in the menu of notification area icon is built by + default now, so that users can quit scim from the graphical interface. + (Closes: #417950) + * For the install directory of GTK IM module, use GTK binary version from + pkg-config results instead of hardcoded value. Thanks to Loïc Minier for + the patch. (Closes: #420497) + * Regenerate 90_relibtoolize.dpatch. + + -- Ming Hua <[EMAIL PROTECTED]> Mon, 23 Apr 2007 18:35:30 -0500 + scim (1.4.4-8) unstable; urgency=low The "etch is released, welcome lenny" release. Index: debian/rules =================================================================== --- debian/rules (revision 841) +++ debian/rules (revision 842) @@ -87,8 +87,8 @@ # clean up unnecessary static library files for modules rm debian/tmp/usr/lib/scim-1.0/1.4.0/*/*.la rm debian/tmp/usr/lib/scim-1.0/1.4.0/*/*.a - rm debian/tmp/usr/lib/gtk-2.0/2.10.0/immodules/im-scim.a - rm debian/tmp/usr/lib/gtk-2.0/2.10.0/immodules/im-scim.la + rm debian/tmp/usr/lib/gtk-2.0/*/immodules/im-scim.a + rm debian/tmp/usr/lib/gtk-2.0/*/immodules/im-scim.la # distribute files to different binary packages dh_install --sourcedir=debian/tmp --fail-missing touch $@ Index: debian/scim-gtk2-immodule.install =================================================================== --- debian/scim-gtk2-immodule.install (revision 841) +++ debian/scim-gtk2-immodule.install (revision 842) @@ -1 +1 @@ -usr/lib/gtk-2.0/2.10.0/immodules/im-scim.so +usr/lib/gtk-2.0/*/immodules/im-scim.so
