=== modified file 'debian/changelog'
--- debian/changelog	2016-11-19 18:27:53 +0000
+++ debian/changelog	2016-11-19 18:28:10 +0000
@@ -1,3 +1,12 @@
+gdk-pixbuf (2.36.0-1ubuntu1) UNRELEASED; urgency=medium
+
+  * Sync with Debian (LP: #1643222). Remaining change:
+    - Unset MALLOC_PERTURB_ for the /pixbuf/cve-2015-4491/original test, as
+      it fails with OOM, or gets OOM killed.
+  * Drop CVE-2016-6352.patch, the fix was applied in new upstream version
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Sat, 19 Nov 2016 12:50:45 -0500
+
 gdk-pixbuf (2.36.0-1) unstable; urgency=medium
 
   * New upstream release.

=== modified file 'debian/control'
--- debian/control	2016-11-19 18:27:53 +0000
+++ debian/control	2016-11-19 18:28:09 +0000
@@ -5,7 +5,8 @@
 Source: gdk-pixbuf
 Section: libs
 Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
 Uploaders: Andreas Henriksson <andreas@fatal.se>, Michael Biebl <biebl@debian.org>
 Build-Depends: debhelper (>= 10),
                dh-exec,

=== modified file 'debian/control.in'
--- debian/control.in	2016-11-19 18:27:53 +0000
+++ debian/control.in	2016-11-19 18:28:10 +0000
@@ -1,7 +1,8 @@
 Source: gdk-pixbuf
 Section: libs
 Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 10),
                dh-exec,

=== modified file 'debian/patches/series'
--- debian/patches/series	2016-11-19 18:27:53 +0000
+++ debian/patches/series	2016-11-19 18:28:11 +0000
@@ -1,1 +1,2 @@
 01-disable-oom-test.patch
+skip-perturb-for-cve-2015-4491-original-test.patch

=== added file 'debian/patches/skip-perturb-for-cve-2015-4491-original-test.patch'
--- debian/patches/skip-perturb-for-cve-2015-4491-original-test.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/skip-perturb-for-cve-2015-4491-original-test.patch	2016-11-19 18:28:11 +0000
@@ -0,0 +1,39 @@
+Description: Unset MALLOC_PERTURB_ for the /pixbuf/cve-2015-4491/original
+ as it fails with OOM, or gets OOM killed.
+Author: Dimitri John Ledkov <xnox@ubuntu.com>
+
+--- a/tests/cve-2015-4491.c
++++ b/tests/cve-2015-4491.c
+@@ -18,6 +18,8 @@
+  * Author: Benjamin Otte
+  */
+ 
++#include <malloc.h>
++
+ #include <gdk-pixbuf.h>
+ 
+ #include "test-common.h"
+@@ -28,11 +30,23 @@
+   GdkPixbuf* buf;
+   int size = 32;
+   GError* err = NULL;
++  gint64 perturbv = 0;
++  
++  const gchar * perturb = NULL;
++  perturb = g_getenv("MALLOC_PERTURB_");
++  if (perturb != NULL) {
++	  perturbv = g_ascii_strtoll (perturb, NULL, 0);
++	  mallopt(M_PERTURB, 0);
++  }
+ 
+   buf = gdk_pixbuf_new_from_resource_at_scale ("/test/resource/cve-2015-4491.bmp", size, size, FALSE, &err);
+   if (skip_if_insufficient_memory (&err))
+     return;
+ 
++  if (perturbv > 0) {
++	  mallopt(M_PERTURB, perturbv);
++  }
++
+   g_assert_no_error (err);
+ 
+   g_object_unref (buf);