r52024 - in /desktop/unstable/gdk-pixbuf: ./ debian/changelog debian/control debian/control.in debian/patches/0001-skip-perturb-for-cve-2015-4491-original-test.patch debian/patches/01-disable-oom-test.patch debian/patches/series

[laney at users.alioth.debian.org]

Author: laney
Date: Thu Feb 16 18:01:58 2017
New Revision: 52024

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52024
Log:
Merge gdk-pixbuf back to unstable

Added:
    desktop/unstable/gdk-pixbuf/debian/patches/0001-skip-perturb-for-cve-2015-4491-original-test.patch
      - copied unchanged from r52023, desktop/experimental/gdk-pixbuf/debian/patches/0001-skip-perturb-for-cve-2015-4491-original-test.patch
Removed:
    desktop/unstable/gdk-pixbuf/debian/patches/01-disable-oom-test.patch
Modified:
    desktop/unstable/gdk-pixbuf/   (props changed)
    desktop/unstable/gdk-pixbuf/debian/changelog
    desktop/unstable/gdk-pixbuf/debian/control
    desktop/unstable/gdk-pixbuf/debian/control.in
    desktop/unstable/gdk-pixbuf/debian/patches/series

Propchange: desktop/unstable/gdk-pixbuf/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Thu Feb 16 18:01:58 2017
@@ -1 +1 @@
-/desktop/experimental/gdk-pixbuf:42583-43410,45935-46018
+/desktop/experimental/gdk-pixbuf:42583-43410,45935-46018,51991-52023

Modified: desktop/unstable/gdk-pixbuf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/changelog?rev=52024&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/changelog	[utf-8] Thu Feb 16 18:01:58 2017
@@ -1,3 +1,26 @@
+gdk-pixbuf (2.36.5-2) UNRELEASED; urgency=medium
+
+  * Unbranch - that was short lived. Upload the stable release to unstable.
+
+ -- Iain Lane <laney at debian.org>  Thu, 16 Feb 2017 18:00:47 +0000
+
+gdk-pixbuf (2.36.5-1) experimental; urgency=medium
+
+  * Branch to experimental - update Vcs-*
+  * New upstream release 2.36.5
+    + Fix mimetypes for thumbnailer
+    + Handle fseek failure
+    + Fix signed/unsigned handling
+    + Fix an overflow check
+    + Handle extreme scaling better
+  * Bump libglib2.0 BD to 2.48.0, per configure.ac
+  * Try replacing d/p/01-disable-oom-test.patch with
+    d/p/0001-skip-perturb-for-cve-2015-4491-original-test.patch: This should
+    ideally allow the test to be run without OOMing, which is better than not
+    running it at all. (The proper fix is still to be investigated.)
+
+ -- Iain Lane <laney at debian.org>  Tue, 14 Feb 2017 11:36:07 +0000
+
 gdk-pixbuf (2.36.4-1) unstable; urgency=medium
 
   * New upstream release.

Modified: desktop/unstable/gdk-pixbuf/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/control?rev=52024&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/control	[utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/control	[utf-8] Thu Feb 16 18:01:58 2017
@@ -10,7 +10,7 @@
 Build-Depends: debhelper (>= 10),
                dh-exec,
                gnome-pkg-tools (>= 0.10),
-               libglib2.0-dev (>= 2.37.6),
+               libglib2.0-dev (>= 2.48.0),
                libx11-dev,
                libpng-dev (>= 1.6),
                libpng-dev (<< 1.7),

Modified: desktop/unstable/gdk-pixbuf/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/control.in?rev=52024&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/control.in	[utf-8] Thu Feb 16 18:01:58 2017
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 10),
                dh-exec,
                gnome-pkg-tools (>= 0.10),
-               libglib2.0-dev (>= 2.37.6),
+               libglib2.0-dev (>= 2.48.0),
                libx11-dev,
                libpng-dev (>= 1.6),
                libpng-dev (<< 1.7),

Modified: desktop/unstable/gdk-pixbuf/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/patches/series?rev=52024&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/patches/series	[utf-8] Thu Feb 16 18:01:58 2017
@@ -1 +1 @@
-01-disable-oom-test.patch
+0001-skip-perturb-for-cve-2015-4491-original-test.patch