diff --git a/extras/packaging/gnu-linux/Makefile b/extras/packaging/gnu-linux/Makefile index 5c6d34eece00440489458ee7358e2a9f1919fcbe..a40541dad8009045c50db4b64810b405e22bc519 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.04 \ ubuntu_23.10 \ ubuntu_24.04 \ fedora_37 \ diff --git a/extras/packaging/gnu-linux/docker/Dockerfile_ubuntu_23.04 b/extras/packaging/gnu-linux/docker/Dockerfile_ubuntu_23.04 deleted file mode 100644 index 470502f40c2856e73b06d78c0ed2e44bc21cb599..0000000000000000000000000000000000000000 --- a/extras/packaging/gnu-linux/docker/Dockerfile_ubuntu_23.04 +++ /dev/null @@ -1,22 +0,0 @@ -FROM ubuntu:23.04 - -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 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 9b25ca627c5687daadae3c3fef396bbb70472651..f391117acb0e7acd288e166c5573cddf69b30ac1 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}" = "lunar" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_23.04" ]; then - ENDTAG="ubuntu_23.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