[neon/extras/phonon/Neon/unstable] debian: Revert "Revert "breaks and conflicts old package names""

[Carlos De Maine]

Git commit d185f2808a76a06cd08352fa08b323442108eecc by Carlos De Maine.
Committed on 19/08/2023 at 23:00.
Pushed by carlosdem into branch 'Neon/unstable'.

Revert "Revert "breaks and conflicts old package names""

This reverts commit c310f6ef2a8cb3144e0e55323c2387c5dfe3b2de.

M  +16   -4    debian/control
M  +1    -1    debian/qt5-phonon.install

https://invent.kde.org/neon/extras/phonon/-/commit/d185f2808a76a06cd08352fa08b323442108eecc

diff --git a/debian/control b/debian/control
index b6a4f80..724573d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Modestas Vainius <modax at debian.org>,
            Diane Trout <diane at ghic.org>,
            Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
-           Maximiliano Curia <maxy at debian.org>,
+           Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake,
                debhelper-compat(= 13),
                dpkg-dev,
@@ -14,11 +14,11 @@ Build-Depends: cmake,
                libpulse-dev,
                libqt5opengl5-dev,
                pkg-kde-tools-neon,
-               qtbase5-dev,
-               qttools5-dev,
                qt6-5compat-dev,
                qt6-base-dev,
-               qt6-tools-dev
+               qt6-tools-dev,
+               qtbase5-dev,
+               qttools5-dev
 Standards-Version: 4.6.2
 Homepage: https://phonon.kde.org/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/phonon
@@ -95,6 +95,14 @@ Architecture: any
 Section: kde
 X-Neon-MergedPackage: true
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libphonon4qt5-4 (<< ${source:Version}~ciBuild),
+        libphonon4qt5-data(<< ${source:Version}~ciBuild),
+        libphonon4qt5experimental4 (<< ${source:Version}~ciBuild),
+        phonon4qt5settings (<< ${source:Version}~ciBuild)
+Conflicts: libphonon4qt5-4 (<< ${source:Version}~ciBuild),
+           libphonon4qt5-data(<< ${source:Version}~ciBuild),
+           libphonon4qt5experimental4 (<< ${source:Version}~ciBuild),
+           phonon4qt5settings (<< ${source:Version}~ciBuild)
 Description: multimedia framework from KDE using Qt5 - core libraries
  Phonon5is a Qt5 multimedia API, which provides a task-oriented abstraction
  layer for capturing, mixing, processing, and playing audio and video content.
@@ -107,6 +115,10 @@ Architecture: any
 Section: kde
 X-Neon-MergedPackage: true
 Depends: qt5-phonon (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Breaks: libphonon4qt5-dev (<< ${source:Version}~ciBuild),
+        libphonon4qt5experimental-dev
+Conflicts: libphonon4qt5-dev (<< ${source:Version}~ciBuild),
+           libphonon4qt5experimental-dev
 Description: multimedia framework from KDE using Qt5 - development files
  Phonon5 is a Qt5 multimedia API, which provides a task-oriented abstraction
  layer for capturing, mixing, processing, and playing audio and video content.
diff --git a/debian/qt5-phonon.install b/debian/qt5-phonon.install
index 106930c..cef13b7 100644
--- a/debian/qt5-phonon.install
+++ b/debian/qt5-phonon.install
@@ -1,5 +1,5 @@
+usr/bin/phononsettings
 usr/lib/*/libphonon4qt5.so.4
 usr/lib/*/libphonon4qt5.so.4.*
 usr/lib/*/libphonon4qt5experimental.so.4
 usr/lib/*/libphonon4qt5experimental.so.4.*
-usr/bin/phononsettings