Manual merge of version 1.26.2+dfsg-1+rpi1 and 1.26.2+dfsg-3 to produce 1.26.2+dfsg...

diff --cc debian/changelog
index c607f1ea3cb6a714c9af24c6766347a229195307,f225faff62218706164829e58a74894301c111be..0573998688cdaec9f24c187db850824bbbe5960d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,32 +1,42 @@@
- clutter-1.0 (1.26.2+dfsg-1+rpi1) buster-staging; urgency=medium
++clutter-1.0 (1.26.2+dfsg-3+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 08 Jul 2017 14:18:52 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 10 Sep 2017 00:21:39 +0000
++
+ clutter-1.0 (1.26.2+dfsg-3) unstable; urgency=medium
+ 
+   * Release to unstable
+   * debian/control.in:
+     - Drop Build-Depends on libgl1-mesa-dri
+   * debian/rules:
+     - Ignore test failures on Debian. See bug 874077.
+ 
+   * Allow tests to fail the build on Ubuntu. The tests fail in Debian.
+ 
+  -- Jeremy Bicha <jbicha@debian.org>  Sat, 02 Sep 2017 17:14:56 -0400
+ 
+ clutter-1.0 (1.26.2+dfsg-2) experimental; urgency=medium
+ 
+   * Convert from cdbs to dh
+   * Bump debhelper compat to 10
+   * Add debian/libclutter-1.0-0.docs to install NEWS and README
+   * Convert to automatic dbgsym package
+   * Add autopkgtest to run clutter-1.0-tests
+   * debian/control.in:
+     - Build-depend on dbus for build tests
+     - Build-depend on libgl1-mesa-dri for build tests since Debian's
+       libgl1-mesa-glx currently only recommends it
+   * debian/rules:
+     - Allow tests to not fail the build this time
+   * Add debian/patches/skip-failing-tests.patch:
+     - Skip failing test so that we can run all the other tests
+ 
+  -- Jeremy Bicha <jbicha@debian.org>  Thu, 31 Aug 2017 13:07:16 -0400
  
  clutter-1.0 (1.26.2+dfsg-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/control.in
Simple merge

diff --cc debian/rules
index da5a21654e195e53c1ac8145c5e30c73fa4cde46,f04525015a86b6f61fb6091b148aad4a9ffcb3c0..a07db029ae9bcc2222189baac8f9a5925b27114a
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -9,27 -4,59 +4,59 @@@
  
  GNOME_MODULE = clutter
  
- LDFLAGS += -Wl,-O1 -Wl,--as-needed
- DEB_COMPRESS_EXCLUDE += .c
- DEB_DH_MAKESHLIBS_ARGS_libclutter-1.0-0 += -V -- -c4
- DEB_CONFIGURE_EXTRA_FLAGS += \
-       --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
-       --enable-x11-backend=yes \
-       --enable-gdk-backend=yes \
-       --enable-gtk-doc \
-       --disable-docs \
-       --enable-installed-tests \
-       --enable-introspection=yes
- DEB_DBG_PACKAGE_libclutter-1.0-0 := libclutter-1.0-dbg
+ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+ export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,--as-needed
  
  ifeq ($(DEB_HOST_ARCH_OS),linux)
-       DEB_CONFIGURE_EXTRA_FLAGS += \
++
+       CONFFLAGS += \
 -              --enable-wayland-backend=yes \
 -              --enable-wayland-compositor=yes \
 -              --enable-evdev-input=yes
 +              --enable-wayland-backend=no \
 +              --enable-wayland-compositor=no \
 +              --enable-evdev-input=no
  endif
  
- common-binary-predeb-arch:: list-missing
+ %:
+       dh $@ --with gir,gnome
+ 
+ override_dh_autoreconf:
+       dh_autoreconf --as-needed
+ 
+ override_dh_auto_configure:
+       dh_auto_configure -- \
+               --enable-x11-backend=yes \
+               --enable-gdk-backend=yes \
 -              --enable-egl-backend=yes \
+               --enable-gtk-doc \
+               --disable-docs \
+               --enable-installed-tests \
+               --enable-introspection=yes \
+               $(CONFFLAGS)
+ 
+ override_dh_install:
+       find debian -name '*.la' -delete
+       dh_install --fail-missing
+ 
+ override_dh_compress:
+       dh_compress -X.c
+ 
+ override_dh_gnome:
+       dh_gnome --no-gnome-versions
+ 
+ override_dh_makeshlibs:
+       dh_makeshlibs -V -- -c4
+ 
+ # See https://bugs.debian.org/874077
+ # Ignore test failures on Debian and on s390x
+ override_dh_auto_test:
+ ifneq (,$(findstring $(DEB_HOST_ARCH),"s390x"))
+       -dbus-run-session -- xvfb-run -a dh_auto_test
+ else ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
+       dbus-run-session -- xvfb-run -a dh_auto_test
+ else
+       -dbus-run-session -- xvfb-run -a dh_auto_test
+ endif
+ 
+ override_dh_strip:
+       dh_strip --dbgsym-migration='libclutter-1.0-dbg (<< 1.26.2+dfsg-2~)'
  
  get-orig-source get-packaged-orig-source:
        uscan --verbose --force-download \