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

diff --cc debian/changelog
index 372b094dd2bf6424504dedbc03bd6185731b1fd9,401d49ce2de03bea050930ac163ac27b91dab588..4260dad1f449b5fa2372888366e0fed1fb81a096
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,29 +1,41 @@@
- cogl (1.22.2-3+rpi1) buster-staging; urgency=medium
++cogl (1.22.2-5+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 27 Dec 2017 20:06:04 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 23 Sep 2018 15:51:41 +0000
++
+ cogl (1.22.2-5) unstable; urgency=medium
+ 
+   * Fix incomplete package description for gir1.2-coglgst-2.0 (Closes: #787516)
+   * Don't run build tests on armel since they hang on Debian's buildds there.
+     The tests don't pass on any of our architectures anyway.
+ 
+  -- Jeremy Bicha <jbicha@debian.org>  Mon, 17 Sep 2018 09:44:04 -0400
+ 
+ cogl (1.22.2-4) unstable; urgency=medium
+ 
+   [ Jeremy Bicha ]
+   * Update Vcs fields for migration to https://salsa.debian.org/
+   * debian/libcogl20.symbols: Add symbol exposed by compiler changes
+     (Closes: #895732)
+   * Bump Standards-Version to 4.2.1
+ 
+   [ Simon McVittie ]
+   * Remove obsolete Breaks on pre-jessie versions of cogl
+   * Add versioned Provides for gir1.2-cogl-2.0 and gir1.2-coglpango-2.0,
+     the canonical names for the packages containing Cogl-2.0.typelib and
+     CoglPango-2.0.typelib. Note that despite the packages' names, there
+     is no Cogl-1.0.typelib or CoglPango-1.0.typelib.
+   * Depend on libgl1 and libgles2 instead of transitional packages
+     libgl1-mesa-glx and libgles2-mesa (Closes: #905974)
+ 
+  -- Jeremy Bicha <jbicha@debian.org>  Sun, 16 Sep 2018 13:04:26 -0400
  
  cogl (1.22.2-3) unstable; urgency=medium
  

diff --cc debian/control
index 2dcdca63c53fa96b75b1d59bb72fc8fecd739cb6,6a43d276bed5b0598eed05f9d1091e204285dbb4..b1b0886dfc3616edaa4bfe64410309b49df77ef9
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -25,11 -27,9 +25,11 @@@ Build-Depends: debhelper (>= 11)
                 gobject-introspection (>= 1.33.4-1~),
                 libgirepository1.0-dev (>= 0.9.12),
                 libgstreamer-plugins-base1.0-dev
- 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
 +Build-Conflicts:
 +               libwayland-dev (>= 1.1.90)
 -Vcs-Browser: https://salsa.debian.org/gnome-team/clutter
+ Standards-Version: 4.2.1
+ Vcs-Git: https://salsa.debian.org/gnome-team/clutter.git
++Vcs-Browser: https://salsa.debian.org/gnome-team/clutter
  
  Package: libcogl20
  Architecture: any
@@@ -206,13 -207,13 +205,13 @@@ Description: GObject introspection dat
   dynamic bindings for libcogl-pango.
  
  Package: libcogl-gles2-20
 -Architecture: any
 +Architecture: kfreebsd-any
  Depends: ${shlibs:Depends},
           ${misc:Depends},
-          libgl1-mesa-glx [!armel !armhf ],
-          libgles2-mesa [armel armhf] | libgles2 [armel armhf]
+          libgl1 [!armel !armhf],
+          libgles2 [armel armhf]
  Recommends: libcogl-common
- Suggests: libgles2-mesa | libgles2, libgl1-mesa-glx
+ Suggests: libgles2, libgl1
  Replaces: libcogl12 (<< 1.13.4-2)
  Multi-Arch: same
  Description: Object oriented GL/GLES Abstraction/Utility Layer

diff --cc debian/control.in
index 9d14340c79668715cfb63339a0e09b834f5117c0,6900dc43e35e5c652e949eea66112564ef2befd7..13533c87405e5eafb0d2be4193ddf8cbcf509b76
--- 1/debian/control.in
--- 2/debian/control.in
+++ b/debian/control.in
@@@ -21,11 -23,9 +21,11 @@@ Build-Depends: debhelper (>= 11)
                 gobject-introspection (>= 1.33.4-1~),
                 libgirepository1.0-dev (>= 0.9.12),
                 libgstreamer-plugins-base1.0-dev
- 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
 +Build-Conflicts:
 +               libwayland-dev (>= 1.1.90)
 -Vcs-Browser: https://salsa.debian.org/gnome-team/clutter
+ Standards-Version: 4.2.1
+ Vcs-Git: https://salsa.debian.org/gnome-team/clutter.git
++Vcs-Browser: https://salsa.debian.org/gnome-team/clutter
  
  Package: libcogl20
  Architecture: any
@@@ -202,13 -203,13 +201,13 @@@ Description: GObject introspection dat
   dynamic bindings for libcogl-pango.
  
  Package: libcogl-gles2-20
 -Architecture: any
 +Architecture: kfreebsd-any
  Depends: ${shlibs:Depends},
           ${misc:Depends},
-          libgl1-mesa-glx [!armel !armhf ],
-          libgles2-mesa [armel armhf] | libgles2 [armel armhf]
+          libgl1 [!armel !armhf],
+          libgles2 [armel armhf]
  Recommends: libcogl-common
- Suggests: libgles2-mesa | libgles2, libgl1-mesa-glx
+ Suggests: libgles2, libgl1
  Replaces: libcogl12 (<< 1.13.4-2)
  Multi-Arch: same
  Description: Object oriented GL/GLES Abstraction/Utility Layer

diff --cc debian/libcogl20.symbols
Simple merge

diff --cc debian/rules
Simple merge