[neon/extras/okteta/Neon/experimental] debian: kf6ify
Carlos De Maine
null at kde.org
Sun Mar 31 10:41:28 BST 2024
Git commit 6be7d15b0fe8e2ff7cc2eccee3ed70de9a7d9ad5 by Carlos De Maine.
Committed on 31/03/2024 at 09:41.
Pushed by carlosdem into branch 'Neon/experimental'.
kf6ify
M +25 -34 debian/control
M +3 -3 debian/okteta-dev.install
M +3 -3 debian/okteta.install
M +4 -17 debian/rules
https://invent.kde.org/neon/extras/okteta/-/commit/6be7d15b0fe8e2ff7cc2eccee3ed70de9a7d9ad5
diff --git a/debian/control b/debian/control
index a6ecbfd..623db44 100644
--- a/debian/control
+++ b/debian/control
@@ -8,30 +8,29 @@ Uploaders: Sune Vuorela <sune at debian.org>,
Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake (>= 3.0~),
debhelper-compat (= 13),
- extra-cmake-modules (>= 5.38.0~),
- libkf5bookmarks-dev (>= 5.38.0~),
- libkf5codecs-dev (>= 5.38.0~),
- libkf5completion-dev (>= 5.38.0~),
- libkf5configwidgets-dev (>= 5.38.0~),
- libkf5crash-dev (>= 5.38.0~),
- libkf5dbusaddons-dev (>= 5.38.0~),
- libkf5doctools-dev (>= 5.38.0~),
- libkf5i18n-dev (>= 5.38.0~),
- libkf5iconthemes-dev (>= 5.38.0~),
- libkf5kcmutils-dev (>= 5.38.0~),
- libkf5kio-dev (>= 5.38.0~),
- libkf5newstuff-dev (>= 5.38.0~),
- libkf5parts-dev (>= 5.38.0~),
- libkf5service-dev (>= 5.38.0~),
- libkf5widgetsaddons-dev (>= 5.38.0~),
- libkf5xmlgui-dev (>= 5.38.0~),
- libqca-qt5-2-dev (>= 2.1.0),
+ kf6-kbookmarks-dev,
+ kf6-kcodecs-dev,
+ kf6-kcompletion-dev,
+ kf6-kconfigwidgets-dev,
+ kf6-kcrash-dev,
+ kf6-kdbusaddons-dev,
+ kf6-kdoctools-dev,
+ kf6-extra-cmake-modules,
+ kf6-ki18n-dev,
+ kf6-kiconthemes-dev,
+ kf6-kcmutils-dev,
+ kf6-kio-dev,
+ kf6-knewstuff-dev,
+ kf6-kparts-dev,
+ kf6-kservice-dev,
+ kf6-kwidgetsaddons-dev,
+ kf6-kxmlgui-dev,
+ libqca-qt-2-dev (>= 2.1.0),
pkg-config,
- pkg-kde-tools (>= 0.15.23~),
- qtbase5-dev (>= 5.9.0~),
- qtdeclarative5-dev (>= 5.9.0~),
- qtscript5-dev (>= 5.9.0~),
- qttools5-dev (>= 5.9.0~),
+ pkg-kde-tools-neon,
+ qt6-base-dev,
+ qt6-declarative-dev,
+ qt6-tools-dev,
shared-mime-info (>= 0.30),
xauth,
xvfb
@@ -98,8 +97,6 @@ Package: libkasten4okteta2core0
Architecture: any
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libkasten3okteta1core1 (<< 5:0.26.0), ${kde-l10n:all}
-Replaces: libkasten3okteta1core1 (<< 5:0.26.0), ${kde-l10n:all}
Description: kastencore library for Okteta
Okteta is a simple editor for the raw data of files. This type of program is
also called hexadecimal editor or binary editor.
@@ -132,8 +129,6 @@ Package: libokteta3core0
Architecture: any
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libokteta2core2 (<< 5:0.26.0), ${kde-l10n:all}
-Replaces: libokteta2core2 (<< 5:0.26.0), ${kde-l10n:all}
Description: core Okteta library
Okteta is a simple editor for the raw data of files. This type of program is
also called hexadecimal editor or binary editor.
@@ -152,8 +147,6 @@ Package: libokteta3gui0
Architecture: any
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libokteta2gui2 (<< 5:0.26.0), ${kde-l10n:all}
-Replaces: libokteta2gui2 (<< 5:0.26.0), ${kde-l10n:all}
Description: gui Okteta library
Okteta is a simple editor for the raw data of files. This type of program is
also called hexadecimal editor or binary editor.
@@ -171,8 +164,6 @@ Description: transitional package
Package: okteta
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: ${kde-l10n:all}
-Replaces: ${kde-l10n:all}
Description: hexadecimal editor for binary files
Okteta is a simple editor for the raw data of files. This type of program is
also called hexadecimal editor or binary editor.
@@ -194,9 +185,9 @@ Description: hexadecimal editor for binary files
Package: okteta-dev
Architecture: any
Section: devel
-Depends: libkf5kio-dev,
- libkf5xmlgui-dev (>= 5.38.0~),
- qtbase5-dev (>= 5.9~),
+Depends: kf6-kio-dev,
+ kf6-kxmlgui-dev,
+ qt6-base-dev,
${misc:Depends},
${shlibs:Depends},
${so:Depends}
diff --git a/debian/okteta-dev.install b/debian/okteta-dev.install
index 308cc7d..32ed320 100644
--- a/debian/okteta-dev.install
+++ b/debian/okteta-dev.install
@@ -24,6 +24,6 @@ usr/lib/*/libOkteta3Core.so
usr/lib/*/libOkteta3Gui.so
usr/lib/*/pkgconfig/OktetaCore.pc
usr/lib/*/pkgconfig/OktetaGui.pc
-usr/lib/*/qt5/mkspecs/modules/qt_OktetaCore.pri
-usr/lib/*/qt5/mkspecs/modules/qt_OktetaGui.pri
-usr/lib/*/qt5/plugins/designer/oktetawidgets.so
+usr/lib/*/qt6/mkspecs/modules/qt_OktetaCore.pri
+usr/lib/*/qt6/mkspecs/modules/qt_OktetaGui.pri
+usr/lib/*/qt6/plugins/designer/oktetawidgets.so
diff --git a/debian/okteta.install b/debian/okteta.install
index aba1e91..b145ebb 100644
--- a/debian/okteta.install
+++ b/debian/okteta.install
@@ -1,15 +1,15 @@
usr/bin/okteta
usr/bin/struct2osd
-usr/lib/*/qt5/plugins/kf5/parts/oktetapart.so
+usr/lib/*/qt6/plugins/kf6/parts/oktetapart.so
usr/share/applications/org.kde.okteta.desktop
usr/share/config.kcfg/structureviewpreferences.kcfg
usr/share/doc/HTML/*/okteta/
usr/share/icons/hicolor/*/apps/okteta.png
usr/share/knsrcfiles/okteta-structures.knsrc
-usr/share/kservices5/oktetapart.desktop
+usr/share/kservices6/oktetapart.desktop
usr/share/locale/*/LC_MESSAGES/okteta.mo
usr/share/locale/*/LC_MESSAGES/oktetapart.mo
usr/share/metainfo/org.kde.okteta.appdata.xml
usr/share/mime/packages/okteta.xml
usr/share/okteta/
-usr/share/qlogging-categories5/
+usr/share/qlogging-categories6/
diff --git a/debian/rules b/debian/rules
index 6a3241d..49552b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,6 @@
#!/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-7~
-
-dh = --with sodeps
-
-TESTS_HOME=$(CURDIR)/debian/tests.home
-
-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_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- mkdir -p "$(TESTS_HOME)"
- HOME=$(TESTS_HOME) xvfb-run -a --server-args="-screen 0 1024x768x24+32" dh_auto_test
- rm -rf "$(TESTS_HOME)"
-endif
+%:
+ dh $@ --with kf6 --buildsystem kf6
More information about the Neon-commits
mailing list