[neon/neon-packaging/digikam/Neon/stable] debian: Neon/unstable

Thu Feb 23 06:38:12 GMT 2023

Git commit 5479e33438ebb5f509c3161792a7ab1f009a8548 by Carlos De Maine.
Committed on 23/02/2023 at 06:38.
Pushed by carlosdem into branch 'Neon/stable'.

Neon/unstable

A  +6    -0    debian/avplayer.install
M  +9    -0    debian/control
M  +3    -0    debian/not-installed
M  +43   -9    debian/rules
M  +6    -2    debian/watch [INFRASTRUCTURE]

https://invent.kde.org/neon/neon-packaging/digikam/commit/5479e33438ebb5f509c3161792a7ab1f009a8548

diff --git a/debian/avplayer.install b/debian/avplayer.install
new file mode 100644
index 0000000..267da00
--- /dev/null
+++ b/debian/avplayer.install
@@ -0,0 +1,6 @@
+#usr/share/doc/HTML/*/avplayer
+usr/bin/avplayer
+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/control b/debian/control
index 612f875..26de996 100644
--- a/debian/control
+++ b/debian/control
@@ -117,6 +117,15 @@ Description: image viewer/editor for KDE
  It runs without digiKam images database support, but provides all Image Editor
  functions.
 
+Package: avplayer
+Architecture: any
+Depends: digikam (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Recommends: dolphin
+Breaks: digikam-doc (<< 2:2.0.0-1), kipi-plugins-common (<< 4:3.1.0-2~)
+Replaces: digikam-doc (<< 2:2.0.0-1), kipi-plugins-common (<< 4:3.1.0-2~)
+Description: audio and video player for KDE
+ Stand alone Audio and Video Player from digiKam Project.
+
 Package: digikam-data
 Architecture: all
 Depends: opencv-data, ${misc:Depends}
diff --git a/debian/not-installed b/debian/not-installed
index 2fa828f..fb2a91d 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -186,3 +186,6 @@ usr/include/digikam/wsitem.h
 usr/include/digikam/wslogindialog.h 
 usr/include/digikam/wsnewalbumdialog.h 
 usr/include/digikam/wssettingswidget.h
+usr/include/digikam/captionvalues.h
+usr/include/digikam/metadatainfo.h
+
diff --git a/debian/rules b/debian/rules
index e0cb080..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,35 +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_MEDIAPLAYER=ON
+	  -DENABLE_KFILEMETADATASUPPORT=ON \
+	  -DENABLE_AKONADICONTACTSUPPORT=ON \
+	  -DENABLE_MEDIAPLAYER=ON \
+	  -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
+
+
