[neon/neon-packaging/mauikit/Neon/unstable] debian: kf6ify

Carlos De Maine null at kde.org
Fri Nov 24 01:08:40 GMT 2023


Git commit 47c84e8cc6e17fd99481c32c69ce3a51eee93886 by Carlos De Maine.
Committed on 24/11/2023 at 02:08.
Pushed by carlosdem into branch 'Neon/unstable'.

kf6ify

M  +23   -23   debian/control
D  +0    -1    debian/qml-module-org-maui-mauikit.install
A  +1    -0    debian/qml6-module-org-maui-mauikit.install
M  +5    -1    debian/rules

https://invent.kde.org/neon/neon-packaging/mauikit/-/commit/47c84e8cc6e17fd99481c32c69ce3a51eee93886

diff --git a/debian/control b/debian/control
index 70d8209..a744a10 100644
--- a/debian/control
+++ b/debian/control
@@ -4,23 +4,23 @@ Priority: optional
 Maintainer: Jonah BrĂ¼chert <jbb at kaidan.im>
 Build-Depends: cmake,
                debhelper-compat (= 13),
-               extra-cmake-modules,
-               libkf5i18n-dev,
-               libkf5kio-dev,
-               libkf5notifications-dev,
-               libkf5solid-dev,
-               libkf5syntaxhighlighting-dev,
-               libqt5svg5-dev,
-               libqt5x11extras5-dev,
+               kf6-extra-cmake-modules,
+               kf6-ki18n-dev,
+               kf6-kio-dev,
+               kf6-knotifications-dev,
+               kf6-solid-dev,
+               kf6-syntaxhighlighting-dev,
                libxcb-icccm4-dev,
                libxcb-shape0-dev,
                mauiman-dev,
                ninja-build,
-               qtbase5-dev,
-               qtdeclarative5-dev,
-               qtquickcontrols2-5-dev,
-               qtwebengine5-dev
-Standards-Version: 4.2.1
+               qt6-5compat-dev,
+               qt6-base-dev,
+               qt6-declarative-dev,
+               qt6-svg-dev,
+               qt6-5compat-dev,
+               qt6-webengine-dev
+Standards-Version: 4.6.2
 Homepage: https://maui-project.org/
 Vcs-Git: https://gitlab.com/debian-pm/mauikit.git
 Vcs-Browser: https://gitlab.com/debian-pm/mauikit
@@ -41,7 +41,7 @@ Description: Kit for developing MAUI Apps.
 Package: mauikit-dev
 Architecture: any
 Depends: libmauikit (= ${binary:Version}),
-         qml-module-org-maui-mauikit (= ${binary:Version}),
+         qml6-module-org-maui-mauikit (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Kit for developing MAUI Apps.
@@ -54,19 +54,19 @@ Description: Kit for developing MAUI Apps.
  .
  This package contains mauikit development files
 
-Package: qml-module-org-maui-mauikit
+Package: qml6-module-org-maui-mauikit
 Architecture: any
 Depends: libmauikit (= ${binary:Version}),
-         qml-module-org-kde-kirigami2,
-         qml-module-qmltermwidget,
-         qml-module-qtgraphicaleffects,
-         qml-module-qtquick-controls2,
-         qml-module-qtquick-shapes,
-         qml-module-qtwebengine,
+         qml6-module-org-kde-kirigami2,
+         qml6-module-qmltermwidget,
+         qml6-module-qtgraphicaleffects,
+         qml6-module-qtquick-controls,
+         qml6-module-qtquick-shapes,
+         qml6-module-qtwebengine,
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: qml-module-org-kde-mauikit (<< 2.2.2)
-Replaces: qml-module-org-kde-mauikit (<< 2.2.2)
+Breaks: qml-module-org-kde-mauikit
+Replaces: qml-module-org-kde-mauikit
 Description: Kit for developing MAUI Apps.
  A set of templated controls and tools based off QQC2 and Kirigami
  shared among the Maui set of applications
diff --git a/debian/qml-module-org-maui-mauikit.install b/debian/qml-module-org-maui-mauikit.install
deleted file mode 100644
index f7fff69..0000000
--- a/debian/qml-module-org-maui-mauikit.install
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/*/qt5/
diff --git a/debian/qml6-module-org-maui-mauikit.install b/debian/qml6-module-org-maui-mauikit.install
new file mode 100644
index 0000000..92d597b
--- /dev/null
+++ b/debian/qml6-module-org-maui-mauikit.install
@@ -0,0 +1 @@
+/usr/lib/*/qt6/
diff --git a/debian/rules b/debian/rules
index e20610b..5b7382b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,10 @@
 #!/usr/bin/make -f
 
-export QT_SELECT=qt5
+export QT_SELECT=qt6
 
 %:
 	dh $@ --buildsystem=cmake
+
+override_dh_auto_configure:
+	dh_auto_configure -- \
+	-DBUILD_WITH_QT6=ON
\ No newline at end of file


More information about the Neon-commits mailing list