r24522 - 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/12_module-files-append-compat-module-files-d.patch
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Tue Jun 15 16:10:51 UTC 2010
Author: slomo
Date: Tue Jun 15 16:10:43 2010
New Revision: 24522
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24522
Log:
* New upstream bugfix release.
* debian/patches/10_scan-module-files-in-dirs.patch,
debian/patches/11_module-files-append-module-files-d.patch,
debian/patches/12_module-files-append-compat-module-files-d.patch:
+ Refreshed.
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/12_module-files-append-compat-module-files-d.patch
Modified: desktop/unstable/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/changelog?rev=24522&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/pango1.0/debian/changelog [utf-8] Tue Jun 15 16:10:43 2010
@@ -1,3 +1,13 @@
+pango1.0 (1.28.1-1) unstable; urgency=low
+
+ * New upstream bugfix release.
+ * debian/patches/10_scan-module-files-in-dirs.patch,
+ debian/patches/11_module-files-append-module-files-d.patch,
+ debian/patches/12_module-files-append-compat-module-files-d.patch:
+ + Refreshed.
+
+ -- Sebastian Dröge <slomo at debian.org> Tue, 15 Jun 2010 18:09:57 +0200
+
pango1.0 (1.28.0-1) unstable; urgency=low
* New upstream stable release.
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=24522&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] Tue Jun 15 16:10:43 2010
@@ -1,7 +1,7 @@
-Index: pango1.0-1.16.0/pango/modules.c
+Index: pango1.0-1.28.1/pango/modules.c
===================================================================
---- pango1.0-1.16.0.orig/pango/modules.c 2007-01-23 00:41:43.000000000 +0100
-+++ pango1.0-1.16.0/pango/modules.c 2007-03-07 11:16:16.000000000 +0100
+--- pango1.0-1.28.1.orig/pango/modules.c 2010-06-15 18:09:21.255815917 +0200
++++ pango1.0-1.28.1/pango/modules.c 2010-06-15 18:09:31.287811515 +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;
-@@ -519,11 +522,36 @@
+@@ -540,11 +543,36 @@
while (n-- > 0)
{
@@ -20,9 +20,7 @@
- if (module_file)
+ GDir *dir = g_dir_open (files[n], 0, NULL);
+ if (dir)
- {
-- process_module_file(module_file);
-- fclose(module_file);
++ {
+ const char *dent;
+
+ while ((dent = g_dir_read_name (dir)))
@@ -43,7 +41,9 @@
+ g_dir_close (dir);
+ }
+ else
-+ {
+ {
+- process_module_file(module_file);
+- fclose(module_file);
+ module_file = g_fopen (files[n], "r");
+ if (module_file)
+ {
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=24522&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] Tue Jun 15 16:10:43 2010
@@ -1,8 +1,8 @@
-Index: pango1.0-1.16.0/pango/modules.c
+Index: pango1.0-1.28.1/pango/modules.c
===================================================================
---- pango1.0-1.16.0.orig/pango/modules.c 2007-03-07 11:16:16.000000000 +0100
-+++ pango1.0-1.16.0/pango/modules.c 2007-03-07 11:16:26.000000000 +0100
-@@ -504,6 +504,11 @@
+--- pango1.0-1.28.1.orig/pango/modules.c 2010-06-15 18:09:31.287811515 +0200
++++ pango1.0-1.28.1/pango/modules.c 2010-06-15 18:09:36.626808929 +0200
+@@ -525,6 +525,11 @@
FILE *module_file;
char *file_str = pango_config_key_get ("Pango/ModuleFiles");
@@ -14,7 +14,7 @@
char **files;
int n;
-@@ -514,7 +519,12 @@
+@@ -535,7 +540,12 @@
"pango.modules",
NULL);
@@ -28,7 +28,7 @@
n = 0;
while (files[n])
-@@ -556,6 +566,8 @@
+@@ -577,6 +587,8 @@
}
g_strfreev (files);
Modified: desktop/unstable/pango1.0/debian/patches/12_module-files-append-compat-module-files-d.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/patches/12_module-files-append-compat-module-files-d.patch?rev=24522&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/patches/12_module-files-append-compat-module-files-d.patch [utf-8] (original)
+++ desktop/unstable/pango1.0/debian/patches/12_module-files-append-compat-module-files-d.patch [utf-8] Tue Jun 15 16:10:43 2010
@@ -1,7 +1,7 @@
-Index: pango1.0-1.16.0/pango/modules.c
+Index: pango1.0-1.28.1/pango/modules.c
===================================================================
---- pango1.0-1.16.0.orig/pango/modules.c 2007-03-07 11:16:26.000000000 +0100
-+++ pango1.0-1.16.0/pango/modules.c 2007-03-07 11:16:33.000000000 +0100
+--- pango1.0-1.28.1.orig/pango/modules.c 2010-06-15 18:09:36.626808929 +0200
++++ pango1.0-1.28.1/pango/modules.c 2010-06-15 18:09:38.606801290 +0200
@@ -24,6 +24,7 @@
#include <string.h>
#include <limits.h>
@@ -10,7 +10,7 @@
#include <gmodule.h>
#include <glib/gstdio.h>
-@@ -508,6 +509,18 @@
+@@ -529,6 +530,18 @@
MODULE_VERSION,
"module-files.d",
NULL);
@@ -29,7 +29,7 @@
char *list_str;
char **files;
int n;
-@@ -519,6 +532,17 @@
+@@ -540,6 +553,17 @@
"pango.modules",
NULL);
@@ -47,7 +47,7 @@
list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S,
file_str,
module_files_d_str,
-@@ -568,6 +592,9 @@
+@@ -589,6 +613,9 @@
g_strfreev (files);
g_free (list_str);
g_free (module_files_d_str);
More information about the pkg-gnome-commits
mailing list