[neon/backports-jammy/accounts-qml6-module/Neon/unstable] debian: built qt6 version

[Carlos De Maine]

Git commit 754ef6b06e545218d343ecfb8e544492bcda7cd0 by Carlos De Maine.
Committed on 22/12/2023 at 09:21.
Pushed by carlosdem into branch 'Neon/unstable'.

built qt6 version

D  +0    -9    debian/accounts-qml-module-doc.doc-base
D  +0    -1    debian/accounts-qml-module-doc.install
A  +9    -0    debian/accounts-qml6-module-doc.doc-base
A  +2    -0    debian/accounts-qml6-module-doc.install
R  +0    -0    debian/accounts-qml6-module.examples [from: debian/accounts-qml-module.examples - 100% similarity]
M  +11   -12   debian/control
D  +0    -1    debian/qml-module-sso-onlineaccounts.install
A  +1    -0    debian/qml6-module-sso-onlineaccounts.install
M  +1    -0    debian/rules

https://invent.kde.org/neon/backports-jammy/accounts-qml6-module/-/commit/754ef6b06e545218d343ecfb8e544492bcda7cd0

diff --git a/debian/accounts-qml-module-doc.doc-base b/debian/accounts-qml-module-doc.doc-base
deleted file mode 100644
index 11f0ee4..0000000
--- a/debian/accounts-qml-module-doc.doc-base
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: accounts-qml-module-doc
-Title: Online Accounts QML API Documentation
-Author: Canonical Ltd.
-Abstract: This document describes the Online Accounts QML API
-Section: Programming/C++
-
-Format: HTML
-Index: /usr/share/doc/accounts-qml-module/html/sso-onlineaccounts-qmlmodule.html
-Files: /usr/share/doc/accounts-qml-module/html/*
diff --git a/debian/accounts-qml-module-doc.install b/debian/accounts-qml-module-doc.install
deleted file mode 100644
index 6db6160..0000000
--- a/debian/accounts-qml-module-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/accounts-qml-module/html
diff --git a/debian/accounts-qml6-module-doc.doc-base b/debian/accounts-qml6-module-doc.doc-base
new file mode 100644
index 0000000..1db361e
--- /dev/null
+++ b/debian/accounts-qml6-module-doc.doc-base
@@ -0,0 +1,9 @@
+Document: accounts-qml6-module-doc
+Title: Online Accounts QML6 API Documentation
+Author: Canonical Ltd.
+Abstract: This document describes the Online Accounts QML6 API
+Section: Programming/C++
+
+Format: HTML
+Index: /usr/share/doc/accounts-qml6-module/html/sso-onlineaccounts-qmlmodule.html
+Files: /usr/share/doc/accounts-qml6-module/html/*
diff --git a/debian/accounts-qml6-module-doc.install b/debian/accounts-qml6-module-doc.install
new file mode 100644
index 0000000..7ec931f
--- /dev/null
+++ b/debian/accounts-qml6-module-doc.install
@@ -0,0 +1,2 @@
+usr/share/doc/accounts-qml6
+-module/html
diff --git a/debian/accounts-qml-module.examples b/debian/accounts-qml6-module.examples
similarity index 100%
rename from debian/accounts-qml-module.examples
rename to debian/accounts-qml6-module.examples
diff --git a/debian/control b/debian/control
index b6bf298..28b6b72 100644
--- a/debian/control
+++ b/debian/control
@@ -5,14 +5,13 @@ Maintainer: Debian UBports Team <team+ubports at tracker.debian.org>
 Uploaders: Mike Gabriel <sunweaver at debian.org>,
 Build-Depends: dbus-test-runner,
                debhelper-compat (= 13),
-               libaccounts-qt5-dev (>= 1.10),
-               libsignon-qt5-dev (>= 8.50),
+               libaccounts-qt6-dev,
+               libsignon-qt6-dev,
                pkg-config,
-               qml-module-qtquick2,
-               qtdeclarative5-dev,
+               qt6-declarative-dev,
                qtdeclarative5-dev-tools,
                qtchooser,
-               qttools5-dev-tools <!cross>,
+               qt6-tools-dev,
                xauth,
                xvfb,
 Standards-Version: 4.6.2
@@ -21,27 +20,27 @@ Homepage: https://gitlab.com/accounts-sso/accounts-qml-module
 Vcs-Git: https://salsa.debian.org/ubports-team/accounts-qml-module.git
 Vcs-Browser: https://salsa.debian.org/ubports-team/accounts-qml-module/
 
-Package: qml-module-sso-onlineaccounts
+Package: qml6-module-sso-onlineaccounts
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         qml-module-qtquick2,
-Recommends: accounts-qml-module-doc
+         qml6-module-qtquick2,
+Recommends: accounts-qml6-module-doc
 Description: Expose the Online Accounts API to QML applications
  This QML module provides access to the Online Accounts framework from
  QML applications. It provides bindings to libaccounts-qt and
  libsignon-qt.
 
-Package: accounts-qml-module-doc
+Package: accounts-qml6-module-doc
 Section: doc
 Architecture: all
 Multi-Arch: foreign
 Build-Profiles: <!cross>
 Depends: ${misc:Depends},
-Description: Online Accounts QML - documentation
- This QML module provides access to the Online Accounts framework from
- QML applications. It provides bindings to libaccounts-qt and
+Description: Online Accounts QML6 - documentation
+ This QML6 module provides access to the Online Accounts framework from
+ QML6 applications. It provides bindings to libaccounts-qt and
  libsignon-qt.
  .
  This package contains developer documentation.
diff --git a/debian/qml-module-sso-onlineaccounts.install b/debian/qml-module-sso-onlineaccounts.install
deleted file mode 100644
index 5f48106..0000000
--- a/debian/qml-module-sso-onlineaccounts.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/qt5/qml/SSO/
diff --git a/debian/qml6-module-sso-onlineaccounts.install b/debian/qml6-module-sso-onlineaccounts.install
new file mode 100644
index 0000000..df70973
--- /dev/null
+++ b/debian/qml6-module-sso-onlineaccounts.install
@@ -0,0 +1 @@
+usr/lib/*/qt6/qml/SSO/
diff --git a/debian/rules b/debian/rules
index 0e7f3fe..6d7b8f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 override_dh_auto_configure:
 	dh_auto_configure \
 		-- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
+		QT_SELECT=6 \
 		"QMAKE_CXXFLAGS=$(CFLAGS)" \
 		CONFIG+=ubuntu-docs \
 			$(CONFIGURE_OPTS) \