Add build-conflicts on libts-dev. archive/raspbian/5.15.13+dfsg-2+rpi1 raspbian/5.15.13+dfsg-2+rpi1
authorPeter Michael Green <plugwash@raspbian.org>
Fri, 7 Jun 2024 07:48:46 +0000 (07:48 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Fri, 7 Jun 2024 07:48:46 +0000 (07:48 +0000)
debian/changelog
debian/control

index fa0869bf853c05e2c0b86ba14b01edacf7773cbf..407259ddff045d8cf3f9fd55119710f6fad6fc2d 100644 (file)
@@ -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
index 11d3a11c8a526f3a338632baca18e05f542ecd79..527782c3ae9dcd875c2058a6611721edfc345a66 100644 (file)
@@ -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>