[neon/neon-packaging/kopeninghours/Neon/release] debian: conflicts old libkopeninghours1

[Jonathan Riddell]

Git commit 816f385ad48882ccf72fc56f3c9a93dbb1988f3f by Jonathan Riddell.
Committed on 28/02/2024 at 12:27.
Pushed by jriddell into branch 'Neon/release'.

conflicts old libkopeninghours1

M  +7    -5    debian/control

https://invent.kde.org/neon/neon-packaging/kopeninghours/-/commit/816f385ad48882ccf72fc56f3c9a93dbb1988f3f

diff --git a/debian/control b/debian/control
index 820bfc0..2e588bb 100644
--- a/debian/control
+++ b/debian/control
@@ -7,16 +7,18 @@ Build-Depends: bison,
                debhelper-compat (= 13),
                extra-cmake-modules (>= 5.28.0~),
                flex,
-               libboost-python1.74-dev,
                kf6-kholidays-dev,
                kf6-ki18n-dev,
-	       qt6-base-dev,
-	       qt6-declarative-dev
+               libboost-python1.74-dev,
+               qt6-base-dev,
+               qt6-declarative-dev
 Standards-Version: 4.5.0
 
 Package: libkopeninghours1-qt6
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Replaces: libkopeninghours1
+Conflicts: libkopeninghours1
 Description: OSM opening hours expressions library
  A library for parsing and evaluating OSM opening hours expressions.
 
@@ -32,9 +34,9 @@ Description: OSM opening hours expressions library
 
 Package: qml6-module-org-kde-kopeninghours
 Architecture: any
-Depends: qml6-module-qtquick-controls,
+Depends: qml6-module-qtquick,
+         qml6-module-qtquick-controls,
          qml6-module-qtquick-layouts,
-         qml6-module-qtquick,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: OSM opening hours expressions library