[neon/neon-packaging/atcore/Neon/unstable] debian: kf6ify
Carlos De Maine
null at kde.org
Mon May 5 06:05:30 BST 2025
Git commit 013b667f1ab17424298223d5d3e33ea23ce1a509 by Carlos De Maine.
Committed on 05/05/2025 at 05:05.
Pushed by carlosdem into branch 'Neon/unstable'.
kf6ify
D +0 -1 debian/compat
M +23 -41 debian/control
M +1 -2 debian/libatcore-dev.install
M +1 -1 debian/libatcore1.install
D +0 -2 debian/qml-module-org-kde-atcore.install
A +2 -0 debian/qml6-module-org-kde-atcore.install
M +4 -1 debian/rules
https://invent.kde.org/neon/neon-packaging/atcore/-/commit/013b667f1ab17424298223d5d3e33ea23ce1a509
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 fa7895c..42e8380 100644
--- a/debian/control
+++ b/debian/control
@@ -3,21 +3,21 @@ Section: kde
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Build-Depends: cmake,
- debhelper (>= 9),
+ debhelper-compat (= 13),
doxygen,
- extra-cmake-modules,
+ kf6-extra-cmake-modules,
+ kf6-kconfigwidgets-dev,
+ kf6-ki18n-dev,
+ kf6-ksolid-dev,
+ kf6-kxmlgui-dev,
libgit2-dev,
- libkf5configwidgets-dev,
- libkf5i18n-dev,
- libkf5solid-dev,
- libkf5xmlgui-dev,
- libqt5charts5-dev,
- libqt5serialport5-dev,
- pkg-kde-tools (>= 0.12),
- qtbase5-dev,
- qtdeclarative5-dev,
- qttools5-dev
-Standards-Version: 3.9.8
+ pkg-kde-tools,
+ qt6-base-dev,
+ qt6-charts-dev,
+ qt6-declarative-dev,
+ qt6-serialport-dev,
+ qt6-tools-dev
+Standards-Version: 4.6.2
Homepage: http://www.kde.org/
Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/kde-extras/atcore.git
Vcs-Git: https://anonscm.debian.org/git/pkg-kde/kde-extras/atcore.git
@@ -26,8 +26,6 @@ Package: libatcore1
Section: libs
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: libkf5atcore1 (<< ${source:Version}~ciBuild)
-Breaks: libkf5atcore1 (<< ${source:Version}~ciBuild)
Description: Open Source 3D Printing Host - Core Components
An api to manage serial connections between computers and 3d printers.
@@ -35,22 +33,20 @@ Package: libatcorewidgets1
Section: libs
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: qml-module-org-kde-atcore
+Recommends: qml6-module-org-kde-atcore
Description: Open Source 3D Printing Host - Widgets
An api to manage serial connections between computers and 3d printers.
Package: libatcore-dev
Section: libdevel
Architecture: any
-Replaces: libkf5atcore-dev (<< ${source:Version}~ciBuild)
-Breaks: libkf5atcore-dev (<< ${source:Version}~ciBuild)
Depends: libatcore1 (= ${binary:Version}),
libatcorewidgets1 (= ${binary:Version}),
- libkf5solid-dev,
- libqt5serialport5-dev,
- qml-module-org-kde-atcore (= ${binary:Version}),
- qtbase5-dev,
- ${misc:Depends}
+ kf6-ksolid-dev,
+ qml6-module-org-kde-atcore (= ${binary:Version}),
+ qt6-base-dev,
+ qt6-serialport-dev,
+ ${misc:Depends},
Recommends: atcore-doc
Description: Open Source 3D Printing Host - Core Components (development)
An api to manage serial connections between computers and 3d printers.
@@ -74,28 +70,14 @@ Description: Open Source 3D Printing Host - API documentation
.
This package contains the API documentation.
-Package: libkf5atcore1
-Architecture: all
-Depends: libatcore1
-Section: oldlibs
-Priority: extra
-Description: Transitional dummy package
- This transitional dummy package can be safely removed
-
-Package: libkf5atcore-dev
-Architecture: all
-Depends: libatcore-dev
-Section: oldlibs
-Priority: extra
-Description: Transitional dummy package
- This transitional dummy package can be safely removed
-
-Package: qml-module-org-kde-atcore
+Package: qml6-module-org-kde-atcore
Architecture: any
Depends: libatcore1 (= ${binary:Version}),
libatcorewidgets1 (= ${binary:Version}),
${misc:Depends},
- ${shlibs:Depends}
+ ${shlibs:Depends},
+Breaks: qml-module-org-kde-atcore (<< ${source:Version}~ciBuild)
+Replaces: qml-module-org-kde-atcore (<< ${source:Version}~ciBuild)
Description: Open Source 3D Printing Host - 3D printing
An api to manage serial connections between computers and 3d
printers.
diff --git a/debian/libatcore-dev.install b/debian/libatcore-dev.install
index 1649d98..52ea122 100644
--- a/debian/libatcore-dev.install
+++ b/debian/libatcore-dev.install
@@ -2,5 +2,4 @@ usr/include/AtCore/
usr/lib/*/cmake/AtCore/
usr/lib/*/libAtCore.so
usr/lib/*/libAtCoreWidgets.so
-usr/lib/*/qt5/mkspecs/modules/qt_AtCore.pri
-usr/lib/*/qt5/mkspecs/modules/qt_AtCoreWidgets.pri
+usr/lib/*/qt6/
\ No newline at end of file
diff --git a/debian/libatcore1.install b/debian/libatcore1.install
index 4ec549f..b4e3e05 100644
--- a/debian/libatcore1.install
+++ b/debian/libatcore1.install
@@ -1,3 +1,3 @@
usr/lib/*/libAtCore.so.*
-usr/lib/*/qt5/plugins/AtCore/
+usr/lib/*/qt6/plugins/AtCore/
usr/share/locale/
diff --git a/debian/qml-module-org-kde-atcore.install b/debian/qml-module-org-kde-atcore.install
deleted file mode 100644
index e00802b..0000000
--- a/debian/qml-module-org-kde-atcore.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/qt5/qml/org/kde/atcore/libatcoreextensionplugin.so
-usr/lib/*/qt5/qml/org/kde/atcore/qmldir
diff --git a/debian/qml6-module-org-kde-atcore.install b/debian/qml6-module-org-kde-atcore.install
new file mode 100644
index 0000000..fa8bac1
--- /dev/null
+++ b/debian/qml6-module-org-kde-atcore.install
@@ -0,0 +1,2 @@
+usr/lib/*/qt6/qml/org/kde/atcore/libatcoreextensionplugin.so
+usr/lib/*/qt6/qml/org/kde/atcore/qmldir
diff --git a/debian/rules b/debian/rules
index 965ecf2..9f637a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,9 @@
#!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
+%:
+ dh $@ --with kf6 --buildsystem kf6
override_dh_auto_configure:
dh_auto_configure -- -DBUILD_GUI=ON -DBUILD_DOCS=ON
More information about the Neon-commits
mailing list