r44329 - in /desktop/unstable/glib2.0/debian: changelog patches/gdbus-serialization-use-check_serialization-instead-.patch

[smcv at users.alioth.debian.org]

Author: smcv
Date: Fri May  8 15:19:49 2015
New Revision: 44329

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=44329
Log:
Mark patch as applied upstream

Modified:
    desktop/unstable/glib2.0/debian/changelog
    desktop/unstable/glib2.0/debian/patches/gdbus-serialization-use-check_serialization-instead-.patch

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=44329&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog	[utf-8] Fri May  8 15:19:49 2015
@@ -11,7 +11,7 @@
     a newer-than-8.32 system PCRE does not have the bug in question.
   * d/p/gdbus-serialization-use-check_serialization-instead-.patch:
     add patch to fix FTBFS in non-minimal environments (libdbus-1-dev
-    installed).
+    installed). Applied upstream for 2.45.2.
 
  -- Simon McVittie <smcv at debian.org>  Mon, 04 May 2015 09:53:53 +0100
 

Modified: desktop/unstable/glib2.0/debian/patches/gdbus-serialization-use-check_serialization-instead-.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/gdbus-serialization-use-check_serialization-instead-.patch?rev=44329&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/gdbus-serialization-use-check_serialization-instead-.patch	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/gdbus-serialization-use-check_serialization-instead-.patch	[utf-8] Fri May  8 15:19:49 2015
@@ -21,8 +21,13 @@
 bug #732754 by reverting commits 627b49b and 2268628 locally, this
 test still fails.
 
+[The diff here is not identical to upstream due to a separate
+memory leak fix on the 2.45 branch.]
+
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=744895
 Signed-off-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
+Reviewed-by: Colin Walters <walters at verbum.org>
+Applied-upstream: 2.45.2, commit:f42d2c1
 ---
  gio/tests/gdbus-serialization.c | 25 ++++++++-----------------
  1 file changed, 8 insertions(+), 17 deletions(-)