[neon/backports-jammy/appstream-jammy2/Neon/unstable] debian: qual build

[Carlos De Maine]

Git commit 5716ffad858398814a20d70f039834a4d37c4bfa by Carlos De Maine.
Committed on 13/09/2023 at 08:11.
Pushed by carlosdem into branch 'Neon/unstable'.

qual build

M  +1    -1    debian/libappstreamqt5-dev
M  +1    -1    debian/libappstreamqt6-3.install
R  +1    -1    debian/libappstreamqt6-dev.install [from: debian/libappstreamqt6-dev - 051% similarity]
M  +13   -11   debian/rules

https://invent.kde.org/neon/backports-jammy/appstream-jammy2/-/commit/5716ffad858398814a20d70f039834a4d37c4bfa

diff --git a/debian/libappstreamqt5-dev b/debian/libappstreamqt5-dev
index 6b5d392..838017a 100644
--- a/debian/libappstreamqt5-dev
+++ b/debian/libappstreamqt5-dev
@@ -1,2 +1,2 @@
 usr/lib/*/cmake/AppStreamQt5/*
-usr/lib/*/libAppStreamQt5.so
\ No newline at end of file
+usr/lib/*/libAppStreamQt5.so
diff --git a/debian/libappstreamqt6-3.install b/debian/libappstreamqt6-3.install
index 7c5708b..89bdc8f 100644
--- a/debian/libappstreamqt6-3.install
+++ b/debian/libappstreamqt6-3.install
@@ -1 +1 @@
-usr/lib/*/libAppStreamQt6.so.*
+usr/lib/*/libAppStreamQt.so.*
diff --git a/debian/libappstreamqt6-dev b/debian/libappstreamqt6-dev.install
similarity index 51%
rename from debian/libappstreamqt6-dev
rename to debian/libappstreamqt6-dev.install
index 54bae61..0ce41f6 100644
--- a/debian/libappstreamqt6-dev
+++ b/debian/libappstreamqt6-dev.install
@@ -1,2 +1,2 @@
 usr/lib/*/cmake/AppStreamQt/*
-usr/lib/*/libAppStreamQt6.so
\ No newline at end of file
+usr/lib/*/libAppStreamQt.so
diff --git a/debian/rules b/debian/rules
index b9e36c5..08b1e1b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,30 +8,32 @@ else
 ENABLE_COMPOSE=-Dcompose=false
 endif
 
-AS_CONFIGURE_ARGS = -Dqt=true \
-		-Dqt5=trues \
-		-Dapt-support=true \
-		$(ENABLE_COMPOSE) \
-		-Dvapi=true
-
 %:
 	dh $@ --with gir
 
 execute_after_dh_auto_clean:
-	rm -rf build-Qt6
+	rm -rf build-qt5
 
 override_dh_auto_configure:
-	dh_auto_configure -- $(AS_CONFIGURE_ARGS) -DUSE_QT_VERSION=5
-	dh_auto_configure --builddirectory=build-Qt6 -- $(AS_CONFIGURE_ARGS) -DUSE_QT_VERSION=6
+	dh_auto_configure -- -Dqt=true -Dapt-support=true $(ENABLE_COMPOSE) -Dvapi=true
+	dh_auto_configure --builddirectory=build-qt5 -- -Dqt5=true
 
 override_dh_auto_build:
 	dh_auto_build
-	dh_auto_build --builddirectory=build-Qt6
+	dh_auto_build --builddirectory=build-qt5
 
 override_dh_auto_install:
 	dh_auto_install
-	dh_auto_install --builddirectory=build-Qt6
+	dh_auto_install --builddirectory=build-qt5
 
 override_dh_missing:
 	dh_missing --fail-missing
 	dh_missing --fail-missing
+
+override_dh_test:
+	:
+	:
+
+override_dh_auto_test:
+	:
+	: