From: Raspbian forward pporter Date: Sun, 23 Sep 2018 15:51:42 +0000 (+0100) Subject: Merge version 1.22.2-3+rpi1 and 1.22.2-5 to produce 1.22.2-5+rpi1 X-Git-Tag: archive/raspbian/1.22.2-5+rpi1~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ec71e84a7336166d0639ed725987deae3f27741b;p=cogl.git Merge version 1.22.2-3+rpi1 and 1.22.2-5 to produce 1.22.2-5+rpi1 --- ec71e84a7336166d0639ed725987deae3f27741b diff --cc debian/changelog index 372b094,401d49c..4260dad --- a/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 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 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 Wed, 27 Dec 2017 20:06:04 +0000 ++ -- Raspbian forward porter 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 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 Sun, 16 Sep 2018 13:04:26 -0400 cogl (1.22.2-3) unstable; urgency=medium diff --cc debian/control index 2dcdca6,6a43d27..b1b0886 --- a/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 +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 + Standards-Version: 4.2.1 -Vcs-Browser: https://salsa.debian.org/gnome-team/clutter + 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 9d14340,6900dc4..13533c8 --- a/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 +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 + Standards-Version: 4.2.1 -Vcs-Browser: https://salsa.debian.org/gnome-team/clutter + 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