[neon/kde/dolphin/Neon/experimental] debian: bring back experimental
Carlos De Maine
null at kde.org
Thu Sep 14 13:39:02 BST 2023
Git commit 9e7965567c9524d5e584854cb6793fbac3a74ca3 by Carlos De Maine.
Committed on 14/09/2023 at 14:36.
Pushed by carlosdem into branch 'Neon/experimental'.
bring back experimental
M +2 -14 debian/changelog
M +38 -48 debian/control
M +3 -3 debian/dolphin.install
A +2 -0 debian/libdolphinvcs6.install
M +6 -8 debian/rules
https://invent.kde.org/neon/kde/dolphin/-/commit/9e7965567c9524d5e584854cb6793fbac3a74ca3
diff --git a/debian/changelog b/debian/changelog
index 31579e2..d16ef1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,22 +1,10 @@
-dolphin (4:23.08.1-0neon) jammy; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Wed, 13 Sep 2023 17:12:41 +0000
-
-dolphin (4:23.08.0-0neon) jammy; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Thu, 24 Aug 2023 09:41:20 +0000
-
-dolphin (4:23.04.3-0neon) jammy; urgency=medium
+dolphin (4:23.04.2-0neon) jammy; urgency=medium
* New release
-- Neon CI <neon at kde.org> Tue, 06 Jun 2023 22:07:37 +0000
-dolphin (4:23.04.3-0neon) jammy; urgency=medium
+dolphin (4:23.04.1-0neon) jammy; urgency=medium
* New release
diff --git a/debian/control b/debian/control
index dbc9981..d8881e9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,41 +3,39 @@ Section: kde
Priority: optional
Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Maximiliano Curia <maxy at debian.org>
-Build-Depends: baloo-kf5-dev (>= 4.97~) [!hurd-any],
- cmake (>= 3.0~),
- debhelper (>= 11~),
- extra-cmake-modules (>= 5.43.0~),
- kinit-dev (>= 5.43.0~),
- kuserfeedback-dev,
- libkf5activities-dev (>= 5.43.0~),
- libkf5baloowidgets-dev (>= 4:18.08.0~) [!hurd-any],
- libkf5bookmarks-dev (>= 5.43.0~),
- libkf5completion-dev (>= 5.43.0~),
- libkf5config-dev (>= 5.43.0~),
- libkf5coreaddons-dev (>= 5.43.0~),
- libkf5crash-dev (>= 5.43.0~),
- libkf5dbusaddons-dev (>= 5.43.0~),
- libkf5doctools-dev (>= 5.43.0~),
- libkf5filemetadata-dev (>= 5.19.0~),
- libkf5i18n-dev (>= 5.43.0~),
- libkf5iconthemes-dev (>= 5.43.0~),
- libkf5kcmutils-dev (>= 5.43.0~),
- libkf5kdelibs4support-dev (>= 5.43.0~),
- libkf5kio-dev (>= 5.43.0~),
- libkf5newstuff-dev (>= 5.43.0~),
- libkf5notifications-dev (>= 5.43.0~),
- libkf5parts-dev (>= 5.43.0~),
- libkf5solid-dev (>= 5.43.0~),
- libkf5textwidgets-dev (>= 5.43.0~),
- libkf5windowsystem-dev (>= 5.21.0~),
- libpackagekitqt5-dev,
- libphonon4qt5-dev,
- libphonon4qt5experimental-dev,
- libqt5x11extras5-dev,
+Build-Depends: cmake,
+ debhelper-compat (= 13),
+ kf6-baloo-dev,
+ kf6-baloowidgets-dev,
+ kf6-extra-cmake-modules,
+ kf6-kactivities-dev,
+ kf6-kbookmarks-dev,
+ kf6-kcolorscheme-dev,
+ kf6-kcompletion-dev,
+ kf6-kconfig-dev,
+ kf6-kcoreaddons-dev,
+ kf6-kcrash-dev,
+ kf6-kdbusaddons-dev,
+ kf6-kdoctools-dev,
+ kf6-kfilemetadata-dev,
+ kf6-ki18n-dev,
+ kf6-kiconthemes-dev,
+ kf6-kcmutils-dev,
+ kf6-kio-dev,
+ kf6-kmoretools-dev
+ kf6-knewstuff-dev,
+ kf6-knotifications-dev,
+ kf6-kparts-dev,
+ kf6-solid-dev,
+ kf6-ktextwidgets-dev,
+ kf6-kuserfeedback-dev,
+ kf6-kwindowsystem-dev,
+ libpackagekitqt6-dev,
+ qt6-phonon-dev,
pkg-config,
- pkg-kde-tools (>= 0.12),
- qtbase5-dev (>= 5.8.0~)
-Standards-Version: 4.2.1
+ pkg-kde-tools-neon,
+ qt6-base-dev
+Standards-Version: 4.6.2
Homepage: http://www.kde.org/
Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/dolphin
Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/dolphin.git
@@ -45,11 +43,9 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/dolphin.git
Package: dolphin
Section: utils
Architecture: any
-Depends: baloo-kf5, kinit, ${misc:Depends}, ${shlibs:Depends}
-Recommends: kimageformat-plugins, kio-extras, ruby
+Depends: kf6-baloo, ${misc:Depends}, ${shlibs:Depends}
+Recommends: kf6-kimageformat-plugins, kio-extras, ruby
Suggests: dolphin-plugins
-Breaks: dolphin-plugins (<< 4:17.08), ${kde-l10n:all}
-Replaces: ${kde-l10n:all}
Description: file manager
Dolphin is the default file manager in the Plasma, intended
to be both powerful and easy to use.
@@ -68,8 +64,6 @@ Section: libdevel
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends}
-Breaks: dolphin (<< 4:15.07.90+git20150819.0900)
-Replaces: dolphin (<< 4:15.07.90+git20150819.0900)
Description: file manager - development files
Contains DBus interface XML files to access dolphin via the DBus
org.freedesktop.FileManager1 interface.
@@ -78,23 +72,19 @@ Package: libdolphinvcs-dev
Section: libdevel
Architecture: any
Multi-Arch: same
-Depends: libdolphinvcs5 (= ${binary:Version}),
- libkf5kio-dev (>= 5.43.0~),
- qtbase5-dev (>= 5.8.0~),
+Depends: libdolphinvcs6 (= ${binary:Version}),
+ kf6-kio-dev,
+ qt6-base-dev,
${misc:Depends}
-Breaks: dolphin (<< 4:15.07.90+git20150819.0900)
-Replaces: dolphin (<< 4:15.07.90+git20150819.0900)
Description: library to show version control in Dolphin - development files
This library enables developers to expand Dolphin with the ability to show
version control status in directories that are version controlled.
-Package: libdolphinvcs5
+Package: libdolphinvcs6
Section: libs
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: dolphin (<< 4:15.07.90+git20150819.0900), dolphin-plugins (<< 4:17.08)
-Replaces: dolphin (<< 4:15.07.90+git20150819.0900)
Description: library to show version control in Dolphin
This library enables developers to expand Dolphin with the ability to show
version control status in directories that are version controlled.
diff --git a/debian/dolphin.install b/debian/dolphin.install
index 0dd4a04..58781cd 100644
--- a/debian/dolphin.install
+++ b/debian/dolphin.install
@@ -1,8 +1,8 @@
usr/bin/dolphin
usr/bin/servicemenuinstaller
usr/lib/*/libdolphinprivate.so.*
-usr/lib/*/qt5/plugins/dolphin/kcms/
-usr/lib/*/qt5/plugins/kf5/parts/dolphinpart.so
+usr/lib/*/qt6/plugins/dolphin/kcms/
+usr/lib/*/qt6/plugins/kf6/parts/dolphinpart.so
usr/lib/systemd/
usr/share/applications/org.kde.dolphin.desktop
usr/share/config.kcfg/
@@ -14,5 +14,5 @@ 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/dolphin.categories
+usr/share/qlogging-categories6/dolphin.categories
usr/share/zsh/site-functions/_dolphin
diff --git a/debian/libdolphinvcs6.install b/debian/libdolphinvcs6.install
new file mode 100644
index 0000000..7a8d8db
--- /dev/null
+++ b/debian/libdolphinvcs6.install
@@ -0,0 +1,2 @@
+usr/lib/*/libdolphinvcs.so.6
+usr/lib/*/libdolphinvcs.so.*.*
diff --git a/debian/rules b/debian/rules
index 793b91d..9757792 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,12 @@
#!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
-l10npkgs_firstversion_ok := 4:16.04.3-5~
+%:
+ dh $@ --with kf6 --buildsystem kf6
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
-include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
-libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
-include /usr/share/pkg-kde-tools/qt-kde-team/3/library-packages.mk
-
-override_dh_strip:
- $(overridden_command) --dbgsym-migration='dolphin-dbg (<= 4:15.12.1-1~~)'
+override_dh_shlibdeps:
+ dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/
override_dh_auto_test:
# Disable unittest at build time
More information about the Neon-commits
mailing list