r40050 - in /desktop/unstable/pango1.0/debian: changelog patches/10_scan-module-files-in-dirs.patch patches/11_module-files-append-module-files-d.patch patches/13_configure-thai-modules.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Oct 21 11:32:42 2013
New Revision: 40050

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40050
Log:
Refresh patches.

Modified:
    desktop/unstable/pango1.0/debian/changelog
    desktop/unstable/pango1.0/debian/patches/10_scan-module-files-in-dirs.patch
    desktop/unstable/pango1.0/debian/patches/11_module-files-append-module-files-d.patch
    desktop/unstable/pango1.0/debian/patches/13_configure-thai-modules.patch

Modified: desktop/unstable/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/changelog?rev=40050&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/changelog	[utf-8] Mon Oct 21 11:32:42 2013
@@ -9,6 +9,9 @@
   * New upstream release.
   * Bump build-dependency on libcairo2-dev to >= 1.12.10.
   * Update debian/libpango-1.0-0.symbols with one added symbol.
+
+  [ Michael Biebl ]
+  * Refresh patches.
 
  -- Andreas Henriksson <andreas at fatal.se>  Mon, 21 Oct 2013 11:55:10 +0200
 

Modified: desktop/unstable/pango1.0/debian/patches/10_scan-module-files-in-dirs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/patches/10_scan-module-files-in-dirs.patch?rev=40050&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/patches/10_scan-module-files-in-dirs.patch	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/patches/10_scan-module-files-in-dirs.patch	[utf-8] Mon Oct 21 11:32:42 2013
@@ -1,7 +1,7 @@
-Index: pango-1.30.0/pango/modules.c
+Index: pango-1.36.0/pango/modules.c
 ===================================================================
---- pango-1.30.0.orig/pango/modules.c	2012-03-31 21:43:35.406085813 +0200
-+++ pango-1.30.0/pango/modules.c	2012-03-31 21:46:56.234078708 +0200
+--- pango-1.36.0.orig/pango/modules.c	2013-10-21 13:30:54.001114652 +0200
++++ pango-1.36.0/pango/modules.c	2013-10-21 13:30:53.997114576 +0200
 @@ -40,6 +40,9 @@
  #define PANGO_MODULE(module) (G_TYPE_CHECK_INSTANCE_CAST ((module), PANGO_TYPE_MODULE, PangoModule))
  #define PANGO_IS_MODULE(module)  (G_TYPE_CHECK_INSTANCE_TYPE ((module), PANGO_TYPE_MODULE))
@@ -12,7 +12,7 @@
  typedef struct _PangoMapInfo PangoMapInfo;
  typedef struct _PangoEnginePair PangoEnginePair;
  typedef struct _PangoSubmap PangoSubmap;
-@@ -545,13 +548,40 @@
+@@ -578,13 +581,40 @@
  
    while (n-- > 0)
      {

Modified: desktop/unstable/pango1.0/debian/patches/11_module-files-append-module-files-d.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/patches/11_module-files-append-module-files-d.patch?rev=40050&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/patches/11_module-files-append-module-files-d.patch	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/patches/11_module-files-append-module-files-d.patch	[utf-8] Mon Oct 21 11:32:42 2013
@@ -1,8 +1,8 @@
-Index: b/pango/modules.c
+Index: pango-1.36.0/pango/modules.c
 ===================================================================
---- a/pango/modules.c
-+++ b/pango/modules.c
-@@ -555,7 +555,7 @@
+--- pango-1.36.0.orig/pango/modules.c	2013-10-21 13:30:58.101193641 +0200
++++ pango-1.36.0/pango/modules.c	2013-10-21 13:30:58.101193641 +0200
+@@ -561,7 +561,7 @@
  
    if (!file_str)
      {
@@ -11,7 +11,7 @@
  
        files[0] = g_build_filename (pango_get_sysconf_subdirectory (),
                                     "pango.modules",
-@@ -564,7 +564,11 @@
+@@ -570,7 +570,11 @@
                                     MODULE_VERSION,
                                     "modules.cache",
                                     NULL);

Modified: desktop/unstable/pango1.0/debian/patches/13_configure-thai-modules.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/patches/13_configure-thai-modules.patch?rev=40050&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/patches/13_configure-thai-modules.patch	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/patches/13_configure-thai-modules.patch	[utf-8] Mon Oct 21 11:32:42 2013
@@ -7,11 +7,11 @@
 Complains about empty module name ^^^
 Avoid adding extra , when appending to empty thai_modules.
 
-diff --git a/configure.ac b/configure.ac
-index da10fd7..e7bba3e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -491,7 +491,11 @@ indic_modules="indic-lang"
+Index: pango-1.36.0/configure.ac
+===================================================================
+--- pango-1.36.0.orig/configure.ac	2013-10-21 13:31:01.137252696 +0200
++++ pango-1.36.0/configure.ac	2013-10-21 13:31:01.133252618 +0200
+@@ -494,7 +494,11 @@
  thai_modules=""
  
  if $have_libthai ; then