← Back to branch summary

~ubuntu-branches/ubuntu/trusty/pango1.0/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/11_module-files-append-module-files-d.patch

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2012-11-12 13:23:16 UTC
  • mfrom: (1.6.5) (63.3.31 sid)
  • Revision ID: package-import@ubuntu.com-20121112132316-1cffyagrjxx8tvmg
Tags: 1.30.1-1
https://launchpad.net/bugs/837145
https://launchpad.net/bugs/986008
https://launchpad.net/bugs/1073637
* New upstream bug fix release.
* debian/libpango1.0-0.symbols: Add new symbol from this release.
* Grab a few fixes from upstream (via Ubuntu package, thanks Robert Ancell):
  - 00git_missing_prototype.patch: Add missing method prototype.
  - 00git_memory_leak.patch: Fix memory leak (LP: #837145)
  - 00git_thai_zero_width_spaces.patch: correctly handle zero width spaces
    in Thai (LP: #986008)
* Add debian/tests: Simple compile/link/run autopkg test. Thanks to Rafał
  Cieślak! (LP: #1073637)
* debian/control.in: Set Vcs-* to experimental branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/11_module-files-append-module-files-d.patch
1
 
Index: pango1.0-1.28.1/pango/modules.c
 
1
Index: pango-1.30.0/pango/modules.c
2
2
===================================================================
3
 
--- pango1.0-1.28.1.orig/pango/modules.c        2010-06-15 18:09:31.287811515 +0200
4
 
+++ pango1.0-1.28.1/pango/modules.c     2010-06-15 18:09:36.626808929 +0200
5
 
@@ -525,6 +525,11 @@
 
3
--- pango-1.30.0.orig/pango/modules.c   2012-03-31 21:42:48.366087473 +0200
 
4
+++ pango-1.30.0/pango/modules.c        2012-03-31 21:42:49.782087424 +0200
 
5
@@ -530,6 +530,11 @@
6
6
   FILE *module_file;
7
7
 
8
8
   char *file_str =  pango_config_key_get ("Pango/ModuleFiles");
14
14
   char **files;
15
15
   int n;
16
16
 
17
 
@@ -535,7 +540,12 @@
 
17
@@ -540,7 +545,12 @@
18
18
                                 "pango.modules",
19
19
                                 NULL);
20
20
 
28
28
 
29
29
   n = 0;
30
30
   while (files[n])
31
 
@@ -577,6 +587,8 @@
 
31
@@ -586,6 +596,8 @@
32
32
     }
33
33
 
34
34
   g_strfreev (files);