diff --git a/Makefile b/Makefile index 974063fa2fb1f0aa78ca7f5f9f5bab6fae58d666..a10addfa4946591815a48b69940183b3c4b4350f 100644 --- a/Makefile +++ b/Makefile @@ -167,6 +167,7 @@ DISTRIBUTIONS := \ ubuntu_18.04 \ ubuntu_20.04 \ ubuntu_22.04 \ + ubuntu_22.10 \ fedora_35 \ fedora_36 \ fedora_37 \ diff --git a/docker/Dockerfile_ubuntu_22.10 b/docker/Dockerfile_ubuntu_22.10 new file mode 100644 index 0000000000000000000000000000000000000000..827aa3b0f27fd19b29dccb26c4c358d07fe55bd1 --- /dev/null +++ b/docker/Dockerfile_ubuntu_22.10 @@ -0,0 +1,22 @@ +FROM ubuntu:22.10 + +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get clean +RUN apt-get update && \ + apt-get install -y -o Acquire::Retries=10 \ + devscripts \ + equivs \ + python-is-python3 \ + wget + +ADD scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh + +COPY packaging/rules/debian-qt/control /tmp/builddeps/debian/control +RUN /opt/prebuild-package-debian.sh qt-deps + +COPY packaging/rules/debian/control /tmp/builddeps/debian/control +RUN /opt/prebuild-package-debian.sh jami-deps + +ADD scripts/build-package-debian.sh /opt/build-package-debian.sh +CMD ["/opt/build-package-debian.sh"] diff --git a/packaging/rules/debian/jami-all.postinst b/packaging/rules/debian/jami-all.postinst index 5f562bf5a88f42b5390a784194e58c727087f4f8..93e1ebece62a0303dcb5fe0583f2a4a0de044e3d 100755 --- a/packaging/rules/debian/jami-all.postinst +++ b/packaging/rules/debian/jami-all.postinst @@ -103,6 +103,8 @@ if [ -f /etc/os-release ]; then ENDTAG="ubuntu_20.04" elif [ "${UBUNTU_CODENAME}" = "jammy" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_22.04" ]; then ENDTAG="ubuntu_22.04" + elif [ "${UBUNTU_CODENAME}" = "kinetic" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_22.10" ]; then + ENDTAG="ubuntu_22.10" elif [ "${ID}" = "debian" ] && \ [ "$(command -v lsb_release)" ] && \ [ "$(lsb_release -rs)" = "testing" ]; then