Merge version 1.26.2+dfsg-3+rpi1 and 1.26.2+dfsg-4 to produce 1.26.2+dfsg-4+rpi1

diff --cc debian/changelog
index 0573998688cdaec9f24c187db850824bbbe5960d,f4f23168d93d0b5b0090ce6a060ec60a40b0891a..e1a3c5b3632e98646ca34b39905bedcb219b9a49
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,20 +1,30 @@@
- clutter-1.0 (1.26.2+dfsg-3+rpi1) buster-staging; urgency=medium
++clutter-1.0 (1.26.2+dfsg-4+rpi1) buster-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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 10 Sep 2017 00:21:39 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 27 Dec 2017 20:30:59 +0000
++
+ clutter-1.0 (1.26.2+dfsg-4) unstable; urgency=medium
+ 
+   [ Jeremy Bicha ]
+   * Don't run the build tests on s390x since they hang the build on
+     Launchpad
+   * Update Vcs fields for conversion to git
+   * Add debian/gbp.conf
+   * Bump Standards-Version to 4.1.2
+   * Bump debhelper compat to 11
+ 
+   [ Simon McVittie ]
+   * gir1.2-clutter-1.0 Provides gir1.2-cally-1.0, gir1.2-cluttergdk-1.0,
+     gir1.2-clutterx11-1.0 to reflect the various typelibs packaged
+     together
+   * Move clutter-1.0-tests from deprecated priority extra to optional
+ 
+  -- Jeremy Bicha <jbicha@debian.org>  Mon, 18 Dec 2017 22:20:53 -0500
  
  clutter-1.0 (1.26.2+dfsg-3) unstable; urgency=medium
  

diff --cc debian/control
index 49a1494dcbf7593306850c44556fc962cb67c333,e998c6e4fdda4f0f23fc5927f253a24e1ee572a1..fc91348a2ced772bb7a038a82f1d69fedb1375f0
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -37,12 -37,10 +37,12 @@@ Build-Depends: debhelper (>= 11)
                 libudev-dev (>= 136) [linux-any],
                 libgudev-1.0-dev [linux-any],
                 libxkbcommon-dev,
- Standards-Version: 3.9.8
- Homepage: http://www.clutter-project.org/
- Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/clutter-1.0
- Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/clutter-1.0/
 +Build-Conflicts:
 +               libwayland-dev
+ Standards-Version: 4.1.2
+ Homepage: https://blogs.gnome.org/clutter/
+ Vcs-Git: https://anonscm.debian.org/git/pkg-gnome/clutter.git
+ Vcs-Browser: https://anonscm.debian.org/git/pkg-gnome/clutter.git
  
  Package: libclutter-1.0-0
  Architecture: any

diff --cc debian/control.in
index 4310ef42c048a418660efbccec9b605308f852a0,1cb9f50412eecdbbdf2754158fa47ebe0b6201ba..961a419a387bde6d98383359653876ed49dcb785
--- 1/debian/control.in
--- 2/debian/control.in
+++ b/debian/control.in
@@@ -33,12 -33,10 +33,12 @@@ Build-Depends: debhelper (>= 11)
                 libudev-dev (>= 136) [linux-any],
                 libgudev-1.0-dev [linux-any],
                 libxkbcommon-dev,
- Standards-Version: 3.9.8
- Homepage: http://www.clutter-project.org/
- Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/clutter-1.0
- Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/clutter-1.0/
 +Build-Conflicts:
 +               libwayland-dev
+ Standards-Version: 4.1.2
+ Homepage: https://blogs.gnome.org/clutter/
+ Vcs-Git: https://anonscm.debian.org/git/pkg-gnome/clutter.git
+ Vcs-Browser: https://anonscm.debian.org/git/pkg-gnome/clutter.git
  
  Package: libclutter-1.0-0
  Architecture: any

diff --cc debian/rules
Simple merge