[neon/neon-packaging/digikam/Neon/unstable] debian: Service Solid

[Jonathan Esk-Riddell]

Git commit 256b7d345fa685dbeba4b35eb08c18e4a64c2727 by Jonathan Esk-Riddell.
Committed on 19/01/2024 at 13:37.
Pushed by jriddell into branch 'Neon/unstable'.

Service Solid

M  +19   -18   debian/control

https://invent.kde.org/neon/neon-packaging/digikam/-/commit/256b7d345fa685dbeba4b35eb08c18e4a64c2727

diff --git a/debian/control b/debian/control
index b730622..739bdb4 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,17 @@ Build-Depends: bison,
                flex,
                glslang-dev,
                graphviz,
-               libass-dev, 
+               kf6-kcalendarcore-dev,
+               kf6-kfilemetadata-dev,
+               kf6-knotifications-dev,
+               kf6-knotifyconfig-dev,
+               kf6-kservice-dev,
+               kf6-ktexttemplate-dev,
+               kf6-solid-dev,
+               kf6-threadweaver-dev,
+               kpim6-akonadi-contacts-dev,
+               kpim6-akonadi-dev,
+               libass-dev,
                libavcodec-dev,
                libavdevice-dev,
                libavfilter-dev,
@@ -22,20 +32,12 @@ Build-Depends: bison,
                libexiv2-dev,
                libexpat1-dev | libexpat-dev,
                libglu1-mesa-dev,
-               libgphoto2-dev,
                libgomp1,
+               libgphoto2-dev,
                libheif-dev,
                libjasper-dev,
                libjpeg-dev,
-               kpim6-akonadi-dev,
-               kpim6-akonadi-contacts-dev,
-               kf6-kcalendarcore-dev,
-               kf6-kfilemetadata-dev,
-               kf6-ktexttemplate-dev,
-               kf6-knotifications-dev,
-               kf6-knotifyconfig-dev,
                libksane-dev,
-               kf6-threadweaver-dev,
                libksanecore-dev,
                liblcms2-dev,
                liblensfun-dev,
@@ -48,10 +50,6 @@ Build-Depends: bison,
                libopencv-dnn-dev,
                libpng-dev,
                libpulse-dev,
-               qt6-networkauth-dev,
-	       qt6-scxml-dev,
-               qt6-svg-dev,
-               qt6-webview-dev,
                libqtav-dev,
                libswscale-dev,
                libtiff-dev,
@@ -67,7 +65,11 @@ Build-Depends: bison,
                portaudio19-dev,
                qt6-base-dev,
                qt6-multimedia-dev,
-               qt6-webengine-dev
+               qt6-networkauth-dev,
+               qt6-scxml-dev,
+               qt6-svg-dev,
+               qt6-webengine-dev,
+               qt6-webview-dev
 Build-Conflicts: libgraphicsmagick1-dev
 Standards-Version: 4.6.2
 Vcs-Svn: svn://anonscm.debian.org/pkg-kde/kde-extras/digikam/trunk
@@ -84,8 +86,8 @@ Depends: digikam-data (= ${source:Version}),
          ${shlibs:Depends}
 Recommends: ffmpegthumbs, www-browser
 Suggests: systemsettings
-Breaks: showfoto, digikam-dev, digikam-data, digikam-doc, avplayer
-Conflicts: showfoto, digikam-dev, digikam-data, digikam-doc, avplayer
+Breaks: avplayer, digikam-data, digikam-dev, digikam-doc, showfoto
+Conflicts: avplayer, digikam-data, digikam-dev, digikam-doc, showfoto
 Description: digital photo management application for KDE
  Digital photo management program designed to import, organize, enhance, search
  and export your digital images to and from your computer.
@@ -113,4 +115,3 @@ Description: digital photo management application for KDE
  by the dozens. It is fully 16 bit enabled including all available plugins,
  supports RAW format conversion through libraw, DNG export and ICC color
  management work flow.
-