[neon/neon-packaging/mauikit-filebrowsing/Neon/unstable] debian: kf6ify
Carlos De Maine
null at kde.org
Fri Nov 24 03:57:21 GMT 2023
Git commit 324470ec44b78f5f203384c09d0e5f04f0d0c893 by Carlos De Maine.
Committed on 24/11/2023 at 04:57.
Pushed by carlosdem into branch 'Neon/unstable'.
kf6ify
M +25 -24 debian/control
M +2 -2 debian/libmauikitfilebrowsing-dev.install
D +0 -3 debian/libmauikitfilebrowsing3.install
D +0 -1 debian/libmauikitfilebrowsing3.lintian-overrides
A +3 -0 debian/libmauikitfilebrowsing4.install
A +1 -0 debian/libmauikitfilebrowsing4.lintian-overrides
D +0 -1 debian/qml-module-org-mauikit-filebrowsing.install
A +1 -0 debian/qml6-module-org-mauikit-filebrowsing.install
M +6 -4 debian/rules
https://invent.kde.org/neon/neon-packaging/mauikit-filebrowsing/-/commit/324470ec44b78f5f203384c09d0e5f04f0d0c893
diff --git a/debian/control b/debian/control
index 55c2778..df9943e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,42 +4,44 @@ Priority: optional
Maintainer: Jonathan Riddell <jr at jriddell.org>
Build-Depends: cmake,
debhelper-compat (= 13),
- extra-cmake-modules,
- libkf5coreaddons-dev,
- libkf5i18n-dev,
- libkf5kio-dev,
+ kf6-extra-cmake-modules,
+ kf6-kcoreaddons-dev,
+ kf6-ki18n-dev,
+ kf6-kio-dev,
mauiman-dev,
mauikit-dev,
ninja-build,
- pkg-kde-tools,
- qtbase5-dev,
- qtdeclarative5-dev
+ pkg-kde-tools-neon,
+ qt6-base-dev,
+ qt6-declarative-dev
Standards-Version: 4.6.2
Homepage: https://mauikit.org/
-Package: qml-module-org-mauikit-filebrowsing
+Package: qml6-module-org-mauikit-filebrowsing
Architecture: any
Depends: libmauikit,
- libmauikitfilebrowsing3,
- qml-module-org-kde-kirigami2,
- qml-module-org-maui-mauikit,
- qml-module-qt-labs-settings,
- qml-module-qtquick-controls2,
- qml-module-qtquick-shapes,
+ libmauikitfilebrowsing4,
+ qml6-module-org-kde-kirigami2,
+ qml6-module-org-maui-mauikit,
+ qml6-module-qt-labs-settings,
+ qml6-module-qtquick-controls,
+ qml6-module-qtquick-shapes,
${misc:Depends},
${shlibs:Depends}
-Conflicts: qml-module-org-kde-mauikit-filebrowsing
-Replaces: qml-module-org-kde-mauikit-filebrowsing
+Conflicts: qml-module-org-mauikit-filebrowsing
+Replaces: qml-module-org-mauikit-filebrowsing
Description: MauiKit File Browsing utilities and controls
MauiKit File Browsing controls and utils.
.
This package contains the mauikit filebrowsing qml module.
-Package: libmauikitfilebrowsing3
+Package: libmauikitfilebrowsing4
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: libmauikitfilebrowsing, libmauikitfilebrowsing1, libmauikitfilebrowsing2
-Breaks: libmauikitfilebrowsing, libmauikitfilebrowsing1, libmauikitfilebrowsing2
+Depends: qml6-module-org-mauikit-filebrowsing,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Replaces: libmauikitfilebrowsing, libmauikitfilebrowsing1, libmauikitfilebrowsing2, libmauikitfilebrowsing3
+Breaks: libmauikitfilebrowsing, libmauikitfilebrowsing1, libmauikitfilebrowsing2, libmauikitfilebrowsing3
Description: MauiKit File Browsing utilities and controls
MauiKit File Browsing controls and utils.
.
@@ -47,10 +49,9 @@ Description: MauiKit File Browsing utilities and controls
Package: libmauikitfilebrowsing-dev
Architecture: any
-Depends: libmauikitfilebrowsing3 (= ${binary:Version}),
- qml-module-org-mauikit-filebrowsing,
- ${misc:Depends},
- ${shlibs:Depends}
+Depends: libmauikitfilebrowsing4 (= ${binary:Version}),
+ qt6-base-dev,
+ ${misc:Depends}
Description: MauiKit File Browsing utilities and controls
MauiKit File Browsing controls and utils.
.
diff --git a/debian/libmauikitfilebrowsing-dev.install b/debian/libmauikitfilebrowsing-dev.install
index 5f3be72..6cd0856 100644
--- a/debian/libmauikitfilebrowsing-dev.install
+++ b/debian/libmauikitfilebrowsing-dev.install
@@ -1,3 +1,3 @@
usr/include/
-usr/lib/*/cmake/MauiKitFileBrowsing3/
-usr/lib/*/libMauiKitFileBrowsing3.so
+usr/lib/*/cmake/MauiKitFileBrowsing4/
+usr/lib/*/libMauiKitFileBrowsing4.so
diff --git a/debian/libmauikitfilebrowsing3.install b/debian/libmauikitfilebrowsing3.install
deleted file mode 100644
index d0bb647..0000000
--- a/debian/libmauikitfilebrowsing3.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/libMauiKitFileBrowsing3.so.3
-usr/lib/*/libMauiKitFileBrowsing3.so.3*
-usr/share/locale/*/LC_MESSAGES/mauikitfilebrowsing.mo
\ No newline at end of file
diff --git a/debian/libmauikitfilebrowsing3.lintian-overrides b/debian/libmauikitfilebrowsing3.lintian-overrides
deleted file mode 100644
index 0d42e11..0000000
--- a/debian/libmauikitfilebrowsing3.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libmauikitfilebrowsing3: package-name-doesnt-match-sonames libMauiKitFileBrowsing3-3
\ No newline at end of file
diff --git a/debian/libmauikitfilebrowsing4.install b/debian/libmauikitfilebrowsing4.install
new file mode 100644
index 0000000..3bdf09a
--- /dev/null
+++ b/debian/libmauikitfilebrowsing4.install
@@ -0,0 +1,3 @@
+usr/lib/*/libMauiKitFileBrowsing4.so.4
+usr/lib/*/libMauiKitFileBrowsing4.so.4*
+usr/share/locale/*/LC_MESSAGES/mauikitfilebrowsing.mo
\ No newline at end of file
diff --git a/debian/libmauikitfilebrowsing4.lintian-overrides b/debian/libmauikitfilebrowsing4.lintian-overrides
new file mode 100644
index 0000000..ce51ed1
--- /dev/null
+++ b/debian/libmauikitfilebrowsing4.lintian-overrides
@@ -0,0 +1 @@
+libmauikitfilebrowsing4: package-name-doesnt-match-sonames libMauiKitFileBrowsing4-4
\ No newline at end of file
diff --git a/debian/qml-module-org-mauikit-filebrowsing.install b/debian/qml-module-org-mauikit-filebrowsing.install
deleted file mode 100644
index b501d0a..0000000
--- a/debian/qml-module-org-mauikit-filebrowsing.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/qt5
diff --git a/debian/qml6-module-org-mauikit-filebrowsing.install b/debian/qml6-module-org-mauikit-filebrowsing.install
new file mode 100644
index 0000000..c3b090f
--- /dev/null
+++ b/debian/qml6-module-org-mauikit-filebrowsing.install
@@ -0,0 +1 @@
+usr/lib/*/qt6
diff --git a/debian/rules b/debian/rules
index adccb8a..6eea383 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,13 @@
#!/usr/bin/make -f
-export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
-
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+export QT_SELECT=qt6
%:
- dh $@ --with kf5,pkgkde_symbolshelper --cmake+ninja --without build_stamp
+ dh $@ --buildsystem=cmake
+
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ -DBUILD_WITH_QT6=ON
#override_dh_auto_configure:
# dh_auto_configure -- -DCMAKE_POSITION_INDEPENDENT_CODE=ON
More information about the Neon-commits
mailing list