Add Debian

Ubuntu is based on Debian, so the entire build process for Debian is
pretty much the same as it is for Ubuntu. Instead of creating a separate
job, just hook into the Ubuntu job, for now.

Additional small changes:
* For the sake of consistency, use codenames for both.
* Adjusted the version string.
* Use standard /etc/os-release instead of lsb_release.

Author: 4nd3r

.github/workflows/build.yml

@@ -127,37 +127,56 @@ jobs:
         name: fedora_${{ matrix.container }}
         path: build/libdigidocpp*.rpm
   ubuntu:
-    name: Build on Ubuntu ${{ matrix.container }} ${{ matrix.arch }}
+    name: Build on ${{ matrix.dist }} ${{ matrix.rel }} ${{ matrix.arch }}
     runs-on: ubuntu-24.04${{ matrix.arch == 'arm64' && '-arm' || '' }}
-    container: ubuntu:${{ matrix.container }}
+    container: ${{ matrix.dist }}:${{ matrix.rel }}
     strategy:
       matrix:
-        container: ['22.04', '24.04', '25.04']
-        arch: ['amd64', 'arm64']
+        include:
+        # ubuntu x64
+        - {arch: amd64, dist: ubuntu, rel: oracular}
+        - {arch: amd64, dist: ubuntu, rel: noble}
+        - {arch: amd64, dist: ubuntu, rel: jammy}
+
+        # ubuntu arm
+        - {arch: arm64, dist: ubuntu, rel: oracular}
+        - {arch: arm64, dist: ubuntu, rel: noble}
+        - {arch: arm64, dist: ubuntu, rel: jammy}
+
+        # debian x64
+        - {arch: amd64, dist: debian, rel: forky}
+        - {arch: amd64, dist: debian, rel: trixie}
+        - {arch: amd64, dist: debian, rel: bookworm}
+
+        # debian arm
+        - {arch: arm64, dist: debian, rel: forky}
+        - {arch: arm64, dist: debian, rel: trixie}
+        - {arch: arm64, dist: debian, rel: bookworm}
     env:
       DEBIAN_FRONTEND: noninteractive
       DEBFULLNAME: github-actions
       DEBEMAIL: [email protected]
     steps:
     - name: Install dependencies
-      run: apt update -qq && apt install --no-install-recommends -y lsb-release build-essential devscripts debhelper lintian pkg-config ${UBUNTU_DEPS} doxygen swig openjdk-17-jdk-headless libpython3-dev python3-setuptools libboost-test-dev
+      run: apt update -qq && apt install --no-install-recommends -y ${UBUNTU_DEPS} lsb-release build-essential devscripts debhelper lintian pkg-config doxygen swig default-jdk-headless libpython3-dev python3-setuptools libboost-test-dev
     - name: Checkout
       uses: actions/checkout@v4
     - name: Setup changelog
       run: |
+        . /etc/os-release
         export VERSION=$(grep project CMakeLists.txt | egrep -o "([0-9]{1,}\.)+[0-9]{1,}")
-        export VERSIONEX=${VERSION}.${BUILD_NUMBER}.$(lsb_release -rs)
-        dch --distribution $(lsb_release -cs) -v ${VERSIONEX} "Release ${VERSIONEX}."
+        export VERSIONEX=${VERSION}+${VERSION_CODENAME}.${BUILD_NUMBER}
+        dch --distribution ${VERSION_CODENAME} -v ${VERSIONEX} "Release ${VERSIONEX}."
     - name: Build packages
       run: |
-        JAVA_HOME=/usr/lib/jvm/java-17-openjdk-${{ matrix.arch }} dpkg-buildpackage -us -uc
+        JAVA_HOME=/usr/lib/jvm/default-java dpkg-buildpackage -us -uc
         mv ../libdigidocpp*.* .
     - name: Lintian
       run: lintian *.deb;
     - name: Archive artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: ubuntu_${{ matrix.container }}_${{ matrix.arch }}
+        name: ${{ matrix.dist }}_${{ matrix.rel }}_${{ matrix.arch }}
         path: libdigidocpp*.*
   windows:
     name: Build on Windows

debian/control

@@ -10,7 +10,7 @@ Build-Depends:
  libxmlsec1-dev,
  doxygen,
  swig,
- java17-sdk-headless,
+ default-jdk-headless,
  libpython3-dev,
  python3-setuptools
 Standards-Version: 4.6.1