[neon/neon-packaging/digikam/Neon/unstable] debian: more lints

[Carlos De Maine]

Git commit 4212f064612582ed8271dbbd384343590039ab12 by Carlos De Maine.
Committed on 25/11/2023 at 08:50.
Pushed by carlosdem into branch 'Neon/unstable'.

more lints

M  +16   -19   debian/control
M  +5    -3    debian/digikam.lintian-overrides
M  +7    -14   debian/rules

https://invent.kde.org/neon/neon-packaging/digikam/-/commit/4212f064612582ed8271dbbd384343590039ab12

diff --git a/debian/control b/debian/control
index 033e999..1a031d5 100644
--- a/debian/control
+++ b/debian/control
@@ -116,22 +116,11 @@ Description: digital photo management application for KDE
  supports RAW format conversion through libraw, DNG export and ICC color
  management work flow.
 
-Package: showfoto
-Architecture: any
-Depends: digikam (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Recommends: dolphin
-Description: image viewer/editor for KDE
- showFoto is the standalone image editor of the digiKam project.
- .
- It runs without digiKam images database support, but provides all Image Editor
- functions.
-
-Package: avplayer
+Package: digikam-dev
 Architecture: any
-Depends: digikam (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Recommends: dolphin
-Description: audio and video player for KDE
- Stand alone Audio and Video Player from digiKam Project.
+Depends: digikam (= ${binary:Version}), ${misc:Depends}
+Description: digiKam development files
+ Contains the development files used for digiKam.
 
 Package: digikam-data
 Architecture: all
@@ -152,11 +141,19 @@ Description: handbook for digiKam
  application.
  .
  This package contains the handbooks for digiKam.
+ 
+Package: showfoto
+Architecture: any
+Depends: digikam (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Description: image viewer/editor for KDE
+ showFoto is the standalone image editor of the digiKam project.
+ .
+ It runs without digiKam images database support, but provides all Image Editor
+ functions.
 
-Package: digikam-dev
+Package: avplayer
 Architecture: any
 Depends: digikam (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Description: digiKam development files
- Contains the development files used for digiKam.
+Description: audio and video player for KDE
+ Stand alone Audio and Video Player from digiKam Project.
 
- 
\ No newline at end of file
diff --git a/debian/digikam.lintian-overrides b/debian/digikam.lintian-overrides
index 050848d..e42c47f 100644
--- a/debian/digikam.lintian-overrides
+++ b/debian/digikam.lintian-overrides
@@ -1,3 +1,5 @@
-# Ignore embedded libraw because it is modified; replacing with debian's does not work
-# see https://bugs.kde.org/show_bug.cgi?id=352458
-digikam-private-libs: embedded-library usr/lib/digikam/libdigikamcore.so.5.1.0: libraw
+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: package-name-doesnt-match-sonames libdigikamcore8.2.0 libdigikamdatabase8.2.0 libdigikamgui8.2.0
diff --git a/debian/rules b/debian/rules
index 6a059a9..1241e8b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,8 +29,9 @@ override_dh_clean:
 override_dh_auto_configure:
 	dh_auto_configure --buildsystem=kde -- \
 	  -DCMAKE_INSTALL_RPATH="$(PRIVATE_LIBDIR)" \
-	  -DDIGIKAMSC_COMPILE_DOC=on \
-	  -DDIGIKAMSC_COMPILE_PO=on \
+	  -DDIGIKAMSC_CHECKOUT_DOC=ON \
+	  -DDIGIKAMSC_COMPILE_DOC=ON \
+	  -DDIGIKAMSC_COMPILE_PO=ON \
 	  -DENABLE_AKONADICONTACTSUPPORT=ON \
 	  -DENABLE_APPSTYLES=ON \
 	  -DENABLE_DBUS=ON \
@@ -42,20 +43,12 @@ override_dh_auto_configure:
 	  -DENABLE_QWEBENGINE=$(ENABLE_QWEBENGINE) \
 	  -DENABLE_SHOWFOTO=ON
 
-#	help2man -n 'digital photo management application' --no-info obj-*/core/app/digikam > debian/man/digikam.1
-#	help2man -n 'image viewer/editor' --no-info obj-*/core/showfoto/showfoto > debian/man/showfoto.1
+	help2man -n 'digital photo management application' --no-info obj-*/core/app/digikam > debian/man/digikam.1
+	help2man -n 'image viewer/editor' --no-info obj-*/core/showfoto/showfoto > debian/man/showfoto.1
 
 
-override_dh_installchangelogs:
-	dh_installchangelogs -pdigikam ChangeLog
-	dh_installchangelogs --remaining-packages
-
-override_dh_install:
-	dh_install
-	dh_missing --fail-missing
-
-override_dh_shlibdeps:
-	dh_shlibdeps -l$(CURDIR)/debian/digikam-private-libs/$(PRIVATE_LIBDIR)
+#override_dh_shlibdeps:
+#	dh_shlibdeps -l$(CURDIR)/debian/digikam-private-libs/$(PRIVATE_LIBDIR)
 
 override_dh_gencontrol:
 	dh_gencontrol -- -Vdigikam:Conflicts='$(CONFLICTS_SUBSTVAR)'