[neon/kde/konsole/Neon/unstable] debian: (re)kf6ify for reals this time
Carlos De Maine
null at kde.org
Thu Oct 26 04:47:45 BST 2023
Git commit 5b32913ed17434a3c90bcb59555666ebd659891c by Carlos De Maine.
Committed on 26/10/2023 at 05:47.
Pushed by carlosdem into branch 'Neon/unstable'.
(re)kf6ify for reals this time
M +3 -21 debian/changelog
M +34 -38 debian/control
M +3 -5 debian/konsole-kpart.install
M +2 -2 debian/konsole.install
M +6 -12 debian/rules
https://invent.kde.org/neon/kde/konsole/-/commit/5b32913ed17434a3c90bcb59555666ebd659891c
diff --git a/debian/changelog b/debian/changelog
index de58a82..fccc8fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,34 +1,16 @@
-konsole (4:23.08.2-0neon) jammy; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Wed, 11 Oct 2023 17:37:49 +0000
-
-konsole (4:23.08.1-0neon) jammy; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Wed, 13 Sep 2023 23:20:36 +0000
-
-konsole (4:23.08.0-0neon) jammy; urgency=medium
-
- * New release
-
- -- Neon CI <neon at kde.org> Thu, 24 Aug 2023 10:08:43 +0000
-
-konsole (4:23.04.3-0neon) jammy; urgency=medium
+konsole (4:23.04.2-0neon) jammy; urgency=medium
* New release
-- Neon CI <neon at kde.org> Tue, 06 Jun 2023 22:41:49 +0000
-konsole (4:23.04.3-0neon) jammy; urgency=medium
+konsole (4:23.04.1-0neon) jammy; urgency=medium
* New release
-- Neon CI <neon at kde.org> Wed, 10 May 2023 19:04:52 +0000
-konsole (4:23.04.3-0neon) jammy; urgency=medium
+konsole (4:23.04.1-0neon) jammy; urgency=medium
* New release
diff --git a/debian/control b/debian/control
index 62d54ea..feda405 100644
--- a/debian/control
+++ b/debian/control
@@ -5,42 +5,42 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Sune Vuorela <sune at debian.org>,
Modestas Vainius <modax at debian.org>,
Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake (>= 2.8.12),
- debhelper (>= 11),
- extra-cmake-modules (>= 1.6.0~),
- kinit-dev (>= 5.6.0~),
+Build-Depends: cmake,
+ debhelper-compat (= 13),
+ kf6-extra-cmake-modules,
libicu-dev,
- libkf5bookmarks-dev (>= 5.6.0~),
- libkf5completion-dev (>= 5.6.0~),
- libkf5config-dev (>= 5.6.0~),
- libkf5configwidgets-dev (>= 5.6.0~),
- libkf5coreaddons-dev (>= 5.18.0~),
- libkf5crash-dev (>= 5.6.0~),
- libkf5dbusaddons-dev (>= 5.6.0~),
- libkf5doctools-dev (>= 5.6.0~),
- libkf5globalaccel-dev (>= 5.6.0~),
- libkf5guiaddons-dev (>= 5.6.0~),
- libkf5i18n-dev (>= 5.18.0~),
- libkf5iconthemes-dev (>= 5.6.0~),
- libkf5kio-dev (>= 5.6.0~),
- libkf5newstuff-dev (>= 5.6.0~),
- libkf5notifications-dev (>= 5.6.0~),
- libkf5notifyconfig-dev (>= 5.6.0~),
- libkf5parts-dev (>= 5.6.0~),
- libkf5pty-dev (>= 5.6.0~),
- libkf5service-dev (>= 5.6.0~),
- libkf5textwidgets-dev (>= 5.6.0~),
- libkf5widgetsaddons-dev (>= 5.6.0~),
- libkf5windowsystem-dev (>= 5.6.0~),
- libkf5xmlgui-dev (>= 5.6.0~),
+ kf6-kbookmarks-dev,
+ kf6-kcolorscheme-dev,
+ kf6-kcompletion-dev,
+ kf6-kconfig-dev,
+ kf6-kconfigwidgets-dev,
+ kf6-kcoreaddons-dev,
+ kf6-kcrash-dev,
+ kf6-kdbusaddons-dev,
+ kf6-kdoctools-dev,
+ kf6-kglobalaccel-dev,
+ kf6-kguiaddons-dev,
+ kf6-ki18n-dev,
+ kf6-kiconthemes-dev,
+ kf6-kio-dev,
+ kf6-knewstuff-dev,
+ kf6-knotifications-dev,
+ kf6-knotifyconfig-dev,
+ kf6-kparts-dev,
+ kf6-kpty-dev,
+ kf6-kservice-dev,
+ kf6-ktextwidgets-dev,
+ kf6-kwidgetsaddons-dev,
+ kf6-kwindowsystem-dev,
+ kf6-kxmlgui-dev,
libx11-dev,
- pkg-kde-tools (>= 0.15.16~),
- qtbase5-dev (>= 5.4.0~),
- qtmultimedia5-dev
-Standards-Version: 4.1.4
-Homepage: http://www.kde.org/
-Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/konsole
-Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/konsole.git
+ pkg-kde-tools-neon,
+ qt6-base-dev,
+ qt6-multimedia-dev
+Standards-Version: 4.6.1
+Homepage: https://konsole.kde.org/
+Vcs-Browser: https://invent.kde.org/utilities/konsole
+Vcs-Git: https://invent.kde.org/utilities/konsole.git
Package: konsole
Architecture: any
@@ -48,8 +48,6 @@ Depends: konsole-kpart (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Suggests: lrzsz
-Breaks: ${kde-l10n:all}
-Replaces: ${kde-l10n:all}
Provides: x-terminal-emulator
Description: X terminal emulator
Konsole is a terminal emulator built on the KDE Platform. It can contain
@@ -61,8 +59,6 @@ Description: X terminal emulator
Package: konsole-kpart
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: konsole (<< 4:17.08.3~)
-Replaces: konsole (<< 4:17.08.3~)
Description: Konsole plugin for Qt applications
Konsole is a terminal emulator built on the KDE Platform. It can contain
multiple terminal sessions inside one window using detachable tabs.
diff --git a/debian/konsole-kpart.install b/debian/konsole-kpart.install
index 3093324..2905933 100644
--- a/debian/konsole-kpart.install
+++ b/debian/konsole-kpart.install
@@ -1,8 +1,6 @@
usr/lib/*/libkonsoleprivate.so.*
-usr/lib/*/qt5/plugins/konsolepart.so
-usr/lib/*/qt5/plugins/konsoleplugins/konsole_sshmanagerplugin.so
-usr/share/knotifications5/
+usr/lib/*/qt6/plugins/kf6/parts/konsolepart.so
+usr/lib/*/qt6/plugins/konsoleplugins/konsole_sshmanagerplugin.so
+usr/share/knotifications6/
usr/share/knsrcfiles/konsole.knsrc
usr/share/konsole/
-usr/share/kservices5/konsolepart.desktop
-usr/share/kservicetypes5/terminalemulator.desktop
diff --git a/debian/konsole.install b/debian/konsole.install
index 95f750b..0363002 100644
--- a/debian/konsole.install
+++ b/debian/konsole.install
@@ -5,7 +5,7 @@ usr/lib/*/kconf_update_bin/konsole_globalaccel
usr/lib/*/kconf_update_bin/konsole_show_menubar
usr/lib/*/libkonsoleapp.so.*.*
usr/lib/*/libkonsoleapp.so.1
-usr/lib/*/qt5/plugins/konsoleplugins/konsole_quickcommandsplugin.so
+usr/lib/*/qt6/plugins/konsoleplugins/konsole_quickcommandsplugin.so
usr/share/applications/org.kde.konsole.desktop
usr/share/doc/HTML/*/konsole/
usr/share/kconf_update/konsole.upd
@@ -14,5 +14,5 @@ usr/share/kglobalaccel/org.kde.konsole.desktop
usr/share/kio/servicemenus/konsolerun.desktop
usr/share/locale/
usr/share/metainfo/org.kde.konsole.appdata.xml
-usr/share/qlogging-categories5/konsole.categories
+usr/share/qlogging-categories6/konsole.categories
usr/share/zsh/site-functions/_konsole
diff --git a/debian/rules b/debian/rules
index 7511c8a..2fff82b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,7 @@
#!/usr/bin/make -f
-
-l10npkgs_firstversion_ok := 4:16.04.3-6~
-
-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
-
-override_dh_auto_test:
- # Disable dh_auto_test at build time
- :
-
-override_dh_strip:
- $(overridden_command) --dbgsym-migration='konsole-dbg (<= 4:15.12.1-1~~)'
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
+%:
+ dh $@ --with kf6 --buildsystem kf6
+override_dh_shlibdeps:
+ dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/
More information about the Neon-commits
mailing list