Merge pull request #424 from openzim/more-ppa-upload

Refresch a bit the 'packages' CI/CD with latest version of actions/distrib

.github/workflows/package.yml

@@ -16,6 +16,10 @@ jobs:
       matrix:
         distro:
           - debian-unstable
+          - debian-trixie
+          - debian-bookworm
+          - debian-bullseye
+          - ubuntu-noble
           - ubuntu-jammy
           - ubuntu-focal
     steps:
@@ -34,7 +38,7 @@ jobs:
         env:
           REF: ${{ github.ref }}
 
-      - uses: legoktm/gh-action-auto-dch@master
+      - uses: legoktm/gh-action-auto-dch@main
         with:
           fullname: Kiwix builder
           email: [email protected]
@@ -47,6 +51,35 @@ jobs:
         with:
           args: --no-sign
 
+      - uses: legoktm/gh-action-build-deb@b47978ba8498dc8b8153cc3b5f99a5fc1afa5de1 # pin@debian-trixie
+        if: matrix.distro == 'debian-trixie'
+        name: Build package for debian-trixie
+        id: build-debian-trixie
+        with:
+          args: --no-sign
+
+      - uses: legoktm/gh-action-build-deb@1f4e86a6bb34aaad388167eaf5eb85d553935336 # pin@debian-bookworm
+        if: matrix.distro == 'debian-bookworm'
+        name: Build package for debian-bookworm
+        id: build-debian-bookworm
+        with:
+          args: --no-sign
+
+      - uses: legoktm/gh-action-build-deb@084b4263209252ec80a75d2c78a586192c17f18d # pin@debian-bullseye
+        if: matrix.distro == 'debian-bullseye'
+        name: Build package for debian-bullseye
+        id: build-debian-bullseye
+        with:
+          args: --no-sign
+
+      - uses: legoktm/gh-action-build-deb@9114a536498b65c40b932209b9833aa942bf108d # pin@ubuntu-noble
+        if: matrix.distro == 'ubuntu-noble'
+        name: Build package for ubuntu-noble
+        id: build-ubuntu-noble
+        with:
+          args: --no-sign
+          ppa: ${{ steps.ppa.outputs.ppa }}
+
       - uses: legoktm/gh-action-build-deb@ubuntu-jammy
         if: matrix.distro == 'ubuntu-jammy'
         name: Build package for ubuntu-jammy
@@ -68,15 +101,15 @@ jobs:
           name: Packages for ${{ matrix.distro }}
           path: output
 
-      - uses: legoktm/gh-action-dput@master
+      - uses: legoktm/gh-action-dput@main
         name: Upload dev package
         if: github.event_name == 'push' && github.event.ref == 'refs/heads/main' && startswith(matrix.distro, 'ubuntu-')
         with:
           gpg_key: ${{ secrets.LAUNCHPAD_GPG }}
           repository: ppa:kiwixteam/dev
           packages: output/*_source.changes
 
-      - uses: legoktm/gh-action-dput@master
+      - uses: legoktm/gh-action-dput@main
         name: Upload release package
         if: github.event_name == 'release' && startswith(matrix.distro, 'ubuntu-')
         with:

README.md

@@ -68,19 +68,19 @@ In the worst case, you will have to download and compile a more recent
 version by hand.
 
 If you want to install these dependencies locally, then ensure that
-meson (through `pkg-config`) will properly find them.
+meson (through `pkgconf` or `pkg-config`) will properly find them.
 
 Environment
 -------------
 
 The ZIM tools build using [Meson](https://mesonbuild.com/) version
-0.43 or higher. Meson relies itself on Ninja, pkg-config and few other
+0.43 or higher. Meson relies itself on Ninja, Pkgconf and few other
 compilation tools.
 
 Install first the few common compilation tools:
 * Meson
 * Ninja
-* Pkg-config
+* Pkgconf or Pkg-config
 
 These tools should be packaged if you use a cutting edge operating
 system. If not, have a look to the [Troubleshooting](#Troubleshooting)

debian/control

@@ -4,8 +4,8 @@ Priority: optional
 Maintainer: Kiwix team <[email protected]>
 Build-Depends: debhelper-compat (= 13),
  meson,
- pkg-config,
- libzim-dev (>= 9.1.0), libzim-dev (<< 10.0.0),
+ pkgconf,
+ libzim-dev (>= 9.2.2), libzim-dev (<< 10.0.0),
  libmagic-dev,
  zlib1g-dev,
  libgumbo-dev,
@@ -14,22 +14,13 @@ Build-Depends: debhelper-compat (= 13),
  cmake,
  libgtest-dev,
  libkainjow-mustache-dev
-Standards-Version: 4.5.0
+Standards-Version: 4.6.2
 Homepage: https://github.com/openzim/zim-tools
 Rules-Requires-Root: no
 
 Package: zim-tools
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: zimwriterfs (<= 1.3.10-2)
-Replaces: zimwriterfs (<= 1.3.10-2)
 Description: various ZIM command-line tools
  ZIM tools is a collection of various command-line utilities for
  interacting and working with the ZIM file format.
-
-Package: zimwriterfs
-Architecture: all
-Section: oldlibs
-Depends: zim-tools (>= 2.0.0), ${misc:Depends}
-Description: creates ZIM files from a directory - transitional package
- This is a transitional package and can safely be removed.