diff --git a/patches/add-git-salsa-changes.diff b/patches/add-git-salsa-changes.diff deleted file mode 100644 index b5f2a73..0000000 --- a/patches/add-git-salsa-changes.diff +++ /dev/null @@ -1,439 +0,0 @@ -diff '--color=auto' -ruN a/debian/changelog b/debian/changelog ---- a/debian/changelog 2024-10-02 10:11:20.000000000 +0300 -+++ b/debian/changelog 2023-10-05 00:34:01.000000000 +0300 -@@ -1,55 +1,3 @@ --dolphin (4:24.08.0-4) experimental; urgency=medium -- -- [ Aurélien COUDERC ] -- * Switch kimageformat-plugins dependency to kimageformat6-plugins. -- -- -- Aurélien COUDERC Wed, 02 Oct 2024 09:11:20 +0200 -- --dolphin (4:24.08.0-3) experimental; urgency=medium -- -- [ Patrick Franz ] -- * Team upload. -- * Recommend Qt 6-based version of kio-extras. -- -- -- Patrick Franz Tue, 03 Sep 2024 23:32:19 +0200 -- --dolphin (4:24.08.0-2) experimental; urgency=medium -- -- [ Aurélien COUDERC ] -- * Fix arch:all build. -- -- -- Aurélien COUDERC Sun, 25 Aug 2024 14:40:24 +0200 -- --dolphin (4:24.08.0-1) experimental; urgency=medium -- -- [ Aurélien COUDERC ] -- * Add Breaks against older version of dolphin-plugins. -- * New upstream release (24.08.0). -- * Update build-deps and deps with the info from cmake. -- * Update the list of installed files. -- -- -- Aurélien COUDERC Sat, 24 Aug 2024 12:11:01 +0200 -- --dolphin (4:24.05.2-1) experimental; urgency=medium -- -- [ Jesse Rhodes ] -- * New upstream release (24.05.2). -- * Update build-deps and deps with info from cmake. -- * B-D on pkgconf instead of pkg-config. -- * Bump libdolphinvcs5 soname to 6. -- * Update list of installed files from build system. -- * B-D on dh-sequence-kf6 and update d/rules to match. -- * Generate new libdolphinvcs6.symbols. -- * Update lintian overrides. -- * Enable optional baloo-widgets support. -- * Update copyright info. -- * Override lintian W: no-manual-page for dolphin and -- servicemenuinstaller. -- * Bump Standards-Version to 4.7.0 (no changes needed). -- * Split arch-indep files into dolphin-data and dolphin-doc. -- -- -- Aurélien COUDERC Tue, 30 Jul 2024 23:01:13 +0200 -- - dolphin (4:23.08.1-1) unstable; urgency=medium - - [ Patrick Franz ] -diff '--color=auto' -ruN a/debian/control b/debian/control ---- a/debian/control 2024-10-02 10:10:31.000000000 +0300 -+++ b/debian/control 2023-10-05 00:34:01.000000000 +0300 -@@ -3,41 +3,44 @@ - Priority: optional - Maintainer: Debian Qt/KDE Maintainers - Uploaders: Aurélien COUDERC , --Build-Depends: cmake (>= 3.16~), -+Build-Depends: baloo-kf5-dev (>= 5.101.0~) [!hurd-any], -+ cmake (>= 3.16~), - debhelper-compat (= 13), -- dh-sequence-kf6, -- extra-cmake-modules (>= 6.2.0~), -+ dh-sequence-kf5, -+ dh-sequence-pkgkde-symbolshelper, -+ extra-cmake-modules (>= 5.101.0~), - gettext, -- libbaloowidgets-dev (>= 24.08.0~), -- libkf6baloo-dev (>= 6.2.0~) [!hurd-any], -- libkf6bookmarks-dev (>= 6.2.0~), -- libkf6codecs-dev (>= 6.2.0~), -- libkf6completion-dev (>= 6.2.0~), -- libkf6config-dev (>= 6.2.0~), -- libkf6coreaddons-dev (>= 6.2.0~), -- libkf6crash-dev (>= 6.2.0~), -- libkf6dbusaddons-dev (>= 6.2.0~), -- libkf6doctools-dev (>= 6.2.0~), -- libkf6filemetadata-dev (>= 6.2.0~), -- libkf6i18n-dev (>= 6.2.0~), -- libkf6iconthemes-dev (>= 6.2.0~), -- libkf6kcmutils-dev (>= 6.2.0~), -- libkf6kio-dev (>= 6.2.0~), -- libkf6newstuff-dev (>= 6.2.0~), -- libkf6notifications-dev (>= 6.2.0~), -- libkf6parts-dev (>= 6.2.0~), -- libkf6solid-dev (>= 6.2.0~), -- libkf6textwidgets-dev (>= 6.2.0~), -- libkf6userfeedback-dev (>= 6.2.0~), -- libkf6widgetsaddons-dev (>= 6.2.0~), -- libkf6windowsystem-dev (>= 6.2.0~), -- libpackagekitqt6-dev, -- libphonon4qt6-dev, -- libphonon4qt6experimental-dev, -- libplasmaactivities-dev, -- pkgconf, -- qt6-base-dev (>= 6.4.0~), --Standards-Version: 4.7.0 -+ kinit-dev (>= 5.77.0~), -+ kuserfeedback-dev (>= 1.2.0~), -+ libkf5activities-dev (>= 5.101.0~), -+ libkf5baloowidgets-dev (>= 4:20.04.0~) [!hurd-any], -+ libkf5bookmarks-dev (>= 5.101.0~), -+ libkf5completion-dev (>= 5.101.0~), -+ libkf5config-dev (>= 5.101.0~), -+ libkf5coreaddons-dev (>= 5.101.0~), -+ libkf5crash-dev (>= 5.101.0~), -+ libkf5dbusaddons-dev (>= 5.101.0~), -+ libkf5doctools-dev (>= 5.101.0~), -+ libkf5filemetadata-dev (>= 5.101.0~), -+ libkf5i18n-dev (>= 5.101.0~), -+ libkf5iconthemes-dev (>= 5.101.0~), -+ libkf5kcmutils-dev (>= 5.101.0~), -+ libkf5kio-dev (>= 5.101.0~), -+ libkf5newstuff-dev (>= 5.101.0~), -+ libkf5notifications-dev (>= 5.101.0~), -+ libkf5parts-dev (>= 5.101.0~), -+ libkf5solid-dev (>= 5.101.0~), -+ libkf5textwidgets-dev (>= 5.101.0~), -+ libkf5widgetsaddons-dev (>= 5.101.0~), -+ libkf5windowsystem-dev (>= 5.101.0~), -+ libpackagekitqt5-dev, -+ libphonon4qt5-dev, -+ libphonon4qt5experimental-dev, -+ libqt5x11extras5-dev (>= 5.15.2~), -+ pkg-config, -+ pkg-kde-tools (>= 0.12), -+ qtbase5-dev (>= 5.15.2~), -+Standards-Version: 4.6.2 - Rules-Requires-Root: no - Homepage: https://apps.kde.org/en/dolphin - Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/dolphin -@@ -46,28 +49,22 @@ - Package: dolphin - Section: utils - Architecture: any --Depends: baloo6, -- dolphin-data (= ${source:Version}), -- ${misc:Depends}, -- ${shlibs:Depends}, --Recommends: dolphin-doc (>= 4:24.05.2~), -- ffmpegthumbs, -+Depends: baloo-kf5, kinit, ${misc:Depends}, ${shlibs:Depends}, -+Recommends: ffmpegthumbs, - kdegraphics-thumbnailers, -- kimageformat6-plugins, -- kio-extras (>= 4:24.08.0~), -+ kimageformat-plugins, -+ kio-extras, - Suggests: dolphin-plugins, --Breaks: dolphin-plugins (<< 4:24.05~), -+Conflicts: dolphin-plugins (<< 4:21.04.0~), - Description: file manager -- Dolphin is KDE's file manager that lets you navigate and browse the contents -- of your hard drives, USB sticks, SD cards, and more. Creating, moving, or -- deleting files and folders is simple and fast. -+ Dolphin is the default file manager in the Plasma, intended -+ to be both powerful and easy to use. - . - Features include: - Customisable sidebars - "Breadcrumb" navigation - View properties remembered for each folder - Split views -- Integrated terminal - Network transparency - Undo/redo functionality - Ratings, comments, and tags -@@ -81,39 +78,13 @@ - Contains DBus interface XML files to access dolphin via the DBus - org.freedesktop.FileManager1 interface. - --Package: dolphin-doc --Section: doc --Architecture: all --Depends: ${misc:Depends}, --Breaks: dolphin (<< 4:24.05.2-1~), --Replaces: dolphin (<< 4:24.05.2-1~), --Description: file manager - documentation -- Dolphin is KDE's file manager that lets you navigate and browse the contents -- of your hard drives, USB sticks, SD cards, and more. Creating, moving, or -- deleting files and folders is simple and fast. -- . -- This package contains the HTML documentation. -- --Package: dolphin-data --Section: utils --Architecture: all --Depends: ${misc:Depends}, --Breaks: dolphin (<< 4:24.05.2-1~), --Replaces: dolphin (<< 4:24.05.2-1~), --Description: file manager - data -- Dolphin is KDE's file manager that lets you navigate and browse the contents -- of your hard drives, USB sticks, SD cards, and more. Creating, moving, or -- deleting files and folders is simple and fast. -- . -- This package contains architecture-independent data files. -- - Package: libdolphinvcs-dev - Section: libdevel - Architecture: any - Multi-Arch: same --Depends: libdolphinvcs6 (= ${binary:Version}), -- libkf6kio-dev (>= 6.2.0~), -- qt6-base-dev (>= 6.5.0~), -+Depends: libdolphinvcs5 (= ${binary:Version}), -+ libkf5kio-dev (>= 5.101.0~), -+ qtbase5-dev (>= 5.15.2~), - ${misc:Depends}, - Description: library to show version control in Dolphin - development files - This library enables developers to expand Dolphin with the ability to show -@@ -121,7 +92,7 @@ - . - This package contains the development files. - --Package: libdolphinvcs6 -+Package: libdolphinvcs5 - Section: libs - Architecture: any - Multi-Arch: same -diff '--color=auto' -ruN a/debian/copyright b/debian/copyright ---- a/debian/copyright 2024-07-30 00:24:50.000000000 +0300 -+++ b/debian/copyright 2023-10-05 00:34:01.000000000 +0300 -@@ -23,7 +23,6 @@ - Copyright: 2006, Aaron J. Seigo - 2012, Amandeep Singh - 2015, Ashish Bansal -- 2024, Benedikt Thiemer - 2001-2003, Carsten Pfeiffer - 2010, Christian Muehlhaeuser - 2006, Cvetoslav Ludmiloff -@@ -41,7 +40,6 @@ - 2019, Harald Sitter - 2019, Ismael Asensio - 2011, Janardhan Reddy -- 2024, Jin Liu - 2021, Kai Uwe Broulik - 2017-2018, Kai Uwe Broulik - 2007, Kevin Ottens -@@ -49,7 +47,6 @@ - 2012, Mark Gaiser - 2015, Mathieu Tarral - 2007, Matthias Kretz -- 2023, Méven Car - 2006, Patrice Tremblay - 2006-2016, Peter Penz - 2009, Rahman Duran -@@ -96,9 +93,7 @@ - 2007-2020, This_file_is_part_of_KDE - License: LGPL-2.1+3+KDEeV - --Files: src/animatedheightwidget.cpp -- src/animatedheightwidget.h -- src/dolphinnavigatorswidgetaction.cpp -+Files: src/dolphinnavigatorswidgetaction.cpp - src/dolphinnavigatorswidgetaction.h - src/dolphinurlnavigator.cpp - src/dolphinurlnavigator.h -@@ -119,7 +114,8 @@ - src/selectionmode/singleclickselectionproxystyle.h - src/selectionmode/topbar.cpp - src/selectionmode/topbar.h --Copyright: 2020-2024, Felix Ernst -+Copyright: 2020, Felix Ernst -+ 2022, Felix Ernst - License: LGPL-2.1+3+KDEeV - - Files: src/dolphinpart.cpp -@@ -151,7 +147,7 @@ - License: LGPL-2 - - Files: debian/* --Copyright: 2007-2024, Debian Qt/KDE Maintainers -+Copyright: 2007-2020, Debian Qt/KDE Maintainers - License: GPL-2+ - - License: BSD-2-clause -diff '--color=auto' -ruN a/debian/dolphin-data.install b/debian/dolphin-data.install ---- a/debian/dolphin-data.install 2024-07-30 23:35:07.000000000 +0300 -+++ b/debian/dolphin-data.install 1970-01-01 02:00:00.000000000 +0200 -@@ -1,5 +0,0 @@ --usr/share/locale/ --usr/share/icons/ --usr/share/metainfo/ --usr/share/qlogging-categories6/ --usr/share/zsh/ -diff '--color=auto' -ruN a/debian/dolphin-doc.install b/debian/dolphin-doc.install ---- a/debian/dolphin-doc.install 2024-07-30 23:35:07.000000000 +0300 -+++ b/debian/dolphin-doc.install 1970-01-01 02:00:00.000000000 +0200 -@@ -1 +0,0 @@ --usr/share/doc/ -diff '--color=auto' -ruN a/debian/dolphin.install b/debian/dolphin.install ---- a/debian/dolphin.install 2024-08-24 13:28:26.000000000 +0300 -+++ b/debian/dolphin.install 2023-10-05 00:34:01.000000000 +0300 -@@ -1,17 +1,20 @@ - usr/bin/dolphin - usr/bin/servicemenuinstaller - usr/lib/*/libdolphinprivate.so.* --usr/lib/*/qt6/plugins/dolphin/kcms/kcm_dolphingeneral.so --usr/lib/*/qt6/plugins/dolphin/kcms/kcm_dolphinviewmodes.so --usr/lib/*/qt6/plugins/kf6/kfileitemaction/movetonewfolderitemaction.so --usr/lib/*/qt6/plugins/kf6/parts/dolphinpart.so -+usr/lib/*/qt5/plugins/dolphin/kcms/kcm_dolphingeneral.so -+usr/lib/*/qt5/plugins/dolphin/kcms/kcm_dolphinnavigation.so -+usr/lib/*/qt5/plugins/dolphin/kcms/kcm_dolphinviewmodes.so -+usr/lib/*/qt5/plugins/kf5/parts/dolphinpart.so - usr/lib/systemd/user/plasma-dolphin.service - usr/share/applications/org.kde.dolphin.desktop - usr/share/config.kcfg/ - usr/share/dbus-1/services/org.kde.dolphin.FileManager1.service -+usr/share/doc/ - usr/share/dolphin/dolphinpartactions.desktop - usr/share/kconf_update/dolphin_detailsmodesettings.upd --usr/share/kconf_update/dolphin_directorysizemode.upd --usr/share/kconf_update/dolphin_directorysizemode.py - usr/share/kglobalaccel/org.kde.dolphin.desktop - usr/share/knsrcfiles/servicemenu.knsrc -+usr/share/locale/ -+usr/share/metainfo/org.kde.dolphin.appdata.xml -+usr/share/qlogging-categories5/ -+usr/share/zsh/site-functions/_dolphin -diff '--color=auto' -ruN a/debian/dolphin.lintian-overrides b/debian/dolphin.lintian-overrides ---- a/debian/dolphin.lintian-overrides 2024-07-30 00:24:50.000000000 +0300 -+++ b/debian/dolphin.lintian-overrides 2023-10-05 00:34:01.000000000 +0300 -@@ -1,7 +1,4 @@ - # private libraries --package-name-doesnt-match-sonames libdolphinprivate6 -+package-name-doesnt-match-sonames libdolphinprivate5 - # private library - dolphin: no-symbols-control-file --# no command line arguments --dolphin: no-manual-page [usr/bin/dolphin] --dolphin: no-manual-page [usr/bin/servicemenuinstaller] -diff '--color=auto' -ruN a/debian/.gitattributes b/debian/.gitattributes ---- a/debian/.gitattributes 1970-01-01 02:00:00.000000000 +0200 -+++ b/debian/.gitattributes 2023-10-05 00:34:01.000000000 +0300 -@@ -0,0 +1 @@ -+changelog merge=dpkg-mergechangelogs -diff '--color=auto' -ruN a/debian/.gitignore b/debian/.gitignore ---- a/debian/.gitignore 1970-01-01 02:00:00.000000000 +0200 -+++ b/debian/.gitignore 2023-10-05 00:34:01.000000000 +0300 -@@ -0,0 +1 @@ -+files -diff '--color=auto' -ruN a/debian/libdolphinvcs5.install b/debian/libdolphinvcs5.install ---- a/debian/libdolphinvcs5.install 1970-01-01 02:00:00.000000000 +0200 -+++ b/debian/libdolphinvcs5.install 2023-10-05 00:34:01.000000000 +0300 -@@ -0,0 +1,2 @@ -+usr/lib/*/libdolphinvcs.so.5 -+usr/lib/*/libdolphinvcs.so.5.* -diff '--color=auto' -ruN a/debian/libdolphinvcs5.symbols b/debian/libdolphinvcs5.symbols ---- a/debian/libdolphinvcs5.symbols 1970-01-01 02:00:00.000000000 +0200 -+++ b/debian/libdolphinvcs5.symbols 2023-10-05 00:34:01.000000000 +0300 -@@ -0,0 +1,20 @@ -+# SymbolsHelper-Confirmed: 4:15.07.90 amd64 -+libdolphinvcs.so.5 libdolphinvcs5 #MINVER# -+* Build-Depends-Package: libdolphinvcs-dev -+ _ZN21KVersionControlPlugin11infoMessageERK7QString@Base 4:15.07.90 -+ _ZN21KVersionControlPlugin11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:15.07.90 -+ _ZN21KVersionControlPlugin11qt_metacastEPKc@Base 4:15.07.90 -+ _ZN21KVersionControlPlugin12errorMessageERK7QString@Base 4:15.07.90 -+ _ZN21KVersionControlPlugin16staticMetaObjectE@Base 4:15.07.90 -+ _ZN21KVersionControlPlugin19itemVersionsChangedEv@Base 4:15.07.90 -+ _ZN21KVersionControlPlugin25operationCompletedMessageERK7QString@Base 4:15.07.90 -+ _ZN21KVersionControlPluginC1EP7QObject@Base 4:15.07.90 -+ _ZN21KVersionControlPluginC2EP7QObject@Base 4:15.07.90 -+ _ZN21KVersionControlPluginD0Ev@Base 4:15.07.90 -+ _ZN21KVersionControlPluginD1Ev@Base 4:15.07.90 -+ _ZN21KVersionControlPluginD2Ev@Base 4:15.07.90 -+ _ZNK21KVersionControlPlugin10metaObjectEv@Base 4:15.07.90 -+ _ZNK21KVersionControlPlugin19localRepositoryRootERK7QString@Base 4:21.04.0 -+ _ZTI21KVersionControlPlugin@Base 4:15.07.90 -+ _ZTS21KVersionControlPlugin@Base 4:15.07.90 -+ _ZTV21KVersionControlPlugin@Base 4:15.07.90 -diff '--color=auto' -ruN a/debian/libdolphinvcs6.install b/debian/libdolphinvcs6.install ---- a/debian/libdolphinvcs6.install 2024-07-30 00:24:50.000000000 +0300 -+++ b/debian/libdolphinvcs6.install 1970-01-01 02:00:00.000000000 +0200 -@@ -1 +0,0 @@ --usr/lib/*/libdolphinvcs.so.* -diff '--color=auto' -ruN a/debian/libdolphinvcs6.symbols b/debian/libdolphinvcs6.symbols ---- a/debian/libdolphinvcs6.symbols 2024-08-24 13:01:41.000000000 +0300 -+++ b/debian/libdolphinvcs6.symbols 1970-01-01 02:00:00.000000000 +0200 -@@ -1,20 +0,0 @@ --# SymbolsHelper-Confirmed: 4:24.05.2 amd64 --libdolphinvcs.so.6 libdolphinvcs6 #MINVER# --* Build-Depends-Package: libdolphinvcs-dev -- _ZN21KVersionControlPlugin11infoMessageERK7QString@Base 4:24.05.2 -- _ZN21KVersionControlPlugin11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:24.05.2 -- _ZN21KVersionControlPlugin11qt_metacastEPKc@Base 4:24.05.2 -- _ZN21KVersionControlPlugin12errorMessageERK7QString@Base 4:24.05.2 -- _ZN21KVersionControlPlugin16staticMetaObjectE@Base 4:24.05.2 -- _ZN21KVersionControlPlugin19itemVersionsChangedEv@Base 4:24.05.2 -- _ZN21KVersionControlPlugin25operationCompletedMessageERK7QString@Base 4:24.05.2 -- _ZN21KVersionControlPluginC1EP7QObject@Base 4:24.05.2 -- _ZN21KVersionControlPluginC2EP7QObject@Base 4:24.05.2 -- _ZN21KVersionControlPluginD0Ev@Base 4:24.05.2 -- _ZN21KVersionControlPluginD1Ev@Base 4:24.05.2 -- _ZN21KVersionControlPluginD2Ev@Base 4:24.05.2 -- _ZNK21KVersionControlPlugin10metaObjectEv@Base 4:24.05.2 -- _ZNK21KVersionControlPlugin19localRepositoryRootERK7QString@Base 4:24.05.2 -- _ZTI21KVersionControlPlugin@Base 4:24.05.2 -- _ZTS21KVersionControlPlugin@Base 4:24.05.2 -- _ZTV21KVersionControlPlugin@Base 4:24.05.2 -diff '--color=auto' -ruN a/debian/libdolphinvcs-dev.install b/debian/libdolphinvcs-dev.install ---- a/debian/libdolphinvcs-dev.install 2024-07-30 00:24:50.000000000 +0300 -+++ b/debian/libdolphinvcs-dev.install 2023-10-05 00:34:01.000000000 +0300 -@@ -5,6 +5,6 @@ - usr/include/dolphinvcs_export.h - usr/lib/*/cmake/DolphinVcs/DolphinVcsConfig.cmake - usr/lib/*/cmake/DolphinVcs/DolphinVcsConfigVersion.cmake -+usr/lib/*/cmake/DolphinVcs/DolphinVcsTargets-debian.cmake - usr/lib/*/cmake/DolphinVcs/DolphinVcsTargets.cmake --usr/lib/*/cmake/DolphinVcs/DolphinVcsTargets-none.cmake - usr/lib/*/libdolphinvcs.so -diff '--color=auto' -ruN a/debian/rules b/debian/rules ---- a/debian/rules 2024-08-25 15:38:14.000000000 +0300 -+++ b/debian/rules 2023-10-05 00:34:01.000000000 +0300 -@@ -9,11 +9,11 @@ - dh $@ - - override_dh_auto_configure: -- dh_auto_configure -Skf6 -- -DBUILD_TESTING=OFF -+ dh_auto_configure -Skf5 -- -DBUILD_TESTING=OFF - - override_dh_auto_test: - # Disable unittest at build time - : - --override_dh_gencontrol-arch: libpkgs_gen_strict_local_shlibs -- dh_gencontrol -a -+override_dh_gencontrol: libpkgs_gen_strict_local_shlibs -+ dh_gencontrol