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

Carlos De Maine null at kde.org
Fri Sep 29 03:42:17 BST 2023


Git commit 3cc68a4aa8dc3b2e6837d4445d26f03d385c8c30 by Carlos De Maine.
Committed on 29/09/2023 at 04:41.
Pushed by carlosdem into branch 'Neon/unstable'.

port to kf6

D  +0    -1    debian/compat
M  +16   -23   debian/control
M  +2    -2    debian/libanalitza-dev.install
D  +0    -1    debian/qml-module-org-kde-analitza.install
A  +1    -0    debian/qml6-module-org-kde-analitza.install
M  +4    -14   debian/rules

https://invent.kde.org/neon/kde/analitza/-/commit/3cc68a4aa8dc3b2e6837d4445d26f03d385c8c30

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 b04b04e..aa8ddc6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,20 +3,19 @@ Section: libs
 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.12),
-               debhelper (>= 9),
-               extra-cmake-modules (>= 1.7.0~),
+Build-Depends: cmake,
+               debhelper-compat (= 13),
+               kf6-extra-cmake-modules,
                libeigen3-dev,
                libglew-dev,
-               libqt5opengl5-dev (>= 5.4),
-               libqt5svg5-dev (>= 5.4),
                pkg-config,
-               pkg-kde-tools (>> 0.15.15),
-               qtbase5-dev (>= 5.4),
-               qtdeclarative5-dev (>= 5.4),
-               qttools5-dev,
-               qttools5-dev-tools,
-Standards-Version: 4.1.2
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+               qt6-declarative-dev,
+               qt6-svg-dev,
+               qt6-tools-dev,
+               qt6-tools-dev-tools,
+Standards-Version: 4.6.2
 Homepage: http://edu.kde.org/
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/analitza.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/analitza.git
@@ -24,11 +23,6 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/analitza.git
 Package: analitza-common
 Architecture: all
 Depends: ${misc:Depends}
-Replaces: libanalitzaplot4 (<< 4:4.12.90),
-          libanalitzaplot5 (<< 4:4.12.90),
-          ${kde-l10n:all},
-Conflicts: libanalitzaplot4 (<< 4:4.12.90), libanalitzaplot5 (<< 4:4.12.90)
-Breaks: ${kde-l10n:all}
 Description: common files for Analitza
  Analitza is a library to parse and work with mathematical expressions. This
  library is being used by KAlgebra and Cantor and may be used in other
@@ -44,8 +38,8 @@ Depends: libanalitza8 (= ${binary:Version}),
          libanalitzagui8 (= ${binary:Version}),
          libanalitzaplot8 (= ${binary:Version}),
          libanalitzawidgets8 (= ${binary:Version}),
-         qml-module-org-kde-analitza (= ${binary:Version}),
-         qtbase5-dev (>= 5.4),
+         qml6-module-org-kde-analitza (= ${binary:Version}),
+         qt6-base-dev,
          ${misc:Depends},
 Description: development files for Analitza
  Analitza is a library to parse and work with mathematical expressions. This
@@ -95,12 +89,12 @@ Description: library to work with mathematical expressions - widgets
  .
  This package is part of the KDE education module.
 
-Package: qml-module-org-kde-analitza
+Package: qml6-module-org-kde-analitza
 Architecture: any
 Depends: analitza-common,
-         qml-module-qtquick-controls,
-         qml-module-qtquick-layouts,
-         qml-module-qtquick2,
+         qml6-module-qtquick-controls,
+         qml6-module-qtquick-layouts,
+         qml6-module-qtquick,
          ${misc:Depends},
          ${shlibs:Depends},
 Description: library to work with mathematical expressions - QML library
@@ -109,4 +103,3 @@ Description: library to work with mathematical expressions - QML library
  to plotting.
  .
  This package is part of the KDE education module.
-Breaks: kalgebra-common (<< 4:17.08)
diff --git a/debian/libanalitza-dev.install b/debian/libanalitza-dev.install
index 4c44bbb..1385e4d 100644
--- a/debian/libanalitza-dev.install
+++ b/debian/libanalitza-dev.install
@@ -1,5 +1,5 @@
-usr/include/Analitza5/
-usr/lib/*/cmake/Analitza5
+usr/include/Analitza6/
+usr/lib/*/cmake/Analitza6
 usr/lib/*/libAnalitza.so
 usr/lib/*/libAnalitzaGui.so
 usr/lib/*/libAnalitzaPlot.so
diff --git a/debian/qml-module-org-kde-analitza.install b/debian/qml-module-org-kde-analitza.install
deleted file mode 100644
index 64a1bdd..0000000
--- a/debian/qml-module-org-kde-analitza.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/qt5/qml/org/kde/analitza/
diff --git a/debian/qml6-module-org-kde-analitza.install b/debian/qml6-module-org-kde-analitza.install
new file mode 100644
index 0000000..7bef2a4
--- /dev/null
+++ b/debian/qml6-module-org-kde-analitza.install
@@ -0,0 +1 @@
+usr/lib/*/qt6/qml/org/kde/analitza/
diff --git a/debian/rules b/debian/rules
index 288ca24..49552b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +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-8~
-
-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_makeshlibs:
-	$(overridden_command) -V
-
-override_dh_strip:
-	$(overridden_command) --dbgsym-migration='libanalitza-dbg (<= 4:15.12.0-1~~)'
+%:
+	dh $@ --with kf6 --buildsystem kf6


More information about the Neon-commits mailing list