r15339 - in /desktop/unstable/glib2.0/debian: changelog patches/01_gettext-desktopfiles.patch

[lool at users.alioth.debian.org]

Author: lool
Date: Thu Mar 20 15:45:53 2008
New Revision: 15339

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15339
Log:
Update patch 01_gettext-desktopfiles with a newer version taken from the
  Ubuntu package.

Modified:
    desktop/unstable/glib2.0/debian/changelog
    desktop/unstable/glib2.0/debian/patches/01_gettext-desktopfiles.patch

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=15339&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog (original)
+++ desktop/unstable/glib2.0/debian/changelog Thu Mar 20 15:45:53 2008
@@ -2,6 +2,8 @@
 
   * Drop nautilus conflicts as it triggers a bug in the APT resolver on
     dist-upgrade.
+  * Update patch 01_gettext-desktopfiles with a newer version taken from the
+    Ubuntu package.
 
  -- Loic Minier <lool at dooz.org>  Thu, 20 Mar 2008 16:42:00 +0100
 

Modified: desktop/unstable/glib2.0/debian/patches/01_gettext-desktopfiles.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/01_gettext-desktopfiles.patch?rev=15339&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/01_gettext-desktopfiles.patch (original)
+++ desktop/unstable/glib2.0/debian/patches/01_gettext-desktopfiles.patch Thu Mar 20 15:45:53 2008
@@ -1,6 +1,7 @@
-diff -Nur glib-2.10.2/glib/gkeyfile.c glib-2.10.2.new/glib/gkeyfile.c
---- glib-2.10.2/glib/gkeyfile.c	2006-01-18 04:51:28.000000000 +0100
-+++ glib-2.10.2.new/glib/gkeyfile.c	2006-05-22 17:46:12.000000000 +0200
+Index: glib2.0-2.16.1/glib/gkeyfile.c
+===================================================================
+--- glib2.0-2.16.1.orig/glib/gkeyfile.c	2008-03-11 01:31:57.000000000 +0100
++++ glib2.0-2.16.1/glib/gkeyfile.c	2008-03-12 12:22:10.000000000 +0100
 @@ -21,6 +21,9 @@
   *   Boston, MA 02111-1307, USA.
   */
@@ -11,31 +12,31 @@
  #include "config.h"
  
  #include "gkeyfile.h"
-@@ -80,6 +83,7 @@
-   gchar list_separator;
+@@ -83,6 +86,7 @@
+   GKeyFileFlags flags;
  
-   GKeyFileFlags flags;
+   gchar **locales;
 +  char          *gettext_domain;
  };
  
  typedef struct _GKeyFileKeyValuePair GKeyFileKeyValuePair;
-@@ -203,6 +207,7 @@
-   key_file->approximate_size = 0;
+@@ -209,6 +213,7 @@
    key_file->list_separator = ';';
    key_file->flags = 0;
+   key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
 +  key_file->gettext_domain = NULL;
  }
  
  static void
-@@ -212,6 +217,7 @@
- 
-   if (key_file->parse_buffer)
-     g_string_free (key_file->parse_buffer, TRUE);
+@@ -227,6 +232,7 @@
+       g_string_free (key_file->parse_buffer, TRUE);
+       key_file->parse_buffer = NULL;
+     }
 +  g_free(key_file->gettext_domain);
  
    tmp = key_file->groups;
    while (tmp != NULL)
-@@ -429,6 +435,8 @@
+@@ -448,6 +454,8 @@
        return FALSE;
      }
  
@@ -44,7 +45,7 @@
    return TRUE;
  }
  
-@@ -533,6 +541,8 @@
+@@ -553,6 +561,8 @@
        g_propagate_error (error, key_file_error);
        return FALSE;
      }
@@ -53,7 +54,7 @@
  
    return TRUE;
  }
-@@ -1581,6 +1591,32 @@
+@@ -1679,6 +1689,32 @@
        languages = (gchar **) g_get_language_names ();
        free_languages = FALSE;
      }
@@ -86,7 +87,7 @@
    
    for (i = 0; languages[i]; i++)
      {
-@@ -1609,6 +1645,8 @@
+@@ -1707,6 +1743,8 @@
          g_propagate_error (error, key_file_error);
      }