diff --git a/extras/packaging/gnu-linux/Makefile b/extras/packaging/gnu-linux/Makefile index 8d7b053271ac6c99de3ef64431a37104400c641e..2ed459be8e1be53b91151aebb45f69c49e887c75 100644 --- a/extras/packaging/gnu-linux/Makefile +++ b/extras/packaging/gnu-linux/Makefile @@ -166,7 +166,6 @@ DISTRIBUTIONS := \ debian_unstable \ ubuntu_20.04 \ ubuntu_22.04 \ - ubuntu_23.10 \ ubuntu_24.04 \ ubuntu_24.10 \ fedora_37 \ diff --git a/extras/packaging/gnu-linux/docker/Dockerfile_ubuntu_23.10 b/extras/packaging/gnu-linux/docker/Dockerfile_ubuntu_23.10 deleted file mode 100644 index 4f9fc867c0f14f11711e42facdf9cd48bc07e636..0000000000000000000000000000000000000000 --- a/extras/packaging/gnu-linux/docker/Dockerfile_ubuntu_23.10 +++ /dev/null @@ -1,30 +0,0 @@ -FROM ubuntu:23.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 - -# The default compiler on Ubuntu 23.10, GCC 13.2.0, is unable to build one of Qt 6.6.1's -# dependencies, see: -# https://github.com/qt/qtquick3d-assimp/commit/253f8bfa621a9fa6cd2c36291cdaa8c60c99322c -# The linked commit above fixes the problem and is included in more recent versions of Qt. -# For now, we use GCC 12 as a temporary workaround: -ADD extras/packaging/gnu-linux/scripts/install-gcc-debian.sh /opt/install-gcc-debian.sh -RUN /opt/install-gcc-debian.sh 12 - -ADD extras/packaging/gnu-linux/scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh - -COPY extras/packaging/gnu-linux/rules/debian-qt/control /tmp/builddeps/debian/control -RUN /opt/prebuild-package-debian.sh qt-deps - -COPY extras/packaging/gnu-linux/rules/debian/control /tmp/builddeps/debian/control -RUN /opt/prebuild-package-debian.sh jami-deps - -ADD extras/packaging/gnu-linux/scripts/build-package-debian.sh /opt/build-package-debian.sh -CMD ["/opt/build-package-debian.sh"] diff --git a/extras/packaging/gnu-linux/rules/debian/jami-all.postinst b/extras/packaging/gnu-linux/rules/debian/jami-all.postinst index 0349b5b162595f17dd505db59ff2877212af46f1..6efa5bade4e8bf801a7fdc8ce0bb7a3c13be6cb9 100755 --- a/extras/packaging/gnu-linux/rules/debian/jami-all.postinst +++ b/extras/packaging/gnu-linux/rules/debian/jami-all.postinst @@ -99,8 +99,6 @@ 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}" = "mantic" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_23.10" ]; then - ENDTAG="ubuntu_23.10" elif [ "${UBUNTU_CODENAME}" = "noble" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_24.04" ]; then ENDTAG="ubuntu_24.04" elif [ "${UBUNTU_CODENAME}" = "oracular" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_24.10" ]; then