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

Carlos De Maine null at kde.org
Sun Dec 3 03:52:26 GMT 2023


Git commit 182e955d94da457d3f6f466e4b763c542ac43786 by Carlos De Maine.
Committed on 03/12/2023 at 04:52.
Pushed by carlosdem into branch 'Neon/unstable'.

kf6ify

M  +48   -20   debian/control
M  +1    -1    debian/libmauikitdocuments-dev.install
D  +0    -3    debian/libmauikitdocuments3.install
D  +0    -1    debian/libmauikitdocuments3.lintian-overrides
A  +3    -0    debian/libmauikitdocuments4.install
A  +1    -0    debian/libmauikitdocuments4.lintian-overrides
D  +0    -1    debian/qml-module-org-mauikit-documents.install
A  +1    -0    debian/qml6-module-org-mauikit-documents.install
M  +3    -1    debian/rules

https://invent.kde.org/neon/neon-packaging/mauikit-documents/-/commit/182e955d94da457d3f6f466e4b763c542ac43786

diff --git a/debian/control b/debian/control
index 1eff852..829f2ba 100644
--- a/debian/control
+++ b/debian/control
@@ -12,49 +12,77 @@ Build-Depends: cmake,
                libkf5filemetadata-dev,
                libpoppler-dev,
                libpoppler-private-dev,
-               libpoppler-qt5-dev,
+               libpoppler-qt6-dev,
                mauiman-dev,
                mauikit-dev,
-               qtbase5-dev,
-               qtbase5-private-dev,
-               qtdeclarative5-dev,
-               qtdeclarative5-private-dev
+               qt6-base-dev,
+               qt6-declarative-dev,
 Standards-Version: 4.6.2
 Homepage: https://mauikit.org/
 
-Package: qml-module-org-mauikit-documents
+Package: qml6-module-org-mauikit-documents
 Architecture: any
 Depends: libmauikit,
-         libmauikitdocuments3,
-         qml-module-org-kde-kirigami2,
-         qml-module-org-maui-mauikit,
-         qml-module-qt-labs-settings,
-         qml-module-qtquick-controls2,
+         libmauikitdocuments4,
+         qml6-module-org-kde-kirigami2,
+         qml6-module-org-maui-mauikit,
+         qml6-module-qt-labs-settings,
+         qml6-module-qtquick-controls,
          qml-module-qtquick-shapes,
          ${misc:Depends},
          ${shlibs:Depends}
+Replaces: qml-module-mauikit-documents
+Provides: qml-module-mauikit-documents
 Description: MauiKit QtQuick plugins for text editing
  .
  This package contains the mauikit text editing qml module.
 
-Package: libmauikitdocuments3
+Package: libmauikitdocuments4
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libmauikitdocuments, libmauikitdocuments1, libmauikitdocuments2
-Replaces: libmauikitdocuments, libmauikitdocuments1, libmauikitdocuments2
+Depends: qt6-base,
+         ${misc:Depends}, 
+         ${shlibs:Depends}
+Replaces: libmauikitdocuments, libmauikitdocuments1, libmauikitdocuments2, libmauikitdocuments3
+Provides: libmauikitdocuments, libmauikitdocuments1, libmauikitdocuments2, libmauikitdocuments3
 Description: MauiKit QtQuick plugins for text editing
  .
  This package contains the mauikit text editing library.
 
 Package: libmauikitdocuments-dev
 Architecture: any
-Depends: libmauikitdocuments3 (= ${binary:Version}),
-               libpoppler-dev,
-               libpoppler-private-dev,
-               libpoppler-qt5-dev,
-         qml-module-org-mauikit-documents,
+Depends: libmauikitdocuments4 (= ${binary:Version}),
+         libpoppler-dev,
+         libpoppler-private-dev,
+         libpoppler-qt6-dev,
+         qml6-module-org-mauikit-documents,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: MauiKit QtQuick plugins for text editing
  .
  This package contains mauikit text editing development files.
+
+Package: qml-module-org-mauikit-documents
+
+Package: libmauikitdocuments 
+Architecture: all
+Depends: libmauikitdocuments4, misc:Depends
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libmauikitdocuments1
+Architecture: all
+Depends: libmauikitdocuments4, misc:Depends
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libmauikitdocuments2
+Architecture: all
+Depends: libmauikitdocuments4, misc:Depends
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libmauikitdocuments3
+Architecture: all
+Depends: libmauikitdocuments4, misc:Depends
+Description: Dummy transitional
+ Transitional dummy package.
\ No newline at end of file
diff --git a/debian/libmauikitdocuments-dev.install b/debian/libmauikitdocuments-dev.install
index b08e7ab..3337cb1 100644
--- a/debian/libmauikitdocuments-dev.install
+++ b/debian/libmauikitdocuments-dev.install
@@ -1,3 +1,3 @@
 usr/include/
 usr/lib/*/cmake/
-usr/lib/*/libMauiKitDocuments3.so
+usr/lib/*/libMauiKitDocuments4.so
diff --git a/debian/libmauikitdocuments3.install b/debian/libmauikitdocuments3.install
deleted file mode 100644
index c754864..0000000
--- a/debian/libmauikitdocuments3.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/libMauiKitDocuments3.so.3
-usr/lib/*/libMauiKitDocuments3.so.3*
-usr/share/locale/*/LC_MESSAGES/mauikitdocuments.mo
diff --git a/debian/libmauikitdocuments3.lintian-overrides b/debian/libmauikitdocuments3.lintian-overrides
deleted file mode 100644
index e194455..0000000
--- a/debian/libmauikitdocuments3.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libmauikitdocuments3: package-name-doesnt-match-sonames libMauiKitDocuments3-3
\ No newline at end of file
diff --git a/debian/libmauikitdocuments4.install b/debian/libmauikitdocuments4.install
new file mode 100644
index 0000000..673a5fd
--- /dev/null
+++ b/debian/libmauikitdocuments4.install
@@ -0,0 +1,3 @@
+usr/lib/*/libMauiKitDocuments4.so.4
+usr/lib/*/libMauiKitDocuments4.so.3*
+usr/share/locale/*/LC_MESSAGES/mauikitdocuments.mo
diff --git a/debian/libmauikitdocuments4.lintian-overrides b/debian/libmauikitdocuments4.lintian-overrides
new file mode 100644
index 0000000..e5ad00f
--- /dev/null
+++ b/debian/libmauikitdocuments4.lintian-overrides
@@ -0,0 +1 @@
+libmauikitdocuments4: package-name-doesnt-match-sonames libMauiKitDocuments4-4
\ No newline at end of file
diff --git a/debian/qml-module-org-mauikit-documents.install b/debian/qml-module-org-mauikit-documents.install
deleted file mode 100644
index b501d0a..0000000
--- a/debian/qml-module-org-mauikit-documents.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/qt5
diff --git a/debian/qml6-module-org-mauikit-documents.install b/debian/qml6-module-org-mauikit-documents.install
new file mode 100644
index 0000000..fd7d25f
--- /dev/null
+++ b/debian/qml6-module-org-mauikit-documents.install
@@ -0,0 +1 @@
+usr/lib/*/qt6/
diff --git a/debian/rules b/debian/rules
index 2d33f6a..49552b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,6 @@
 #!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
-	dh $@
+	dh $@ --with kf6 --buildsystem kf6


More information about the Neon-commits mailing list