[neon/neon-packaging/digikam/Neon/unstable] /: switch to Qt 6, drop multiple packages for simplicity
Jonathan Esk-Riddell
null at kde.org
Fri Jan 19 12:17:05 GMT 2024
Git commit 5429f60d7c50c049cb30f6f1909bfe95943a3c87 by Jonathan Esk-Riddell.
Committed on 19/01/2024 at 13:17.
Pushed by jriddell into branch 'Neon/unstable'.
switch to Qt 6, drop multiple packages for simplicity
D +0 -4 debian/avplayer.install
M +19 -65 debian/control
D +0 -6 debian/digikam-data.install
D +0 -5 debian/digikam-dev.install
D +0 -1 debian/digikam-doc.install
D +0 -13 debian/digikam.install
M +3 -2 debian/rules
D +0 -5 debian/showfoto.install
D +- -- gui/icon.png
https://invent.kde.org/neon/neon-packaging/digikam/-/commit/5429f60d7c50c049cb30f6f1909bfe95943a3c87
diff --git a/debian/avplayer.install b/debian/avplayer.install
deleted file mode 100644
index 518846b..0000000
--- a/debian/avplayer.install
+++ /dev/null
@@ -1,4 +0,0 @@
-#usr/bin/avplayer
-#usr/share/applications/org.kde.avplayer.desktop
-#usr/share/doc/HTML/*/avplayer
-#usr/share/metainfo/org.kde.avplayer.appdata.xml
diff --git a/debian/control b/debian/control
index 3a82440..b730622 100644
--- a/debian/control
+++ b/debian/control
@@ -27,17 +27,15 @@ Build-Depends: bison,
libheif-dev,
libjasper-dev,
libjpeg-dev,
- libkf5akonadi-dev,
- libkf5akonadicontact-dev,
- libkf5calendarcore-dev,
- libkf5filemetadata-dev,
- libkf5grantleetheme-dev,
- libkf5mediawiki-dev,
- libkf5notifications-dev,
- libkf5notifyconfig-dev,
- libkf5sane-dev,
- libkf5threadweaver-dev,
- libkf5vkontakte-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,
@@ -50,13 +48,10 @@ Build-Depends: bison,
libopencv-dnn-dev,
libpng-dev,
libpulse-dev,
- libqt5networkauth5-dev,
- libqt5opengl5-desktop-dev,
- libqt5opengl5-dev,
- libqt5svg5-dev,
- libqt5webview5-dev,
- libqt5x11extras5-dev,
- libqt5xmlpatterns5-dev,
+ qt6-networkauth-dev,
+ qt6-scxml-dev,
+ qt6-svg-dev,
+ qt6-webview-dev,
libqtav-dev,
libswscale-dev,
libtiff-dev,
@@ -70,10 +65,9 @@ Build-Depends: bison,
pkg-config,
pkg-kde-tools (>= 0.15.20~),
portaudio19-dev,
- qtbase5-dev (>= 5.4.0),
- qtbase5-dev-tools (>= 5.4.0),
- qtmultimedia5-dev,
- qtwebengine5-dev
+ qt6-base-dev,
+ qt6-multimedia-dev,
+ qt6-webengine-dev
Build-Conflicts: libgraphicsmagick1-dev
Standards-Version: 4.6.2
Vcs-Svn: svn://anonscm.debian.org/pkg-kde/kde-extras/digikam/trunk
@@ -85,12 +79,13 @@ Maintainer: Neon CI <neon at kde.org>
Package: digikam
Architecture: any
Depends: digikam-data (= ${source:Version}),
- libqt5sql5-sqlite,
${misc:Depends},
${perl:Depends},
${shlibs:Depends}
Recommends: ffmpegthumbs, www-browser
-Suggests: digikam-doc, systemsettings
+Suggests: systemsettings
+Breaks: showfoto, digikam-dev, digikam-data, digikam-doc, avplayer
+Conflicts: showfoto, digikam-dev, digikam-data, digikam-doc, avplayer
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.
@@ -119,44 +114,3 @@ Description: digital photo management application for KDE
supports RAW format conversion through libraw, DNG export and ICC color
management work flow.
-Package: digikam-dev
-Architecture: any
-Depends: digikam (= ${binary:Version}), ${misc:Depends}
-Description: digiKam development files
- Contains the development files used for digiKam.
-
-Package: digikam-data
-Architecture: all
-Depends: opencv-data, ${misc:Depends}
-Description: digiKam architecture-independant data
- Contains the significant amount of architecture-independent data that is
- shipped with digiKam.
- .
- It has been placed in an architecture all file to reduce space on the
- archives, rather than one copy for each architecture.
-
-Package: digikam-doc
-Architecture: all
-Depends: digikam, ${misc:Depends}
-Section: doc
-Description: handbook for digiKam
- digiKam is an easy to use and powerful digital photo management
- 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: avplayer
-Architecture: any
-Depends: digikam (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Description: audio and video player for KDE
- Stand alone Audio and Video Player from digiKam Project.
-
diff --git a/debian/digikam-data.install b/debian/digikam-data.install
deleted file mode 100644
index e33eeb5..0000000
--- a/debian/digikam-data.install
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/share/digikam/
-usr/share/icons/hicolor/
-usr/share/knotifications5/digikam*
-usr/share/kxmlgui5/digikam
-usr/share/locale/*/LC_MESSAGES/
-usr/share/solid/
diff --git a/debian/digikam-dev.install b/debian/digikam-dev.install
deleted file mode 100644
index cf35f8d..0000000
--- a/debian/digikam-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/include/digikam/
-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-doc.install b/debian/digikam-doc.install
deleted file mode 100644
index a602cca..0000000
--- a/debian/digikam-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-#usr/share/doc/HTML/
diff --git a/debian/digikam.install b/debian/digikam.install
deleted file mode 100644
index a778b5e..0000000
--- a/debian/digikam.install
+++ /dev/null
@@ -1,13 +0,0 @@
-usr/bin/cleanup_digikamdb
-usr/bin/digikam
-usr/bin/digitaglinktree
-usr/lib/*/libdigikam*.so.*
-usr/lib/*/qt5/plugins/digikam/bqm/
-usr/lib/*/qt5/plugins/digikam/dimg/
-usr/lib/*/qt5/plugins/digikam/editor/
-usr/lib/*/qt5/plugins/digikam/generic/
-usr/lib/*/qt5/plugins/digikam/rawimport/
-usr/share/applications/org.kde.digikam.desktop
-usr/share/man/man1/cleanup_digikamdb.1
-usr/share/man/man1/digitaglinktree.1
-usr/share/metainfo/org.kde.digikam.appdata.xml
diff --git a/debian/rules b/debian/rules
index cbbc73b..72f69d2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ ifeq ($(DEB_HOST_ARCH), $(filter $(DEB_HOST_ARCH),$(has_qwebengine)))
endif
%:
- dh $@ --with kf5
+ dh $@ --with kf6
override_dh_clean:
dh_clean
@@ -41,7 +41,8 @@ override_dh_auto_configure:
-DENABLE_MYSQLSUPPORT=ON \
-DENABLE_QTMULTIMEDIA=ON \
-DENABLE_QWEBENGINE=$(ENABLE_QWEBENGINE) \
- -DENABLE_SHOWFOTO=ON
+ -DENABLE_SHOWFOTO=ON \
+ -DBUILD_WITH_QT6=ON
#override_dh_shlibdeps:
# dh_shlibdeps -l$(CURDIR)/debian/digikam-private-libs/$(PRIVATE_LIBDIR)
diff --git a/debian/showfoto.install b/debian/showfoto.install
deleted file mode 100644
index c64e1bb..0000000
--- a/debian/showfoto.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/bin/showfoto
-usr/share/applications/org.kde.showfoto.desktop
-usr/share/kxmlgui5/showfoto
-usr/share/metainfo/org.kde.showfoto.appdata.xml
-usr/share/showfoto/
diff --git a/gui/icon.png b/gui/icon.png
deleted file mode 100644
index 661cc3a..0000000
Binary files a/gui/icon.png and /dev/null differ
More information about the Neon-commits
mailing list