[neon/neon-packaging/digikam/Neon/stable] debian: x-neon-merged:

[Carlos De Maine]

Git commit 7bb5046d3ae6e67bf01896cebdffcb584dfe5f69 by Carlos De Maine.
Committed on 20/01/2024 at 06:48.
Pushed by carlosdem into branch 'Neon/stable'.

x-neon-merged:

M  +22   -2    debian/control
A  +5    -0    debian/digikam-dev.install
A  +8    -0    debian/digikam.install
M  +5    -2    debian/digikam.lintian-overrides
M  +4    -1    debian/source/lintian-overrides

https://invent.kde.org/neon/neon-packaging/digikam/-/commit/7bb5046d3ae6e67bf01896cebdffcb584dfe5f69

diff --git a/debian/control b/debian/control
index 4d5d63b..1c9298d 100644
--- a/debian/control
+++ b/debian/control
@@ -62,7 +62,7 @@ Build-Depends: bison,
                libxslt1-dev,
                libxv-dev,
                pkg-config,
-               pkg-kde-tools (>= 0.15.20~),
+               pkg-kde-tools-neon,
                portaudio19-dev,
                qt6-base-dev,
                qt6-multimedia-dev,
@@ -81,12 +81,21 @@ Maintainer: Neon CI <neon at kde.org>
 
 Package: digikam
 Architecture: any
+X-Neon-MergedPackage: true
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${perl:Depends},
          ${shlibs:Depends}
 Recommends: ffmpegthumbs, www-browser
 Suggests: systemsettings
-Breaks: avplayer, digikam-data, digikam-dev, digikam-doc, showfoto
+Provides: avplayer,
+          digikam-data, 
+          digikam-doc, 
+          showfoto,
+Replaces: avplayer,
+          digikam-data, 
+          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
@@ -115,3 +124,14 @@ 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.
+
+Package: digikam-dev
+Architecture: any
+X-Neon-MergedPackage: true
+Multi-Arch: same
+Depends: digikam
+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.
+ .
+ Developmnet files and libraries.
\ No newline at end of file
diff --git a/debian/digikam-dev.install b/debian/digikam-dev.install
new file mode 100644
index 0000000..a16e5e7
--- /dev/null
+++ b/debian/digikam-dev.install
@@ -0,0 +1,5 @@
+usr/include/
+usr/lib/*/cmake/
+usr/lib/*/libdigikamcore.so
+usr/lib/*/libdigikamdatabase.so
+usr/lib/*/libdigikamgui.so
\ No newline at end of file
diff --git a/debian/digikam.install b/debian/digikam.install
new file mode 100644
index 0000000..d2948b6
--- /dev/null
+++ b/debian/digikam.install
@@ -0,0 +1,8 @@
+usr/bin/
+usr/lib/*/qt6/plugins/
+usr/share/applications/
+usr/share/digikam/
+usr/share/icons/
+usr/share/metainfo/
+usr/share/kxmlgui5/
+usr/share/locale
\ No newline at end of file
diff --git a/debian/digikam.lintian-overrides b/debian/digikam.lintian-overrides
index e42c47f..c6e6de2 100644
--- a/debian/digikam.lintian-overrides
+++ b/debian/digikam.lintian-overrides
@@ -1,5 +1,8 @@
 digikam: desktop-mime-but-no-exec-code usr/share/applications/org.kde.digikam.desktop
 
-digikam: embedded-library libraw usr/lib/*/libdigikamcore.so.8.2.0
+digikam: embedded-library libraw usr/lib/*/libdigikamcore.so.*
 
-digikam: package-name-doesnt-match-sonames libdigikamcore8.2.0 libdigikamdatabase8.2.0 libdigikamgui8.2.0
+digikam: package-name-doesnt-match-sonames libdigikamcore8.* libdigikamdatabase8.* libdigikamgui8.*
+
+digikam: no-manual-page usr/bin/digikam
+digikam: no-manual-page usr/bin/showfoto
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 2f559dc..ccb5368 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -5,4 +5,7 @@ digikam source: source-is-missing core/data/about/js/jquery.min.js
 digikam source: source-is-missing core/dplugins/generic/tools/htmlgallery/themes/elegant/resources/js/lytebox.js
 digikam source: source-is-missing core/dplugins/generic/tools/htmlgallery/themes/html5responsive/resources/js/photoswipe-ui-default.min.js
 digikam source: source-is-missing core/dplugins/generic/tools/htmlgallery/themes/html5responsive/resources/js/photoswipe.min.js
-digikam source: source-is-missing core/dplugins/generic/tools/htmlgallery/themes/vanilla/resources/js/lytebox.js
\ No newline at end of file
+digikam source: source-is-missing core/dplugins/generic/tools/htmlgallery/themes/vanilla/resources/js/lytebox.js
+
+digikam source: source-contains-prebuilt-windows-binary project/bundles/vcpkg/data/opengl32sw.dll
+digikam source: vcs-obsolete-in-debian-infrastructure Svn svn://anonscm.debian.org/pkg-kde/kde-extras/digikam/trunk
\ No newline at end of file