r52013 - in /desktop/unstable/glib2.0/debian: changelog patches/0001-Fix-trashing-on-overlayfs.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Feb 15 17:57:48 2017
New Revision: 52013

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52013
Log:
New upstream release.

Modified:
    desktop/unstable/glib2.0/debian/changelog
    desktop/unstable/glib2.0/debian/patches/0001-Fix-trashing-on-overlayfs.patch

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=52013&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog	[utf-8] Wed Feb 15 17:57:48 2017
@@ -1,3 +1,9 @@
+glib2.0 (2.50.3-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 15 Feb 2017 12:22:10 +0100
+
 glib2.0 (2.50.2-2) unstable; urgency=medium
 
   * debian/rules: disable libmount on !linux (Closes: #844052)

Modified: desktop/unstable/glib2.0/debian/patches/0001-Fix-trashing-on-overlayfs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/0001-Fix-trashing-on-overlayfs.patch?rev=52013&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/0001-Fix-trashing-on-overlayfs.patch	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/0001-Fix-trashing-on-overlayfs.patch	[utf-8] Wed Feb 15 17:57:48 2017
@@ -18,11 +18,11 @@
  gio/glocalfile.c | 20 +++++++++++++++++++-
  1 file changed, 19 insertions(+), 1 deletion(-)
 
-diff --git a/gio/glocalfile.c b/gio/glocalfile.c
-index 8f64777..544e0f2 100644
+Index: b/gio/glocalfile.c
+===================================================================
 --- a/gio/glocalfile.c
 +++ b/gio/glocalfile.c
-@@ -1910,7 +1910,7 @@ g_local_file_trash (GFile         *file,
+@@ -1909,7 +1909,7 @@
    char *basename, *trashname, *trashfile, *infoname, *infofile;
    char *original_name, *original_name_escaped;
    int i;
@@ -31,7 +31,7 @@
    gboolean is_homedir_trash;
    char delete_time[32];
    int fd;
-@@ -1934,6 +1934,24 @@ g_local_file_trash (GFile         *file,
+@@ -1933,6 +1933,24 @@
  
    is_homedir_trash = FALSE;
    trashdir = NULL;
@@ -56,6 +56,3 @@
    if (file_stat.st_dev == home_stat.st_dev)
      {
        is_homedir_trash = TRUE;
--- 
-2.10.2
-