r36743 - in /desktop/experimental/pango1.0/debian: changelog patches/11_module-files-append-module-files-d.patch patches/12_module-files-append-compat-module-files-d.patch patches/series

[pochu at users.alioth.debian.org]

Author: pochu
Date: Sat Feb 23 15:38:11 2013
New Revision: 36743

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36743
Log:
* debian/patches/12_module-files-append-compat-module-files-d.patch:
  - Removed, we no longer need to provide compatibility for ia32-libs.
* debian/patches/11_module-files-append-module-files-d.patch:
  - Updated from Ubuntu, thanks Iain Lane and Rico Tzschichholz.

Removed:
    desktop/experimental/pango1.0/debian/patches/12_module-files-append-compat-module-files-d.patch
Modified:
    desktop/experimental/pango1.0/debian/changelog
    desktop/experimental/pango1.0/debian/patches/11_module-files-append-module-files-d.patch
    desktop/experimental/pango1.0/debian/patches/series

Modified: desktop/experimental/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/changelog?rev=36743&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/pango1.0/debian/changelog [utf-8] Sat Feb 23 15:38:11 2013
@@ -32,6 +32,10 @@
       - Update for new symbols.
   * debian/control.in:
     - libpango1.0-dev needs to depend on libharfbuzz-dev.
+  * debian/patches/12_module-files-append-compat-module-files-d.patch:
+    - Removed, we no longer need to provide compatibility for ia32-libs.
+  * debian/patches/11_module-files-append-module-files-d.patch:
+    - Updated from Ubuntu, thanks Iain Lane and Rico Tzschichholz.
 
  -- Andreas Henriksson <andreas at fatal.se>  Thu, 06 Dec 2012 22:35:26 +0100
 

Modified: desktop/experimental/pango1.0/debian/patches/11_module-files-append-module-files-d.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/patches/11_module-files-append-module-files-d.patch?rev=36743&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/patches/11_module-files-append-module-files-d.patch [utf-8] (original)
+++ desktop/experimental/pango1.0/debian/patches/11_module-files-append-module-files-d.patch [utf-8] Sat Feb 23 15:38:11 2013
@@ -1,41 +1,26 @@
-Index: pango-1.30.0/pango/modules.c
+Index: b/pango/modules.c
 ===================================================================
---- pango-1.30.0.orig/pango/modules.c	2012-03-31 21:42:48.366087473 +0200
-+++ pango-1.30.0/pango/modules.c	2012-03-31 21:42:49.782087424 +0200
-@@ -530,6 +530,11 @@
-   FILE *module_file;
+--- a/pango/modules.c
++++ b/pango/modules.c
+@@ -555,7 +555,7 @@
  
-   char *file_str =  pango_config_key_get ("Pango/ModuleFiles");
-+  char *module_files_d_str = g_build_filename (pango_get_lib_subdirectory (),
-+					       MODULE_VERSION,
-+					       "module-files.d",
-+					       NULL);
-+  char *list_str;
-   char **files;
-   int n;
+   if (!file_str)
+     {
+-      files = g_new (char *, 3);
++      files = g_new (char *, 4);
  
-@@ -540,7 +545,14 @@
-       files[2] = NULL;
+       files[0] = g_build_filename (pango_get_sysconf_subdirectory (),
+                                    "pango.modules",
+@@ -564,7 +564,11 @@
+                                    MODULE_VERSION,
+                                    "modules.cache",
+                                    NULL);
+-      files[2] = NULL;
++      files[2] = g_build_filename (pango_get_lib_subdirectory (),
++                                   MODULE_VERSION,
++                                   "module-files.d",
++                                   NULL);
++      files[3] = NULL;
      }
    else
--    files = pango_split_file_list (file_str);
-+    {
-+      list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S,
-+                            file_str,
-+                            module_files_d_str,
-+                            NULL);
-+
-+      files = pango_split_file_list (list_str);
-+    }
- 
-   n = 0;
-   while (files[n])
-@@ -586,6 +596,8 @@
-     }
- 
-   g_strfreev (files);
-+  g_free (list_str);
-+  g_free (module_files_d_str);
-   g_free (file_str);
- 
-   dlloaded_engines = g_slist_reverse (dlloaded_engines);
+     files = pango_split_file_list (file_str);

Modified: desktop/experimental/pango1.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/patches/series?rev=36743&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/pango1.0/debian/patches/series [utf-8] Sat Feb 23 15:38:11 2013
@@ -1,5 +1,4 @@
 10_scan-module-files-in-dirs.patch
 11_module-files-append-module-files-d.patch
-12_module-files-append-compat-module-files-d.patch
 13_configure-thai-modules.patch
 14_makefile_modules_ft2_link_harfbuzz.patch