Merge version 1.22.2-2+rpi1 and 1.22.2-3 to produce 1.22.2-3+rpi1

diff --cc debian/changelog
index b2de89cbbc7bceead72143b7d1542ca878afef58,2f71b28e62d1a33a621b06aa7092eb296607aafa..372b094dd2bf6424504dedbc03bd6185731b1fd9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,16 +1,28 @@@
- cogl (1.22.2-2+rpi1) stretch-staging; urgency=medium
++cogl (1.22.2-3+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 1.18.2-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 07 Jan 2015 02:29:18 +0000]
 +  * Switch to regular opengl and disable egl/gles to avoid conflicting with
 +    raspberry pi foundation libraries.
 +
 +  [changes brought forward from 1.22.0-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Fri, 25 Sep 2015 01:24:58 +0000]
 +  * Move libwayland-dev from Depends and Build-depends to build-conflicts.
 +    Wayland without EGL seems to be a problem combination.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 29 Sep 2016 15:26:58 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 27 Dec 2017 20:06:04 +0000
++
+ cogl (1.22.2-3) unstable; urgency=medium
+ 
+   * Add debian/patches/fix-undef-build-failure.patch:
+     - Patch from Bugzilla to fix kfreebsd build failure
+   * Update Vcs fields for conversion to git
+   * Add Multi-Arch metadata, thanks multiarch hinter
+   * Add debian/gbp.conf
+   * Run build tests with xvfb, but still don't fail build for test failures
+   * Bump debhelper compat to 11
+   * Bump Standards-Version to 4.1.2
+   * Build with all hardening flags
+ 
+  -- Jeremy Bicha <jbicha@debian.org>  Tue, 19 Dec 2017 16:24:19 -0500
  
  cogl (1.22.2-2) unstable; urgency=medium
  

diff --cc debian/control
index 131ce98db3350aedca738d24f1b4fbe409f7f628,3020bf583536ab9d81b29fddb2a34c5a397e7c2f..2dcdca63c53fa96b75b1d59bb72fc8fecd739cb6
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -24,20 -27,18 +25,19 @@@ Build-Depends: debhelper (>= 11)
                 gobject-introspection (>= 1.33.4-1~),
                 libgirepository1.0-dev (>= 0.9.12),
                 libgstreamer-plugins-base1.0-dev
- Standards-Version: 3.9.8
- Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/cogl
- Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/cogl/
 +Build-Conflicts:
 +               libwayland-dev (>= 1.1.90)
+ Standards-Version: 4.1.2
+ Vcs-Git: https://anonscm.debian.org/git/pkg-gnome/cogl.git
+ Vcs-Browser: https://anonscm.debian.org/git/pkg-gnome/cogl.git
  
  Package: libcogl20
  Architecture: any
  Depends: ${shlibs:Depends},
           ${misc:Depends},
 -         libgl1-mesa-glx [!armel !armhf ],
 -         libgles2-mesa [armel armhf] | libgles2 [armel armhf]
 +         libgl1-mesa-glx
  Recommends: libcogl-common
  Suggests: libgles2-mesa | libgles2, libgl1-mesa-glx
- Pre-Depends: ${misc:Pre-Depends}
  Breaks: libclutter-1.0-0 (<< 1.17),
          libcogl9,
          libcogl11,
@@@ -224,7 -228,8 +225,8 @@@ Description: Object oriented GL/GLES Ab
  
  Package: libcogl-gles2-dev
  Section: libdevel
 -Architecture: any
 +Architecture: kfreebsd-any
+ Multi-Arch: same
  Depends: libcogl-gles2-20 (= ${binary:Version}),
           libcogl-dev (= ${binary:Version}),
           ${misc:Depends},

diff --cc debian/control.in
index 663118aaf405c8fea1fe2325e9d8f0b95023f259,505346160c55f61569c5249d0878e60afdf215d8..9d14340c79668715cfb63339a0e09b834f5117c0
--- 1/debian/control.in
--- 2/debian/control.in
+++ b/debian/control.in
@@@ -20,20 -23,18 +21,19 @@@ Build-Depends: debhelper (>= 11)
                 gobject-introspection (>= 1.33.4-1~),
                 libgirepository1.0-dev (>= 0.9.12),
                 libgstreamer-plugins-base1.0-dev
- Standards-Version: 3.9.8
- Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/cogl
- Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/cogl/
 +Build-Conflicts:
 +               libwayland-dev (>= 1.1.90)
+ Standards-Version: 4.1.2
+ Vcs-Git: https://anonscm.debian.org/git/pkg-gnome/cogl.git
+ Vcs-Browser: https://anonscm.debian.org/git/pkg-gnome/cogl.git
  
  Package: libcogl20
  Architecture: any
  Depends: ${shlibs:Depends},
           ${misc:Depends},
 -         libgl1-mesa-glx [!armel !armhf ],
 -         libgles2-mesa [armel armhf] | libgles2 [armel armhf]
 +         libgl1-mesa-glx
  Recommends: libcogl-common
  Suggests: libgles2-mesa | libgles2, libgl1-mesa-glx
- Pre-Depends: ${misc:Pre-Depends}
  Breaks: libclutter-1.0-0 (<< 1.17),
          libcogl9,
          libcogl11,
@@@ -220,7 -224,8 +221,8 @@@ Description: Object oriented GL/GLES Ab
  
  Package: libcogl-gles2-dev
  Section: libdevel
 -Architecture: any
 +Architecture: kfreebsd-any
+ Multi-Arch: same
  Depends: libcogl-gles2-20 (= ${binary:Version}),
           libcogl-dev (= ${binary:Version}),
           ${misc:Depends},

diff --cc debian/libcogl20.symbols
Simple merge

diff --cc debian/rules
index 6316870f99f2c08671ab7a1fa57f6a5f83e15b94,82b28a5921f2c634f78cfc302707b7811ae0c7f7..f35bb30d25e1c4b537c6c06d30fac120e8ab71fd
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -1,25 -1,30 +1,30 @@@
  #!/usr/bin/make -f
+ -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
  
- include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
  
  %:
-       dh $@ --with autoreconf,gir,gnome
+       dh $@ --with gir,gnome
  
 -ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),armel armhf))
 -CONFFLAGS += \
 -      --with-default-driver=gles2
 -else
 +#ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),armel armhf))
 +#CONFFLAGS += \
 +#     --with-default-driver=gles2
 +#else
  CONFFLAGS += \
        --with-default-driver=gl
 -endif
 +#endif
  
 -ifeq ($(DEB_HOST_ARCH_OS),linux)
 -CONFFLAGS += \
 -      --enable-wayland-egl-platform \
 -      --enable-wayland-egl-server \
 -      --enable-kms-egl-platform
 -endif
 +#ifeq ($(DEB_HOST_ARCH_OS),linux)
 +#CONFFLAGS += \
 +#     --enable-wayland-egl-platform \
 +#     --enable-wayland-egl-server \
 +#     --enable-kms-egl-platform
 +#endif
  
+ override_dh_autoreconf:
+       dh_autoreconf --as-needed
+ 
  override_dh_auto_configure:
        dh_auto_configure -- \
                --enable-gtk-doc \