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

[lool at users.alioth.debian.org]

Author: lool
Date: Thu Mar 20 15:50:37 2008
New Revision: 15340

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15340
Log:
Update and enable patch 01_gettext-desktopfiles to also look for
  X-Debian-Gettext-Domain if X-Ubuntu-Gettext-Domain isn't present.

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

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=15340&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog (original)
+++ desktop/unstable/glib2.0/debian/changelog Thu Mar 20 15:50:37 2008
@@ -4,6 +4,8 @@
     dist-upgrade.
   * Update patch 01_gettext-desktopfiles with a newer version taken from the
     Ubuntu package.
+  * Update and enable patch 01_gettext-desktopfiles to also look for
+    X-Debian-Gettext-Domain if X-Ubuntu-Gettext-Domain isn't present.
 
  -- 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=15340&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:50:37 2008
@@ -1,18 +1,17 @@
-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 @@
+--- a/glib/gkeyfile.c	2008-03-11 01:31:57.000000000 +0100
++++ b/glib/gkeyfile.c	2008-03-20 16:49:25.000000000 +0100
+@@ -21,6 +21,10 @@
   *   Boston, MA 02111-1307, USA.
   */
  
-+#define X_GETTEXT_DOMAIN    "X-Ubuntu-Gettext-Domain"
++#define X_DEBIAN_GETTEXT_DOMAIN    "X-Debian-Gettext-Domain"
++#define X_UBUNTU_GETTEXT_DOMAIN    "X-Ubuntu-Gettext-Domain"
 +#define X_DESKTOP_ENTRY     "Desktop Entry"
 +
  #include "config.h"
  
  #include "gkeyfile.h"
-@@ -83,6 +86,7 @@
+@@ -83,6 +87,7 @@
    GKeyFileFlags flags;
  
    gchar **locales;
@@ -20,7 +19,7 @@
  };
  
  typedef struct _GKeyFileKeyValuePair GKeyFileKeyValuePair;
-@@ -209,6 +213,7 @@
+@@ -209,6 +214,7 @@
    key_file->list_separator = ';';
    key_file->flags = 0;
    key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
@@ -28,7 +27,7 @@
  }
  
  static void
-@@ -227,6 +232,7 @@
+@@ -227,6 +233,7 @@
        g_string_free (key_file->parse_buffer, TRUE);
        key_file->parse_buffer = NULL;
      }
@@ -36,25 +35,29 @@
  
    tmp = key_file->groups;
    while (tmp != NULL)
-@@ -448,6 +454,8 @@
+@@ -448,6 +455,10 @@
        return FALSE;
      }
  
-+  key_file->gettext_domain = g_key_file_get_string (key_file, X_DESKTOP_ENTRY, X_GETTEXT_DOMAIN, NULL);
++  key_file->gettext_domain = g_key_file_get_string (key_file, X_DESKTOP_ENTRY, X_UBUNTU_GETTEXT_DOMAIN, NULL);
++  if (!key_file->gettext_domain)
++      key_file->gettext_domain = g_key_file_get_string (key_file, X_DESKTOP_ENTRY, X_DEBIAN_GETTEXT_DOMAIN, NULL);
 +
    return TRUE;
  }
  
-@@ -553,6 +561,8 @@
+@@ -553,6 +564,10 @@
        g_propagate_error (error, key_file_error);
        return FALSE;
      }
 +  
-+  key_file->gettext_domain = g_key_file_get_string (key_file, X_DESKTOP_ENTRY, X_GETTEXT_DOMAIN, NULL);
++  key_file->gettext_domain = g_key_file_get_string (key_file, X_DESKTOP_ENTRY, X_UBUNTU_GETTEXT_DOMAIN, NULL);
++  if (!key_file->gettext_domain)
++      key_file->gettext_domain = g_key_file_get_string (key_file, X_DESKTOP_ENTRY, X_DEBIAN_GETTEXT_DOMAIN, NULL);
  
    return TRUE;
  }
-@@ -1679,6 +1689,32 @@
+@@ -1679,6 +1694,32 @@
        languages = (gchar **) g_get_language_names ();
        free_languages = FALSE;
      }
@@ -87,7 +90,7 @@
    
    for (i = 0; languages[i]; i++)
      {
-@@ -1707,6 +1743,8 @@
+@@ -1707,6 +1748,8 @@
          g_propagate_error (error, key_file_error);
      }
  

Modified: desktop/unstable/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/series?rev=15340&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/series (original)
+++ desktop/unstable/glib2.0/debian/patches/series Thu Mar 20 15:50:37 2008
@@ -1,4 +1,4 @@
-#01_gettext-desktopfiles.patch
+01_gettext-desktopfiles.patch
 02_usr_share_gnome_applications.patch
 03_blacklist-directories.patch
 04_nfs4.patch