r44052 - in /desktop/unstable/gnome-menus/debian: changelog patches/30_xdg_syntax.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Dec 14 12:26:07 2014
New Revision: 44052

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=44052
Log:
30_xdg_syntax.patch: fix typo in the patch as provided by upstream. 
Thanks Jerad Simpson.

Modified:
    desktop/unstable/gnome-menus/debian/changelog
    desktop/unstable/gnome-menus/debian/patches/30_xdg_syntax.patch

Modified: desktop/unstable/gnome-menus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/changelog?rev=44052&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/changelog	[utf-8] Sun Dec 14 12:26:07 2014
@@ -1,3 +1,10 @@
+gnome-menus (3.13.3-5) unstable; urgency=medium
+
+  * 30_xdg_syntax.patch: fix typo in the patch as provided by upstream. 
+    Thanks Jerad Simpson.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 14 Dec 2014 13:19:14 +0100
+
 gnome-menus (3.13.3-4) unstable; urgency=medium
 
   * menus.blacklist:

Modified: desktop/unstable/gnome-menus/debian/patches/30_xdg_syntax.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/patches/30_xdg_syntax.patch?rev=44052&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/30_xdg_syntax.patch	[utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/patches/30_xdg_syntax.patch	[utf-8] Sun Dec 14 12:26:07 2014
@@ -1,16 +1,10 @@
-From b4546ab43c2c7ef6fb6cb7e5db83dc3975b56e8e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels at gmail.com>
-Date: Mon, 27 Oct 2014 18:41:34 +0200
-Subject: desktop-entries: support multiple desktops in XDG_CURRENT_DESKTOP
+desktop-entries: support multiple desktops in XDG_CURRENT_DESKTOP
 
-This is based on glib commit:
-5a5e16e93c4f11e635918ecdb41681f63fd05a39
-
-diff --git a/libmenu/desktop-entries.c b/libmenu/desktop-entries.c
-index 326f311..bd4f886 100644
---- a/libmenu/desktop-entries.c
-+++ b/libmenu/desktop-entries.c
-@@ -85,32 +85,27 @@ unix_basename_from_path (const char *path)
+Index: gnome-menus-3.13.3/libmenu/desktop-entries.c
+===================================================================
+--- gnome-menus-3.13.3.orig/libmenu/desktop-entries.c	2014-12-14 13:17:21.044575627 +0100
++++ gnome-menus-3.13.3/libmenu/desktop-entries.c	2014-12-14 13:17:42.640579012 +0100
+@@ -85,32 +85,27 @@ unix_basename_from_path (const char *pat
      return path;
  }
  
@@ -41,7 +35,7 @@
 -      else
 -        current_desktop = g_strdup (desktop);
 -    }
-+      if (desktops)
++      if (!desktops)
 +        desktops = "";
  
 -  /* Using "*" means skipping desktop-related checks */
@@ -68,7 +62,8 @@
 +  gchar **not_show_in;
    gboolean show_in = TRUE;
 -  int i;
--
++  gint i;
+ 
 -  current_desktop = get_current_desktop ();
 -  if (!current_desktop)
 -    return TRUE;
@@ -79,8 +74,6 @@
 -                                     NULL,
 -                                     NULL);
 -  if (strv)
-+  gint i;
-+
 +  current_desktops = get_current_desktops ();
 +  only_show_in = g_key_file_get_string_list (key_file,
 +                                             DESKTOP_ENTRY_GROUP,
@@ -147,7 +140,7 @@
  
    return show_in;
  }
-@@ -579,14 +580,7 @@ gboolean
+@@ -581,14 +582,7 @@ gboolean
  desktop_entry_get_show_in (DesktopEntry *entry)
  {
    if (entry->type == DESKTOP_ENTRY_DESKTOP)
@@ -163,6 +156,3 @@
    return ((DesktopEntryDirectory*)entry)->showin;
  }
  
--- 
-cgit v0.10.1
-