[neon/3rdparty/libaccounts-qt/Neon/unstable] debian: Revert "get a qt5 build out for testing/stable edition"

[Scarlett Moore]

Git commit 2e711160c33707caefc69055df2b74189c0626ab by Scarlett Moore.
Committed on 18/09/2023 at 16:40.
Pushed by scarlettmoore into branch 'Neon/unstable'.

Revert "get a qt5 build out for testing/stable edition"

This reverts commit 202cfaeecf31ff6694bf2e6f8cbe94033268f9f1.

M  +26   -2    debian/control
A  +2    -0    debian/libaccounts-qt6-1.install
A  +4    -0    debian/libaccounts-qt6-dev.install
M  +3    -0    debian/patches/series
M  +23   -14   debian/rules

https://invent.kde.org/neon/3rdparty/libaccounts-qt/-/commit/2e711160c33707caefc69055df2b74189c0626ab

diff --git a/debian/control b/debian/control
index d63f464..4ae7a4e 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,9 @@ Build-Depends: debhelper-compat (= 13),
                pkg-config,
                qt5-qmake,
                qtbase5-dev,
-               qtchooser
-Build-Depends-Indep: doxygen, graphviz, qttools5-dev-tools
+               qtchooser,
+               qt6-base-dev,
+Build-Depends-Indep: doxygen, graphviz, qttools5-dev-tools, qt6-base-dev
 Standards-Version: 4.5.1
 Rules-Requires-Root: no
 Homepage: https://gitlab.com/accounts-sso/libaccounts-qt
@@ -40,6 +41,29 @@ Description: Accounts database access Qt version - Qt5 shared library
  .
  This package contains shared libraries to be used by Qt5 applications.
 
+Package: libaccounts-qt6-dev
+Section: libdevel
+Architecture: any
+Depends: libaccounts-qt6-1 (= ${binary:Version}),
+         ${misc:Depends},
+Description: Accounts database access Qt version - Qt6 development files
+ Accounts and SSO (Single Sign-On) framework for Linux and POSIX based
+ platforms.
+ .
+ This package contains files the development files of the accounts database
+ access Qt6 API.
+
+Package: libaccounts-qt6-1
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Accounts database access Qt version - Qt6 shared library
+ Accounts and SSO (Single Sign-On) framework for Linux and POSIX based
+ platforms.
+ .
+ This package contains shared libraries to be used by Qt5 applications.
+
 Package: libaccounts-qt-doc
 Section: doc
 Architecture: all
diff --git a/debian/libaccounts-qt6-1.install b/debian/libaccounts-qt6-1.install
new file mode 100644
index 0000000..0dd637c
--- /dev/null
+++ b/debian/libaccounts-qt6-1.install
@@ -0,0 +1,2 @@
+usr/lib/*/libaccounts-qt6.so.1
+usr/lib/*/libaccounts-qt6.so.1.*
diff --git a/debian/libaccounts-qt6-dev.install b/debian/libaccounts-qt6-dev.install
new file mode 100644
index 0000000..04aa8dc
--- /dev/null
+++ b/debian/libaccounts-qt6-dev.install
@@ -0,0 +1,4 @@
+usr/include/accounts-qt6/
+usr/lib/*/cmake/AccountsQt6/
+usr/lib/*/libaccounts-qt6.so
+usr/lib/*/pkgconfig/accounts-qt6.pc
diff --git a/debian/patches/series b/debian/patches/series
index a6fc60b..8a0cae7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,5 @@
 Install-the-doc-FILES.patch
 Build-docs-if-doxygen-is-available.patch
+qt6-toset.diff
+dualbuild.diff
+linkingtoo.diff
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index d7463cb..6331cd6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,26 +2,35 @@
 # -*- makefile -*-
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
-export QT_SELECT=5
+
+%:
+	dh $@
+
+override_dh_auto_clean:
+	-dh_auto_clean -- cleandocs
+	dh_auto_clean
+
+execute_after_dh_auto_clean:
+	rm -rf build6
 
 override_dh_auto_configure:
-	dh_auto_configure -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+#	mkdir -p build6 && cd build6 && qmake6 "QMAKE_CFLAGS_RELEASE=${CFLAGS} ${CPPFLAGS}" "QMAKE_CFLAGS_DEBUG=${CFLAGS} ${CPPFLAGS}" "QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} ${CPPFLAGS}" "QMAKE_CXXFLAGS_DEBUG=${CXXFLAGS} ${CPPFLAGS}" "QMAKE_LFLAGS_RELEASE=${LDFLAGS}" "QMAKE_LFLAGS_DEBUG=${LDFLAGS}" QMAKE_STRIP=: PREFIX=/usr .. && cd ..
+	mkdir -p build6 && cd build6 && QT_SELECT=qt6 qmake .. -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+	mkdir -p build && cd build && QT_SELECT=qt5 qmake .. -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+	#QT_SELECT=qt5 dh_auto_configure -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+
+override_dh_auto_build:
+	cd build6 && make
+	cd build && make
+	
 
 override_dh_auto_install:
-	dh_auto_install
-	find debian/tmp -name jquery.js -exec ln -sfv /usr/share/javascript/jquery/jquery.js {} \;
-	# test stuff
-	rm debian/tmp/usr/bin/accountstest
+	cd build6 && dh_auto_install &&	find debian/tmp -name jquery.js -exec ln -sfv /usr/share/javascript/jquery/jquery.js {} \;
+	cd build && dh_auto_install &&	find debian/tmp -name jquery.js -exec ln -sfv /usr/share/javascript/jquery/jquery.js {} \;
 
 override_dh_auto_test:
 	# Disable unittests
 	:
-
-override_dh_auto_clean:
-	-dh_auto_clean -- cleandocs
-	dh_auto_clean
-
-%:
-	dh $@
+	: