From: Peter Michael Green <plugwash@raspbian.org>
Date: Fri, 7 Jun 2024 07:48:46 +0000 (+0000)
Subject: Add build-conflicts on libts-dev.
X-Git-Tag: archive/raspbian/5.15.13+dfsg-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fb95d9f4b07306d7aee80e354cd3271eee3c1cec;p=qtbase-opensource-src.git

Add build-conflicts on libts-dev.
---

diff --git a/debian/changelog b/debian/changelog
index fa0869bf8..407259ddf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ qtbase-opensource-src (5.15.13+dfsg-2+rpi1) trixie-staging; urgency=medium
   [changes introduced in 5.9.1+dfsg-9+rpi1 by Peter Michael Green]
   * Disable neon (-no-neon no longer seems to work, so edit configure.json instead)
 
+  [changes introduced in 5.15.13+dfsg-2+rpi1 by Peter Michael Green]
+  * Add build-conflicts on libts-dev to avoid unwanted extra files.
+
  -- Peter Michael Green <plugwash@raspbian.org>  Fri, 07 Jun 2024 00:44:36 +0000
 
 qtbase-opensource-src (5.15.13+dfsg-2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 11d3a11c8..527782c3a 100644
--- a/debian/control
+++ b/debian/control
@@ -73,6 +73,8 @@ Build-Depends: debhelper-compat (= 13),
                qt5-qmake-bin <cross>,
                unixodbc-dev,
                zlib1g-dev
+Build-Conflicts:
+               libts-dev
 Build-Depends-Indep: qdoc-qt5 (>= 5.15~) <!nodoc>,
                      qhelpgenerator-qt5 (>= 5.15~) <!nodoc>,
                      qtattributionsscanner-qt5 <!nodoc>