From 247b74ddb98a86ff20adeaf5a1365853c50e7235 Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Thu, 27 Sep 2018 14:17:28 +0000 Subject: [PATCH] Remove libwayland-dev from build-conflicts, the conflict renders the build-depends uninstallable thanks to gstreamer. --- debian/changelog | 4 ++++ debian/control | 2 -- debian/control.in | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4260dad..7f8ea01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,10 @@ cogl (1.22.2-5+rpi1) buster-staging; urgency=medium [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. + + [changes introduced in 1.22.2-5+rpi1 by Peter Michael Green] + * Remove libwayland-dev from build-conflicts, the conflict renders the + build-depends uninstallable thanks to gstreamer. -- Raspbian forward porter Sun, 23 Sep 2018 15:51:41 +0000 diff --git a/debian/control b/debian/control index b1b0886..79c1949 100644 --- a/debian/control +++ b/debian/control @@ -25,8 +25,6 @@ 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.2.1 Vcs-Git: https://salsa.debian.org/gnome-team/clutter.git Vcs-Browser: https://salsa.debian.org/gnome-team/clutter diff --git a/debian/control.in b/debian/control.in index 13533c8..1cec10a 100644 --- a/debian/control.in +++ b/debian/control.in @@ -21,8 +21,6 @@ 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.2.1 Vcs-Git: https://salsa.debian.org/gnome-team/clutter.git Vcs-Browser: https://salsa.debian.org/gnome-team/clutter -- 2.30.2