[neon/kde/kalgebra/Neon/unstable] debian: port to kf6

Carlos De Maine null at kde.org
Sat Sep 30 03:44:36 BST 2023


Git commit b39a8092d78faaaed206a5fbd735ac1ae920de28 by Carlos De Maine.
Committed on 30/09/2023 at 04:44.
Pushed by carlosdem into branch 'Neon/unstable'.

port to kf6

D  +0    -1    debian/compat
M  +22   -26   debian/control
M  +1    -1    debian/kalgebra-common.install
M  +4    -15   debian/rules

https://invent.kde.org/neon/kde/kalgebra/-/commit/b39a8092d78faaaed206a5fbd735ac1ae920de28

diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 9cf971a..0b81d95 100644
--- a/debian/control
+++ b/debian/control
@@ -1,30 +1,30 @@
 Source: kalgebra
-1;115;0cSection: kde
+Section: kde
 Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Sune Vuorela <sune at debian.org>, Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake (>= 2.8.11),
-               debhelper (>= 9),
-               extra-cmake-modules (>= 1.7.0~),
-               libanalitza-dev (>= 4:17.08~),
+Build-Depends: cmake,
+               debhelper-compat (= 13),
+               kf6-extra-cmake-modules,
+               kf6-kconfigwidgets-dev,
+               kf6-kdoctools-dev,
+               kf6-ki18n-dev,
+               kf6-kio-dev,
+               kf6-kwidgetsaddons-dev,
+               kf6-plasma-framework-dev,
+               libanalitza-dev,
                libgl1-mesa-dev,
                libglu1-mesa-dev,
-               libkf5configwidgets-dev (>= 5),
-               libkf5doctools-dev,
-               libkf5i18n-dev (>= 5),
-               libkf5kio-dev,
-               libkf5plasma-dev,
-               libkf5widgetsaddons-dev (>= 5),
                libncurses5-dev,
-               libqt5opengl5-dev (>= 5.4),
-               libqt5svg5-dev (>= 5.4),
                libreadline-dev,
                pkg-config,
-               pkg-kde-tools (>> 0.15.15),
-               qtbase5-dev (>= 5.4),
-               qtdeclarative5-dev (>= 5.4),
-               qtwebengine5-dev [amd64 arm64 armhf i386 mipsel]
-Standards-Version: 4.1.2
+               pkg-kde-tools-neon,
+               qt6-5compat-dev,
+               qt6-base-dev,
+               qt6-declarative-dev,
+               qt6-svg-dev,
+               qt6-webengine-dev [amd64 arm64 armhf i386 mipsel]
+Standards-Version: 4.6.2
 Homepage: http://edu.kde.org/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kalgebra
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kalgebra.git
@@ -36,8 +36,6 @@ Depends: kalgebra-common (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Conflicts: calgebra
-Replaces: kalgebra-common (<< 4:17.08.1)
-Breaks: kalgebra-common (<< 4:17.08.1), kalgebramobile (<< 4:4.7.2)
 Description: algebraic graphing calculator
  KAlgebra is a algebraic graphing calculator with support for 3D graphing and
  MathML markup language.
@@ -47,10 +45,8 @@ Description: algebraic graphing calculator
 Package: kalgebra-common
 Architecture: amd64 arm64 armhf i386 mipsel
 Section: math
-Breaks: kalgebra (<< 4:4.7.2), ${kde-l10n:all}
-Replaces: kalgebra (<< 4:4.7.2), ${kde-l10n:all}
-Depends: plasma-framework,
-         qml-module-org-kde-analitza,
+Depends: kf6-plasma-framework,
+         qml6-module-org-kde-analitza,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: contains files common for kalgebra and kalgebramobile
@@ -64,8 +60,8 @@ Package: kalgebramobile
 Architecture: any
 Section: math
 Depends: kalgebra-common (= ${binary:Version}) [amd64 arm64 armhf i386 mipsel],
-         plasma-framework,
-         qml-module-org-kde-kirigami2,
+         kf6-plasma-framework,
+         qml6-module-org-kde-kirigami2,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: algebraic graphing calculator for small touch based interfaces
diff --git a/debian/kalgebra-common.install b/debian/kalgebra-common.install
index 2c86c31..0d7a5b3 100644
--- a/debian/kalgebra-common.install
+++ b/debian/kalgebra-common.install
@@ -1,5 +1,5 @@
 usr/share/doc/HTML/*/kalgebra/
 usr/share/icons/*/*/apps/kalgebra.*
-usr/share/katepart5/syntax/kalgebra.xml
+usr/share/katepart6/syntax/kalgebra.xml
 usr/share/metainfo/org.kde.graphsplasmoid.appdata.xml
 usr/share/locale/
diff --git a/debian/rules b/debian/rules
index 0296450..49552b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,6 @@
 #!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
-include /usr/share/dpkg/architecture.mk
-
-l10npkgs_firstversion_ok := 4:16.04.3-8~
-webengine_archs := amd64 arm64 armhf i386 mipsel
-
-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
-
-ifneq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),$(webengine_archs)))
-override_dh_auto_configure:
-	$(overridden_command) -- -DMOBILE_BACKEND="none"
-endif
-
-override_dh_strip:
-	$(overridden_command) --dbgsym-migration='kalgebra-dbg (<= 4:15.12.1-1~~)'
+%:
+	dh $@ --with kf6 --buildsystem kf6


More information about the Neon-commits mailing list