Remove libwayland-dev from build-conflicts, the conflict renders the

build-depends uninstallable thanks to gstreamer.

diff --git a/debian/changelog b/debian/changelog
index 4260dad1f449b5fa2372888366e0fed1fb81a096..7f8ea018547ba96e1a32618fdfbec7a65e714b8f 100644 (file)
--- 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 <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.
+  
+  [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 <root@raspbian.org>  Sun, 23 Sep 2018 15:51:41 +0000
 

diff --git a/debian/control b/debian/control
index b1b0886dfc3616edaa4bfe64410309b49df77ef9..79c1949f04389bfecb56442d745b374bfcb9bd8f 100644 (file)
--- 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 13533c87405e5eafb0d2be4193ddf8cbcf509b76..1cec10a1d6941c280cc85cdce9dc5fa85dd4aa3a 100644 (file)
--- 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