[neon/3rdparty/libaccounts-qt/Neon/unstable] debian: Fix arch triplet

[Scarlett Moore]

Git commit a97b9f360d4c1d869e3f0f54fb1e7d9095f9d3fe by Scarlett Moore.
Committed on 21/09/2023 at 14:25.
Pushed by scarlettmoore into branch 'Neon/unstable'.

Fix arch triplet

M  +2    -2    debian/libaccounts-qt5-1.install
M  +3    -3    debian/libaccounts-qt5-dev.install
M  +2    -2    debian/libaccounts-qt6-1.install
M  +3    -3    debian/libaccounts-qt6-dev.install
M  +2    -2    debian/rules

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

diff --git a/debian/libaccounts-qt5-1.install b/debian/libaccounts-qt5-1.install
index cbd1829..97a9bb1 100644
--- a/debian/libaccounts-qt5-1.install
+++ b/debian/libaccounts-qt5-1.install
@@ -1,2 +1,2 @@
-usr/lib/libaccounts-qt5.so.1
-usr/lib/libaccounts-qt5.so.1.*
+usr/lib/*/libaccounts-qt5.so.1
+usr/lib/*/libaccounts-qt5.so.1.*
diff --git a/debian/libaccounts-qt5-dev.install b/debian/libaccounts-qt5-dev.install
index 5544741..6e79828 100644
--- a/debian/libaccounts-qt5-dev.install
+++ b/debian/libaccounts-qt5-dev.install
@@ -1,4 +1,4 @@
 usr/include/accounts-qt5/
-usr/lib/cmake/AccountsQt5/
-usr/lib/libaccounts-qt5.so
-usr/lib/pkgconfig/accounts-qt5.pc
+usr/lib/*/cmake/AccountsQt5/
+usr/lib/*/libaccounts-qt5.so
+usr/lib/*/pkgconfig/accounts-qt5.pc
diff --git a/debian/libaccounts-qt6-1.install b/debian/libaccounts-qt6-1.install
index a580d44..0dd637c 100644
--- a/debian/libaccounts-qt6-1.install
+++ b/debian/libaccounts-qt6-1.install
@@ -1,2 +1,2 @@
-usr/lib/libaccounts-qt6.so.1
-usr/lib/libaccounts-qt6.so.1.*
+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
index eaebcc5..04aa8dc 100644
--- a/debian/libaccounts-qt6-dev.install
+++ b/debian/libaccounts-qt6-dev.install
@@ -1,4 +1,4 @@
 usr/include/accounts-qt6/
-usr/lib/cmake/AccountsQt6/
-usr/lib/libaccounts-qt6.so
-usr/lib/pkgconfig/accounts-qt6.pc
+usr/lib/*/cmake/AccountsQt6/
+usr/lib/*/libaccounts-qt6.so
+usr/lib/*/pkgconfig/accounts-qt6.pc
diff --git a/debian/rules b/debian/rules
index 78ea625..56afa99 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,9 +15,9 @@ override_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 ../Accounts/Accounts6.pro -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+	mkdir -p build6 && cd build6 && QT_SELECT=6 qmake6 ../Accounts/Accounts6.pro LIBDIR+=/usr/lib/$(DEB_HOST_MULTIARCH)
 	#mkdir -p build && cd build && QT_SELECT=qt5 qmake .. -- LIINSTALL_ROOT=BDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
-	mkdir -p build && cd build && QT_SELECT=5 qmake ../Accounts/Accounts.pro -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+	mkdir -p build && cd build && QT_SELECT=5 qmake ../Accounts/Accounts.pro LIBDIR+=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_auto_build:
 	cd build6 &&  make