[neon/backports-jammy/appstream-jammy2/Neon/unstable] debian: port to dual build

[Carlos De Maine]

Git commit 054505e771af05d3b70144fdf706f6814b09e5b7 by Carlos De Maine.
Committed on 13/09/2023 at 04:18.
Pushed by carlosdem into branch 'Neon/unstable'.

port to dual build

M  +59   -2    debian/control
M  +1    -2    debian/libappstreamqt-dev.install
D  +0    -1    debian/libappstreamqt3.install
A  +1    -0    debian/libappstreamqt5-3.install
A  +2    -0    debian/libappstreamqt5-dev
A  +1    -0    debian/libappstreamqt6-3.install
A  +2    -0    debian/libappstreamqt6-dev
M  +15   -1    debian/rules

https://invent.kde.org/neon/backports-jammy/appstream-jammy2/-/commit/054505e771af05d3b70144fdf706f6814b09e5b7

diff --git a/debian/control b/debian/control
index 6423683..d3dd52f 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Build-Depends: debhelper-compat (= 13),
                libzstd-dev,
                libyaml-dev,
                meson (>= 0.62),
+               qtbase5-dev,
                qt6-base-dev,
                valac
 Rules-Requires-Root: no
@@ -130,7 +131,7 @@ Description: Library to access AppStream services (introspection data)
  .
  This package contains introspection data for the AppStream library.
 
-Package: libappstreamqt3
+Package: libappstreamqt6-3
 Architecture: any
 Section: libs
 Multi-Arch: same
@@ -148,13 +149,51 @@ Description: Qt6 library to access AppStream services
  This package contains a Qt-based library to access AppStream
  services, like the software component metadata pool.
 
+Package: libappstreamqt5-3
+Architecture: any
+Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Description: Qt5 library to access AppStream services
+ AppStream is a metadata specification which permits software components to
+ provide information about themselves to automated systems and end-users
+ before the software is actually installed.
+ This permits informative displays of new applications to users in software
+ centers, as well as allowing a system to make decisions on which new software
+ a user might want to install (e.g. missing firmware or media handlers).
+ .
+ This package contains a Qt-based library to access AppStream
+ services, like the software component metadata pool.
+
 Package: libappstreamqt-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Depends: libappstreamqt3 (= ${binary:Version}),
+Depends: libappstreamqt5-3 (= ${binary:Version}),
+         libappstreamqt6-3 (= ${binary:Version}),
+         qtbase5-dev,
          qt6-base-dev,
          ${misc:Depends}
+Description: Qt library to access AppStream services (development files)
+ AppStream is a metadata specification which permits software components to
+ provide information about themselves to automated systems and end-users
+ before the software is actually installed.
+ This permits informative displays of new applications to users in software
+ centers, as well as allowing a system to make decisions on which new software
+ a user might want to install (e.g. missing firmware or media handlers).
+ .
+ This package contains development files necessary to develop
+ software management tools which use the Qt-based AppStream library.
+
+Package: libappstreamqt5-dev
+Architecture: any
+Multi-Arch: same
+Section: libdevel
+Depends: libappstreamqt5-3 (= ${binary:Version}),
+         qtbase5-dev,
+         ${misc:Depends}
 Description: Qt5 library to access AppStream services (development files)
  AppStream is a metadata specification which permits software components to
  provide information about themselves to automated systems and end-users
@@ -166,6 +205,24 @@ Description: Qt5 library to access AppStream services (development files)
  This package contains development files necessary to develop
  software management tools which use the Qt-based AppStream library.
 
+Package: libappstreamqt6-dev
+Architecture: any
+Multi-Arch: same
+Section: libdevel
+Depends: libappstreamqt6-3 (= ${binary:Version}),
+         qt6-base-dev,
+         ${misc:Depends}
+Description: Qt6 library to access AppStream services (development files)
+ AppStream is a metadata specification which permits software components to
+ provide information about themselves to automated systems and end-users
+ before the software is actually installed.
+ This permits informative displays of new applications to users in software
+ centers, as well as allowing a system to make decisions on which new software
+ a user might want to install (e.g. missing firmware or media handlers).
+ .
+ This package contains development files necessary to develop
+ software management tools which use the Qt-based AppStream library.
+
 Package: libappstream-compose0
 Architecture: amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
 Section: libs
diff --git a/debian/libappstreamqt-dev.install b/debian/libappstreamqt-dev.install
index 741d64e..298a965 100644
--- a/debian/libappstreamqt-dev.install
+++ b/debian/libappstreamqt-dev.install
@@ -1,3 +1,2 @@
 usr/include/AppStreamQt/*
-usr/lib/*/cmake/AppStreamQt/*
-usr/lib/*/libAppStreamQt.so
+
diff --git a/debian/libappstreamqt3.install b/debian/libappstreamqt3.install
deleted file mode 100644
index 89bdc8f..0000000
--- a/debian/libappstreamqt3.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libAppStreamQt.so.*
diff --git a/debian/libappstreamqt5-3.install b/debian/libappstreamqt5-3.install
new file mode 100644
index 0000000..709185f
--- /dev/null
+++ b/debian/libappstreamqt5-3.install
@@ -0,0 +1 @@
+usr/lib/*/libAppStreamQt5.so.*
diff --git a/debian/libappstreamqt5-dev b/debian/libappstreamqt5-dev
new file mode 100644
index 0000000..6b5d392
--- /dev/null
+++ b/debian/libappstreamqt5-dev
@@ -0,0 +1,2 @@
+usr/lib/*/cmake/AppStreamQt5/*
+usr/lib/*/libAppStreamQt5.so
\ No newline at end of file
diff --git a/debian/libappstreamqt6-3.install b/debian/libappstreamqt6-3.install
new file mode 100644
index 0000000..7c5708b
--- /dev/null
+++ b/debian/libappstreamqt6-3.install
@@ -0,0 +1 @@
+usr/lib/*/libAppStreamQt6.so.*
diff --git a/debian/libappstreamqt6-dev b/debian/libappstreamqt6-dev
new file mode 100644
index 0000000..54bae61
--- /dev/null
+++ b/debian/libappstreamqt6-dev
@@ -0,0 +1,2 @@
+usr/lib/*/cmake/AppStreamQt/*
+usr/lib/*/libAppStreamQt6.so
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 33533a1..b9e36c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,7 @@ ENABLE_COMPOSE=-Dcompose=false
 endif
 
 AS_CONFIGURE_ARGS = -Dqt=true \
+		-Dqt5=trues \
 		-Dapt-support=true \
 		$(ENABLE_COMPOSE) \
 		-Dvapi=true
@@ -16,8 +17,21 @@ AS_CONFIGURE_ARGS = -Dqt=true \
 %:
 	dh $@ --with gir
 
+execute_after_dh_auto_clean:
+	rm -rf build-Qt6
+
 override_dh_auto_configure:
-	dh_auto_configure -- $(AS_CONFIGURE_ARGS)
+	dh_auto_configure -- $(AS_CONFIGURE_ARGS) -DUSE_QT_VERSION=5
+	dh_auto_configure --builddirectory=build-Qt6 -- $(AS_CONFIGURE_ARGS) -DUSE_QT_VERSION=6
+
+override_dh_auto_build:
+	dh_auto_build
+	dh_auto_build --builddirectory=build-Qt6
+
+override_dh_auto_install:
+	dh_auto_install
+	dh_auto_install --builddirectory=build-Qt6
 
 override_dh_missing:
 	dh_missing --fail-missing
+	dh_missing --fail-missing