r46020 - in /desktop/unstable/gdk-pixbuf: ./ debian/changelog debian/control debian/patches/ debian/rules

[laney at users.alioth.debian.org]

Author: laney
Date: Tue Sep 22 13:54:57 2015
New Revision: 46020

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46020
Log:
Merge exp back into unstable


Added:
    desktop/unstable/gdk-pixbuf/debian/patches/
      - copied from r46018, desktop/experimental/gdk-pixbuf/debian/patches/
Modified:
    desktop/unstable/gdk-pixbuf/   (props changed)
    desktop/unstable/gdk-pixbuf/debian/changelog
    desktop/unstable/gdk-pixbuf/debian/control
    desktop/unstable/gdk-pixbuf/debian/rules

Propchange: desktop/unstable/gdk-pixbuf/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Tue Sep 22 13:54:57 2015
@@ -1 +1 @@
-/desktop/experimental/gdk-pixbuf:42583-43410
+/desktop/experimental/gdk-pixbuf:42583-43410,45935-46018

Modified: desktop/unstable/gdk-pixbuf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/changelog?rev=46020&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/changelog	[utf-8] Tue Sep 22 13:54:57 2015
@@ -1,3 +1,21 @@
+gdk-pixbuf (2.31.7-3) experimental; urgency=medium
+
+  * debian/patches/skip-large-file-tests-instead-of-ooming: This didn't catch
+    all cases. Run some tests in a subprocess so that we can skip them if they
+    abort due to malloc failing.
+
+ -- Iain Lane <laney at debian.org>  Fri, 18 Sep 2015 22:08:41 +0100
+
+gdk-pixbuf (2.31.7-2) experimental; urgency=medium
+
+  * Run the tests with VERBOSE=1
+  * debian/patches/skip-large-file-tests-instead-of-ooming: Add a new patch to
+    skip tests which operate on large files that don't fit in memory on some
+    constrained systems. Not forwarded yet - this upload is to test it on our
+    buildds.
+
+ -- Iain Lane <laney at debian.org>  Thu, 17 Sep 2015 14:38:08 +0100
+
 gdk-pixbuf (2.31.7-1) unstable; urgency=medium
 
   [ Michael Biebl ]

Modified: desktop/unstable/gdk-pixbuf/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/control?rev=46020&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/control	[utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/control	[utf-8] Tue Sep 22 13:54:57 2015
@@ -6,7 +6,7 @@
 Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Iain Lane <laney at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Iain Lane <laney at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: cdbs (>= 0.4.93),
                debhelper (>= 9),
                dh-autoreconf,

Modified: desktop/unstable/gdk-pixbuf/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/rules?rev=46020&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/rules	[utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/rules	[utf-8] Tue Sep 22 13:54:57 2015
@@ -9,7 +9,7 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-DEB_MAKE_CHECK_TARGET = check
+DEB_MAKE_CHECK_TARGET = check VERBOSE=1
 DEB_CONFIGURE_EXTRA_FLAGS := --with-x11 \
                              --enable-introspection \
                              --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)