r13072 - in /desktop/unstable/gtk+2.0/debian: changelog patches/020_immodules-files-d.patch patches/021_loader-files-d.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Oct 11 21:26:13 2007
New Revision: 13072

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13072
Log:
* 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.

Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    desktop/unstable/gtk+2.0/debian/patches/020_immodules-files-d.patch
    desktop/unstable/gtk+2.0/debian/patches/021_loader-files-d.patch

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=13072&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog (original)
+++ desktop/unstable/gtk+2.0/debian/changelog Thu Oct 11 21:26:13 2007
@@ -20,7 +20,13 @@
     mention the age of the upstream libtool in released tarballs which make
     relibtoolizing important for hurd-i386; GNOME #484426; Debian #445001.
 
- -- Loic Minier <lool at dooz.org>  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 <joss at debian.org>  Thu, 11 Oct 2007 23:25:20 +0200
 
 gtk+2.0 (2.12.0-2) unstable; urgency=low
 

Modified: desktop/unstable/gtk+2.0/debian/patches/020_immodules-files-d.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/020_immodules-files-d.patch?rev=13072&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/020_immodules-files-d.patch (original)
+++ desktop/unstable/gtk+2.0/debian/patches/020_immodules-files-d.patch Thu Oct 11 21:26:13 2007
@@ -70,8 +70,8 @@
 +  int n;
 +
 +  list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S,
++			im_module_files_d_str,
 +			im_module_file_str,
-+			im_module_files_d_str,
 +			NULL);
 +
 +  files = pango_split_file_list (list_str);

Modified: desktop/unstable/gtk+2.0/debian/patches/021_loader-files-d.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/021_loader-files-d.patch?rev=13072&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/021_loader-files-d.patch (original)
+++ desktop/unstable/gtk+2.0/debian/patches/021_loader-files-d.patch Thu Oct 11 21:26:13 2007
@@ -257,8 +257,8 @@
 +
 +#ifdef USE_GMODULE
 +	list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S,
++			      gdkpixbuf_module_files_d_str,
 +			      gdkpixbuf_module_file_str,
-+			      gdkpixbuf_module_files_d_str,
 +			      NULL);
 +
 +	files = _ugly_copy_of_pango_split_file_list (list_str);