From 1949544ab92f8d98acb81d4fd52c2e22cc2a2394 Mon Sep 17 00:00:00 2001
From: Faustin Lammler <faustin@fala.red>
Date: Tue, 24 Oct 2023 19:48:25 +0200
Subject: [PATCH] Use apt-ftparchive

Also, the sources file needs to be adapted since we do not have a
typical tree.

See: https://manpages.debian.org/bookworm/apt-utils/apt-ftparchive.1.en.html
---
 master-galera/master.cfg | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/master-galera/master.cfg b/master-galera/master.cfg
index 7a36d644c..47b3c7069 100644
--- a/master-galera/master.cfg
+++ b/master-galera/master.cfg
@@ -205,7 +205,7 @@ for platform in all_platforms:
 
 def dpkgDeb():
     return ShellCommand(
-        name="dpkg-scanpackages/sources",
+        name="apt-ftparchive",
         haltOnFailure=True,
         command=[
             "sh",
@@ -215,8 +215,9 @@ def dpkgDeb():
     mkdir -p debs
     find .. -maxdepth 1 -type f -exec cp {} debs/ \;
     cd debs
-    ( dpkg-scanpackages . /dev/null && dpkg-scanpackages --type ddeb . /dev/null  )| gzip -9c > Packages.gz
-    dpkg-scansources . /dev/null | gzip -9c > Sources.gz
+    apt-ftparchive release . >Release
+    apt-ftparchive packages . >Packages
+    apt-ftparchive sources . >Sources
     cd ..
     find debs -type f -exec sha256sum {} \; | sort > sha256sums.txt
 """
@@ -290,12 +291,11 @@ f_deb_build.addStep(
         && cat << EOF > /packages/%(prop:branch)s/%(prop:revision)s/%(prop:buildername)s/galera.sources
 X-Repolib-Name: Galera
 Types: deb
-URIs: %(kw:url)s/galera/%(prop:branch)s/%(prop:revision)s/%(prop:buildername)s
-Suites: $VERSION_CODENAME
-Components: main main/debug
+URIs: %(kw:url)s/galera/%(prop:branch)s/%(prop:revision)s/%(prop:buildername)s/debs
+Suites: ./
 Trusted: yes
 EOF
-        ln -s %(prop:branch)s/%(prop:revision)s/%(prop:buildername)s/galera.sources /packages/%(prop:branch)s-latest-%(prop:buildername)s.sources \
+        ln -sf %(prop:branch)s/%(prop:revision)s/%(prop:buildername)s/galera.sources /packages/%(prop:branch)s-latest-%(prop:buildername)s.sources \
         && sync /packages/%(prop:branch)s/%(prop:revision)s
 """,
             url=os.getenv("ARTIFACTS_URL", default="https://ci.mariadb.org"),