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

Sat Oct 15 16:08:58 UTC 2011

Author: biebl
Date: Sat Oct 15 16:08:57 2011
New Revision: 30541

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

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

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=30541&op=diff
==============================================================================

--- desktop/unstable/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog [utf-8] Sat Oct 15 16:08:57 2011
@@ -14,6 +14,7 @@
     - Use architecture wildcard for kfreebsd and hurd.
     - Bump Standards-Version to 3.9.2. No further changes.
     - Set pkg-gnome-maintainers at lists.alioth.debian.org as Maintainer.
+  * Refresh patches.
 
  -- Michael Biebl <biebl at debian.org>  Fri, 14 Oct 2011 13:21:55 +0200
 

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=30541&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/01_gettext-desktopfiles.patch [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/01_gettext-desktopfiles.patch [utf-8] Sat Oct 15 16:08:57 2011
@@ -1,8 +1,10 @@
 # Description: If a .desktop file does not have inline translations, fall back to calling gettext.
 # Ubuntu: https://launchpad.net/bugs/3935
 # Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=569829
---- a/glib/gkeyfile.c
-+++ b/glib/gkeyfile.c
+Index: glib-2.28.8/glib/gkeyfile.c
+===================================================================
+--- glib-2.28.8.orig/glib/gkeyfile.c	2011-06-06 01:18:49.000000000 +0200
++++ glib-2.28.8/glib/gkeyfile.c	2011-10-15 18:08:08.912081418 +0200
 @@ -88,6 +88,7 @@
    GKeyFileFlags flags;
  
@@ -11,7 +13,7 @@
  };
  
  typedef struct _GKeyFileKeyValuePair GKeyFileKeyValuePair;
-@@ -214,6 +215,7 @@
+@@ -217,6 +218,7 @@
    key_file->list_separator = ';';
    key_file->flags = 0;
    key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
@@ -19,7 +21,7 @@
  }
  
  static void
-@@ -233,6 +235,12 @@
+@@ -236,6 +238,12 @@
        key_file->parse_buffer = NULL;
      }
  
@@ -32,7 +34,7 @@
    tmp = key_file->groups;
    while (tmp != NULL)
      {
-@@ -452,6 +460,11 @@
+@@ -455,6 +463,11 @@
        return FALSE;
      }
  
@@ -44,7 +46,7 @@
    return TRUE;
  }
  
-@@ -558,6 +571,11 @@
+@@ -561,6 +574,11 @@
        return FALSE;
      }
  
@@ -56,7 +58,7 @@
    return TRUE;
  }
  
-@@ -1666,6 +1684,8 @@
+@@ -1697,6 +1715,8 @@
    GError *key_file_error;
    gchar **languages;
    gboolean free_languages = FALSE;
@@ -65,7 +67,7 @@
    gint i;
  
    g_return_val_if_fail (key_file != NULL, NULL);
-@@ -1687,6 +1707,23 @@
+@@ -1718,6 +1738,23 @@
        free_languages = FALSE;
      }
    
@@ -89,7 +91,7 @@
    for (i = 0; languages[i]; i++)
      {
        candidate_key = g_strdup_printf ("%s[%s]", key, languages[i]);
-@@ -1703,6 +1740,39 @@
+@@ -1734,6 +1771,39 @@
        translated_value = NULL;
     }
  
@@ -129,8 +131,10 @@
    /* Fallback to untranslated key
     */
    if (!translated_value)
---- a/glib/gkeyfile.h
-+++ b/glib/gkeyfile.h
+Index: glib-2.28.8/glib/gkeyfile.h
+===================================================================
+--- glib-2.28.8.orig/glib/gkeyfile.h	2011-06-06 01:18:49.000000000 +0200
++++ glib-2.28.8/glib/gkeyfile.h	2011-10-15 18:08:08.912081418 +0200
 @@ -256,6 +256,7 @@
  #define G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY   "StartupNotify"
  #define G_KEY_FILE_DESKTOP_KEY_STARTUP_WM_CLASS "StartupWMClass"

Modified: desktop/unstable/glib2.0/debian/patches/02_gettext-desktopfiles-ubuntu.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/02_gettext-desktopfiles-ubuntu.patch?rev=30541&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/02_gettext-desktopfiles-ubuntu.patch [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/02_gettext-desktopfiles-ubuntu.patch [utf-8] Sat Oct 15 16:08:57 2011
@@ -1,8 +1,10 @@
 # Description: Provide backwards compatibility for 01_gettext-desktopfiles.patch for X-{Debian,Ubuntu}-Gettext-Domain
 # UbuntuSpecific: 01_gettext-desktopfiles.patch was changed to use X-GNOME-, so this is necessary until all our .desktop files are converted
---- a/glib/gkeyfile.c
-+++ b/glib/gkeyfile.c
-@@ -464,6 +464,16 @@
+Index: glib-2.28.8/glib/gkeyfile.c
+===================================================================
+--- glib-2.28.8.orig/glib/gkeyfile.c	2011-10-15 18:08:08.912081418 +0200
++++ glib-2.28.8/glib/gkeyfile.c	2011-10-15 18:08:14.704008604 +0200
+@@ -467,6 +467,16 @@
                                                      G_KEY_FILE_DESKTOP_GROUP,
                                                      G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
                                                      NULL);
@@ -19,7 +21,7 @@
  
    return TRUE;
  }
-@@ -575,6 +585,16 @@
+@@ -578,6 +588,16 @@
                                                      G_KEY_FILE_DESKTOP_GROUP,
                                                      G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
                                                      NULL);


