[neon/3rdparty/libaccounts-qt/Neon/unstable] debian: try just qt6

[Scarlett Moore]

Git commit 1973c218050f4e9767f5666dd6bc804ef47438ff by Scarlett Moore.
Committed on 19/09/2023 at 18:28.
Pushed by scarlettmoore into branch 'Neon/unstable'.

try just qt6

M  +1    -27   debian/control
M  +15   -15   debian/rules

https://invent.kde.org/neon/3rdparty/libaccounts-qt/-/commit/1973c218050f4e9767f5666dd6bc804ef47438ff

diff --git a/debian/control b/debian/control
index 4ae7a4e..c6154f1 100644
--- a/debian/control
+++ b/debian/control
@@ -7,40 +7,14 @@ Build-Depends: debhelper-compat (= 13),
                libaccounts-glib-dev (>= 1.23),
                libglib2.0-dev,
                pkg-config,
-               qt5-qmake,
-               qtbase5-dev,
-               qtchooser,
                qt6-base-dev,
-Build-Depends-Indep: doxygen, graphviz, qttools5-dev-tools, qt6-base-dev
+Build-Depends-Indep: doxygen, graphviz, qt6-base-dev
 Standards-Version: 4.5.1
 Rules-Requires-Root: no
 Homepage: https://gitlab.com/accounts-sso/libaccounts-qt
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/3rdparty/libaccounts-qt
 Vcs-Git: https://salsa.debian.org/qt-kde-team/3rdparty/libaccounts-qt.git
 
-Package: libaccounts-qt5-dev
-Section: libdevel
-Architecture: any
-Depends: libaccounts-qt5-1 (= ${binary:Version}),
-         ${misc:Depends},
-Description: Accounts database access Qt version - Qt5 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 Qt5 API.
-
-Package: libaccounts-qt5-1
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Accounts database access Qt version - Qt5 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-qt6-dev
 Section: libdevel
 Architecture: any
diff --git a/debian/rules b/debian/rules
index c12b828..d94bbc1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,21 +11,21 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 override_dh_auto_clean:
 	-dh_auto_clean -- cleandocs
 	dh_auto_clean
-
-
-override_dh_auto_configure:
-#	mkdir -p build && cd build && qmake "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=6 qmake6 .. -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
-	#mkdir -p build && cd build && QT_SELECT=qt5 qmake .. -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
-	mkdir -p build && cd build && QT_SELECT=5 qmake .. -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
-
-override_dh_auto_build:
-	cd build6 && make
-	cd build && make
-
-override_dh_auto_install:
-	cd build6 && dh_auto_install
-	cd build && dh_auto_install
+#
+#
+# override_dh_auto_configure:
+# #	mkdir -p build && cd build && qmake "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=6 qmake6 .. -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+# 	#mkdir -p build && cd build && QT_SELECT=qt5 qmake .. -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+# 	mkdir -p build && cd build && QT_SELECT=5 qmake .. -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+#
+# override_dh_auto_build:
+# 	cd build6 && make
+# 	cd build && make
+#
+# override_dh_auto_install:
+# 	cd build6 && dh_auto_install
+# 	cd build && dh_auto_install
 
 override_dh_auto_test:
 	# Disable unittests