[neon/neon-packaging/mauikit-imagetools/Neon/unstable] debian: kf6ify
Carlos De Maine
null at kde.org
Fri Nov 24 04:25:15 GMT 2023
Git commit a57e236506fd9343515305f219258184ba4212d2 by Carlos De Maine.
Committed on 24/11/2023 at 05:25.
Pushed by carlosdem into branch 'Neon/unstable'.
kf6ify
M +6 -0 debian/changelog
M +23 -25 debian/control
M +2 -2 debian/libmauikitimagetools-dev.install
D +0 -4 debian/libmauikitimagetools3.install
D +0 -1 debian/libmauikitimagetools3.lintian-overrides
A +4 -0 debian/libmauikitimagetools4.install
A +1 -0 debian/libmauikitimagetools4.lintian-overrides
D +0 -1 debian/qml-module-org-mauikit-imagetools.install
A +1 -0 debian/qml6-module-org-mauikit-imagetools.install
M +7 -1 debian/rules
https://invent.kde.org/neon/neon-packaging/mauikit-imagetools/-/commit/a57e236506fd9343515305f219258184ba4212d2
diff --git a/debian/changelog b/debian/changelog
index 69c9818..25f75cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mauikit-imagetools (4.0.0-0neon) jammy; urgency=medium
+
+ * New release
+
+ -- Neon CI <neon at kde.org> Thu, 25 May 2023 07:29:05 +0000
+
mauikit-imagetools (3.0.1-0neon) jammy; urgency=medium
* New release
diff --git a/debian/control b/debian/control
index 559c19c..0b22f7e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,57 +4,55 @@ Priority: optional
Maintainer: Jonathan Riddell <jr at jriddell.org>
Build-Depends: cmake,
debhelper-compat (= 13),
- extra-cmake-modules,
+ kf6-extra-cmake-modules,
+ kf6-kcoreaddons-dev,
+ kf6-ki18n-dev,
kquickimageeditor-dev,
libexiv2-dev,
- libkf5coreaddons-dev,
- libkf5i18n-dev,
libleptonica-dev,
libopencv-dev,
libtesseract-dev,
- libqt5positioningquick5,
- libqt5qmlmodels5,
- libqt5sql5,
- qtpositioning5-dev,
mauiman-dev,
mauikit-dev,
- qtbase5-dev,
- qtdeclarative5-dev
+ qt6-base-dev,
+ qt6-declarative-dev,
+ qt6-positioning-dev,
Standards-Version: 4.6.2
Homepage: https://mauikit.org/
-Package: qml-module-org-mauikit-imagetools
+Package: qml6-module-org-mauikit-imagetools
Architecture: any
Depends: libmauikit,
- libmauikitimagetools3,
- qml-module-org-kde-kirigami2,
- qml-module-org-kde-kquickimageeditor,
- qml-module-org-maui-mauikit,
- qml-module-qt-labs-qmlmodels,
- qml-module-qt-labs-settings,
- qml-module-qtquick-controls2,
- qml-module-qtquick-shapes,
+ libmauikitimagetools4,
+ qml6-module-org-kde-kirigami2,
+ qml6-module-org-kde-kquickimageeditor,
+ qml6-module-org-maui-mauikit,
+ qml6-module-qt-labs-qmlmodels,
+ qml6-module-qt-labs-settings,
+ qml6-module-qtquick-controls,
+ qml6-module-qtquick-shapes,
${misc:Depends},
${shlibs:Depends}
+Conflicts: qml-module-org-mauikit-imagetools
+Replaces: qml-module-org-mauikit-imagetools
Description: MauiKit Image Tools Components
- .
This package contains the mauikit image tools qml module.
-Package: libmauikitimagetools3
+Package: libmauikitimagetools4
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: qml-module-org-mauikit-imagetools,
+ ${misc:Depends},
+ ${shlibs:Depends}
Breaks: libmauikitimagetools, libmauikitimagetools1, libmauikitimagetools2
Replaces: libmauikitimagetools, libmauikitimagetools1, libmauikitimagetools2
Description: MauiKit Image Tools Components
- .
This package contains the mauikit image tools library.
Package: libmauikitimagetools-dev
Architecture: any
-Depends: libmauikitimagetools3 (= ${binary:Version}),
- qml-module-org-mauikit-imagetools,
+Depends: libmauikitimagetools4 (= ${binary:Version}),
+ qt6-base-dev,
${misc:Depends},
${shlibs:Depends}
Description: MauiKit Image Tools Components
- .
This package contains mauikit image tools development files.
diff --git a/debian/libmauikitimagetools-dev.install b/debian/libmauikitimagetools-dev.install
index 084542d..1bb6b3d 100644
--- a/debian/libmauikitimagetools-dev.install
+++ b/debian/libmauikitimagetools-dev.install
@@ -1,3 +1,3 @@
/usr/include/
-/usr/lib/*/cmake/MauiKitImageTools3/
-/usr/lib/*/libMauiKitImageTools3.so
+/usr/lib/*/cmake/MauiKitImageTools4/
+/usr/lib/*/libMauiKitImageTools4.so
diff --git a/debian/libmauikitimagetools3.install b/debian/libmauikitimagetools3.install
deleted file mode 100644
index 0ecf9e0..0000000
--- a/debian/libmauikitimagetools3.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/*/libMauiKitImageTools3.so.3
-usr/lib/*/libMauiKitImageTools3.so.3*
-usr/share/locale/
-usr/share/org/mauikit/imagetools/cities.db
diff --git a/debian/libmauikitimagetools3.lintian-overrides b/debian/libmauikitimagetools3.lintian-overrides
deleted file mode 100644
index 6cdacd1..0000000
--- a/debian/libmauikitimagetools3.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libmauikitimagetools3: package-name-doesnt-match-sonames libMauiKitImageTools3-3
\ No newline at end of file
diff --git a/debian/libmauikitimagetools4.install b/debian/libmauikitimagetools4.install
new file mode 100644
index 0000000..681b107
--- /dev/null
+++ b/debian/libmauikitimagetools4.install
@@ -0,0 +1,4 @@
+usr/lib/*/libMauiKitImageTools4.so.4
+usr/lib/*/libMauiKitImageTools4.so.4*
+usr/share/locale/
+usr/share/org/mauikit/imagetools/cities.db
diff --git a/debian/libmauikitimagetools4.lintian-overrides b/debian/libmauikitimagetools4.lintian-overrides
new file mode 100644
index 0000000..dfb436a
--- /dev/null
+++ b/debian/libmauikitimagetools4.lintian-overrides
@@ -0,0 +1 @@
+libmauikitimagetools4: package-name-doesnt-match-sonames libMauiKitImageTools4-4
\ No newline at end of file
diff --git a/debian/qml-module-org-mauikit-imagetools.install b/debian/qml-module-org-mauikit-imagetools.install
deleted file mode 100644
index f7fff69..0000000
--- a/debian/qml-module-org-mauikit-imagetools.install
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/*/qt5/
diff --git a/debian/qml6-module-org-mauikit-imagetools.install b/debian/qml6-module-org-mauikit-imagetools.install
new file mode 100644
index 0000000..92d597b
--- /dev/null
+++ b/debian/qml6-module-org-mauikit-imagetools.install
@@ -0,0 +1 @@
+/usr/lib/*/qt6/
diff --git a/debian/rules b/debian/rules
index 2d33f6a..c5e140f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,10 @@
#!/usr/bin/make -f
+export QT_SELECT=qt6
+
%:
- dh $@
+ dh $@ --buildsystem=cmake
+
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ -DBUILD_WITH_QT6=ON
More information about the Neon-commits
mailing list