From cefe2f3f32e0d6614664caf829389609670b1c8f Mon Sep 17 00:00:00 2001
From: Emmanuel Engelhart <kelson@kiwix.org>
Date: Thu, 2 Jan 2025 15:05:44 +0100
Subject: [PATCH] Stop publishing on Ubuntu Focal/20.04 PPA (not providing Qt6)

---
 .github/workflows/package.yml | 18 +++++++++---------
 debian/control                |  1 +
 debian/rules                  |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index 52d60eb..adb2bdd 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -21,7 +21,7 @@ jobs:
 #          - debian-bullseye
           - ubuntu-noble
           - ubuntu-jammy
-          - ubuntu-focal
+#          - ubuntu-focal
     steps:
       - uses: actions/checkout@v4
 
@@ -72,7 +72,7 @@ jobs:
 #        with:
 #          args: --no-sign
 
-      - uses: legoktm/gh-action-build-deb@9114a536498b65c40b932209b9833aa942bf108d # pin@ubuntu-noble
+      - uses: legoktm/gh-action-build-deb@ubuntu-noble
         if: matrix.distro == 'ubuntu-noble'
         name: Build package for ubuntu-noble
         id: build-ubuntu-noble
@@ -88,13 +88,13 @@ jobs:
           args: --no-sign
           ppa: ${{ steps.ppa.outputs.ppa }}
 
-      - uses: legoktm/gh-action-build-deb@ubuntu-focal
-        if: matrix.distro == 'ubuntu-focal'
-        name: Build package for ubuntu-focal
-        id: build-ubuntu-focal
-        with:
-          args: --no-sign
-          ppa: ${{ steps.ppa.outputs.ppa }}
+#      - uses: legoktm/gh-action-build-deb@ubuntu-focal
+#        if: matrix.distro == 'ubuntu-focal'
+#        name: Build package for ubuntu-focal
+#        id: build-ubuntu-focal
+#        with:
+#          args: --no-sign
+#          ppa: ${{ steps.ppa.outputs.ppa }}
 
       - uses: actions/upload-artifact@v4
         with:
diff --git a/debian/control b/debian/control
index 5cfc177..cca11e9 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
 Maintainer: Kiwix team <kiwix@kiwix.org>
 Build-Depends: debhelper-compat (= 13),
  pkg-config,
+ qtchooser,
  qt6-base-dev,
  qt6-svg-dev,
  qt6-webengine-dev,
diff --git a/debian/rules b/debian/rules
index f023663..12e7f3b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-export QT_SELECT=qt5
+export QT_SELECT = qt6
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %: