r53255 - in /desktop/experimental/clutter-1.0/debian: ./ patches/

[jbicha at users.alioth.debian.org]

Author: jbicha
Date: Thu Aug 31 16:59:11 2017
New Revision: 53255

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=53255
Log:
Merge 1.26.2+dfsg-1 from unstable

Removed:
    desktop/experimental/clutter-1.0/debian/patches/Don-t-create-the-Cogl-GLib-source-multiple-times.patch
    desktop/experimental/clutter-1.0/debian/patches/git-conform-actor-graph-Add-missing-null-termination.patch
Modified:
    desktop/experimental/clutter-1.0/debian/changelog
    desktop/experimental/clutter-1.0/debian/patches/gdk-Ensure-surface-buffer-scale-is-set.patch
    desktop/experimental/clutter-1.0/debian/patches/series

Modified: desktop/experimental/clutter-1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/clutter-1.0/debian/changelog?rev=53255&op=diff
==============================================================================
--- desktop/experimental/clutter-1.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/clutter-1.0/debian/changelog	[utf-8] Thu Aug 31 16:59:11 2017
@@ -1,4 +1,4 @@
-clutter-1.0 (1.26.0+dfsg-4) experimental; urgency=medium
+clutter-1.0 (1.26.2+dfsg-2) UNRELEASED; urgency=medium
 
   * Convert from cdbs to dh
   * Bump debhelper compat to 10
@@ -15,6 +15,16 @@
     - Fix actor-graph test on some architectures
 
  -- Jeremy Bicha <jbicha at ubuntu.com>  Tue, 09 May 2017 12:59:53 +0100
+
+clutter-1.0 (1.26.2+dfsg-1) unstable; urgency=medium
+
+  * New upstream release.
+  * debian/patches/Don-t-create-the-Cogl-GLib-source-multiple-times.patch:
+    dropped, merged upstream.
+  * debian/patches/gdk-Ensure-surface-buffer-scale-is-set.patch:
+    mangle to apply again.
+
+ -- Andreas Henriksson <andreas at fatal.se>  Sun, 02 Jul 2017 07:14:31 +0200
 
 clutter-1.0 (1.26.0+dfsg-3) unstable; urgency=medium
 

Modified: desktop/experimental/clutter-1.0/debian/patches/gdk-Ensure-surface-buffer-scale-is-set.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/clutter-1.0/debian/patches/gdk-Ensure-surface-buffer-scale-is-set.patch?rev=53255&op=diff
==============================================================================
--- desktop/experimental/clutter-1.0/debian/patches/gdk-Ensure-surface-buffer-scale-is-set.patch	[utf-8] (original)
+++ desktop/experimental/clutter-1.0/debian/patches/gdk-Ensure-surface-buffer-scale-is-set.patch	[utf-8] Thu Aug 31 16:59:11 2017
@@ -16,11 +16,9 @@
  clutter/gdk/clutter-stage-gdk.c | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
 
-diff --git a/clutter/gdk/clutter-stage-gdk.c b/clutter/gdk/clutter-stage-gdk.c
-index 742de58..b4cc4d4 100644
 --- a/clutter/gdk/clutter-stage-gdk.c
 +++ b/clutter/gdk/clutter-stage-gdk.c
-@@ -227,7 +227,14 @@ clutter_stage_gdk_wayland_surface (ClutterStageGdk *stage_gdk)
+@@ -232,7 +232,14 @@
  
    if (!stage_gdk->foreign_window ||
        gdk_window_get_window_type (stage_gdk->window) != GDK_WINDOW_CHILD)
@@ -34,8 +32,5 @@
 +      return surface;
 +    }
  
-   if (stage_gdk->clutter_surface)
-     return stage_gdk->clutter_surface;
--- 
-2.10.2
-
+   if (stage_gdk->subsurface)
+     goto out;

Modified: desktop/experimental/clutter-1.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/clutter-1.0/debian/patches/series?rev=53255&op=diff
==============================================================================
--- desktop/experimental/clutter-1.0/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/clutter-1.0/debian/patches/series	[utf-8] Thu Aug 31 16:59:11 2017
@@ -1,6 +1,4 @@
 01_do-not-build-cookbook.patch
-Don-t-create-the-Cogl-GLib-source-multiple-times.patch
 Rely-on-gdk-to-dispatch-wayland-events.patch
 gdk-Ensure-surface-buffer-scale-is-set.patch
-git-conform-actor-graph-Add-missing-null-termination.patch
 skip-failing-tests.patch