diff --git a/debian/changelog b/debian/changelog index dfbd9c6b5c..2b10f31090 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,7 +20,13 @@ gtk+2.0 (2.12.0-3) UNRELEASED; urgency=low mention the age of the upstream libtool in released tarballs which make relibtoolizing important for hurd-i386; GNOME #484426; Debian #445001. - -- Loic Minier Sun, 07 Oct 2007 17:59:39 +0200 + [ Josselin Mouette ] + * 020_immodules-files-d.patch, 021_loader-files-d.patch: read the + GDK_PIXBUF_MODULE_FILE and GTK_IM_MODULE_FILE variables before the + Debian directories. Thanks Thadeu Lima de Souza Cascardo. + Closes: #439004. + + -- Josselin Mouette Thu, 11 Oct 2007 23:25:20 +0200 gtk+2.0 (2.12.0-2) unstable; urgency=low diff --git a/debian/patches/020_immodules-files-d.patch b/debian/patches/020_immodules-files-d.patch index fde3c8b970..61f8139a91 100644 --- a/debian/patches/020_immodules-files-d.patch +++ b/debian/patches/020_immodules-files-d.patch @@ -70,8 +70,8 @@ Index: gtk+2.0-2.10.10/gtk/gtkimmodule.c + int n; + + list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S, -+ im_module_file_str, + im_module_files_d_str, ++ im_module_file_str, + NULL); + + files = pango_split_file_list (list_str); diff --git a/debian/patches/021_loader-files-d.patch b/debian/patches/021_loader-files-d.patch index 59f9b90914..725f297805 100644 --- a/debian/patches/021_loader-files-d.patch +++ b/debian/patches/021_loader-files-d.patch @@ -257,8 +257,8 @@ Index: gtk+2.0-2.11.2/gdk-pixbuf/gdk-pixbuf-io.c + +#ifdef USE_GMODULE + list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S, -+ gdkpixbuf_module_file_str, + gdkpixbuf_module_files_d_str, ++ gdkpixbuf_module_file_str, + NULL); + + files = _ugly_copy_of_pango_split_file_list (list_str);