Merge version 1.26.0+dfsg-2+rpi1 and 1.26.0+dfsg-3 to produce 1.26.0+dfsg-3+rpi1

diff --cc debian/changelog
index 9b39ab9c4523d20c737dacc6f0cb5fa73b4dde94,2343a7c897f951e54d3da2f186ae5d63c0221c92..bb86ab082efe56201c600eb0820369f634d930e7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,9 +1,19 @@@
- clutter-1.0 (1.26.0+dfsg-2+rpi1) stretch-staging; urgency=medium
++clutter-1.0 (1.26.0+dfsg-3+rpi1) stretch-staging; urgency=medium
 +
 +  [changes brought forward from 1.24.0-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 25 Sep 2015 00:25:32 +0000]
 +  * Disable wayland and egl support.
 +  * Move libwayland-dev from depends to build-conflicts (not sure why it doesn't
 +    seem to be in build-depends). attempting to disable wayland
 +    from debian/rules doesn't seem to work.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 04 Dec 2016 06:26:42 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 16 Mar 2017 22:08:58 +0000
++
+ clutter-1.0 (1.26.0+dfsg-3) unstable; urgency=medium
+ 
+   * Remove broken /usr/share/doc/libclutter-1.0-doc/html-cally symlink.
+     (Closes: #857519)
+ 
+  -- Michael Biebl <biebl@debian.org>  Sun, 12 Mar 2017 09:23:59 +0100
  
  clutter-1.0 (1.26.0+dfsg-2) unstable; urgency=medium