[neon/qt/qtbase/Neon/testing] debian: Add Conflicts: against the -gles packages, to make that relation mutual.

[Dmitry Shachnev]

Git commit 4064bf01d808094d740f2b96da8d370350d9b519 by Dmitry Shachnev.
Committed on 30/01/2021 at 17:46.
Pushed by sitter into branch 'Neon/testing'.

Add Conflicts: against the -gles packages, to make that relation mutual.

Thanks to David Kalnischkies [1] for the suggestion. See also [2].

[1]: https://lists.debian.org/debian-devel/2021/01/msg00431.html
[2]: https://bugs.debian.org/976389

M  +3    -0    debian/changelog
M  +3    -0    debian/control

https://invent.kde.org/neon/qt/qtbase/commit/4064bf01d808094d740f2b96da8d370350d9b519

diff --git a/debian/changelog b/debian/changelog
index 373ac79..da36ad6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtbase-opensource-src (5.15.2+dfsg-4) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Add Conflicts: against the -gles packages, to make that relation mutual.
+    (Thanks to David Kalnischkies for the suggestion; see also #976389.)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 30 Jan 2021 20:38:06 +0300
 
diff --git a/debian/control b/debian/control
index d126d5c..fb5201d 100644
--- a/debian/control
+++ b/debian/control
@@ -109,6 +109,7 @@ Breaks: libqt5egldeviceintegration5 (<< 5.6.0~beta+dfsg-5~),
         libqt5xcbqpa5 (<< 5.6.0~beta+dfsg-5~)
 Replaces: libqt5egldeviceintegration5 (<< 5.6.0~beta+dfsg-5~),
           libqt5xcbqpa5 (<< 5.6.0~beta+dfsg-5~)
+Conflicts: libqt5gui5-gles
 Suggests: qt5-image-formats-plugins, qtwayland5
 Description: Qt 5 GUI module
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -370,6 +371,7 @@ Breaks: qt5-qmake (<< 5.11.3+dfsg-3~),
 Replaces: qt5-qmake (<< 5.11.3+dfsg-3~),
           qtbase5-dev-tools (<< 5.12.5+dfsg-3~),
           qtbase5-private-dev (<< 5.11.3+dfsg-5~)
+Conflicts: qtbase5-gles-dev
 Description: Qt 5 base development files
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -391,6 +393,7 @@ Depends: libfontconfig1-dev,
          ${misc:Depends}
 Breaks: qt5-qmake (<< 5.11.3+dfsg-3~), qtbase5-dev (<< 5.11.2+dfsg-4~)
 Replaces: qt5-qmake (<< 5.11.3+dfsg-3~), qtbase5-dev (<< 5.11.2+dfsg-4~)
+Conflicts: qtbase5-private-gles-dev
 Description: Qt 5 base private development files
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.