[neon/neon-packaging/digikam/Neon/unstable] debian: merge salsa

[Carlos De Maine]

Git commit 0b06f0e2f8eac43332801f5463cc0b63fa8c6bb0 by Carlos De Maine.
Committed on 12/02/2023 at 01:46.
Pushed by carlosdem into branch 'Neon/unstable'.

merge salsa

M  +1    -1    debian/avplayer.install
M  +42   -9    debian/rules
M  +6    -2    debian/watch [INFRASTRUCTURE]

https://invent.kde.org/neon/neon-packaging/digikam/commit/0b06f0e2f8eac43332801f5463cc0b63fa8c6bb0

diff --git a/debian/avplayer.install b/debian/avplayer.install
index c6dcc8a..267da00 100644
--- a/debian/avplayer.install
+++ b/debian/avplayer.install
@@ -1,6 +1,6 @@
 #usr/share/doc/HTML/*/avplayer
 usr/bin/avplayer
-usr/share/applications/org.kde.showfoto.desktop
+usr/share/applications/org.kde.avplayer.desktop
 usr/share/icons/hicolor/*/apps/avplayer.*
 usr/share/icons/hicolor/scalable/apps/avplayer.svgz
 usr/share/metainfo/org.kde.avplayer.appdata.xml
diff --git a/debian/rules b/debian/rules
index cffdfd4..f584e54 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+PRIVATE_LIBDIR := /usr/lib/digikam
 include /usr/share/dpkg/pkg-info.mk
 
 export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
@@ -12,36 +13,68 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 # Augment path to find gphoto2-config; workaround for #826166
 export PATH := $(PATH):/usr/lib/$(DEB_HOST_MULTIARCH)/libgphoto2-dev/bin
 
+# Architectures that support QWEBENGINE (qtwebengine5-dev)
+has_qwebengine = amd64 arm64 armhf i386 mips64el mipsel
+ENABLE_QWEBENGINE = OFF
+ifeq ($(DEB_HOST_ARCH), $(filter $(DEB_HOST_ARCH),$(has_qwebengine)))
+	ENABLE_QWEBENGINE = ON
+endif
+
 %:
 	dh $@ --with kf5 --parallel
 
 override_dh_clean:
-ifneq (,$(findstring git,$(DEB_VERSION_UPSTREAM)))
+	dh_clean
+#ifneq (,$(findstring git,$(DEB_VERSION_UPSTREAM)))
 	# When building a git snapshot adjust the tarball to include the entire
 	# Digikam software collection, just like a release tarball would.
-	ruby debian/git_extend_orig.rb
+	#ruby debian/git_extend_orig.rb
 	# There are no translations for git builds alas
-	sed -i '/locale/d' debian/digikam-data.install
-endif
-	rm -f core/data/about/js/bootstrap.min.js core/data/about/js/jquery.min.js
-	dh_clean
+	#sed -i '/locale/d' debian/digikam-data.install
+#endif
+	#rm -f core/data/about/js/bootstrap.min.js core/data/about/js/jquery.min.js
+	#dh_clean
 
 override_dh_auto_configure:
 	dh_auto_configure --buildsystem=kde -- \
+	  -DCMAKE_INSTALL_RPATH="$(PRIVATE_LIBDIR)" \
 	  -DDIGIKAMSC_COMPILE_DOC=on \
 	  -DDIGIKAMSC_COMPILE_PO=on \
 	  -DENABLE_MYSQLSUPPORT=ON \
-	  -DENABLE_APPSTYLES=ON \
 	  -DENABLE_INTERNALMYSQL=ON \
+	  -DENABLE_KFILEMETADATASUPPORT=ON \
+	  -DENABLE_AKONADICONTACTSUPPORT=ON \
 	  -DENABLE_MEDIAPLAYER=ON \
-	  -DENABLE_TESTS=OFF
+	  -DENABLE_QWEBENGINE=$(ENABLE_QWEBENGINE) \
+	  -DENABLE_APPSTYLES=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
 
 override_dh_auto_install:
 	dh_auto_install
+	# remove development stuff: headers, cmake config files, pkg-config files, .so symlinks, static libs
+	rm -rf --verbose debian/tmp/usr/include
+	rm -rf --verbose debian/tmp/usr/share/kde4/apps/cmake
+	rm -rf --verbose debian/tmp/usr/lib/cmake
+	rm -rf --verbose debian/tmp/usr/lib/*/cmake
+	rm -rf --verbose debian/tmp/usr/lib/pkgconfig
 	find debian/tmp/usr/lib -type l -name '*.so' -exec rm --verbose {} \;
+	# remove potentially conflicting oxygen icons in global icon theme
+	rm -rf --verbose debian/tmp/usr/share/icons/oxygen
+	# remove haar cascades, the versions in opencv-data will be used instead
+	rm -rf --verbose debian/tmp/usr/share/kde4/apps/libkface/haarcascades
+
+override_dh_installchangelogs:
+	dh_installchangelogs -pdigikam ChangeLog
+	dh_installchangelogs --remaining-packages
 
 override_dh_install:
-	dh_install --fail-missing
+	dh_install
+	dh_missing --fail-missing
+
+override_dh_shlibdeps:
+	dh_shlibdeps -l$(CURDIR)/debian/digikam-private-libs/$(PRIVATE_LIBDIR)
 
 override_dh_gencontrol:
 	dh_gencontrol -- -Vdigikam:Conflicts='$(CONFLICTS_SUBSTVAR)'
diff --git a/debian/watch b/debian/watch
index 3efea3d..2f1a891 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,6 @@
-version=3
-http://download.kde.org/stable/digikam/([\d.]+)/digi[kK]am-([\d.]+).tar.xz
+version=4
+
+opts=pgpmode=auto,uversionmangle=s/-/~/  \
+ https://download.kde.org/stable/digikam/@ANY_VERSION@/digikam-@ANY_VERSION@.tar.xz debian
+
+