diff --git a/extras/packaging/gnu-linux/Makefile b/extras/packaging/gnu-linux/Makefile index 62068f28847923ea6e83539fe35c7d10deeaaf88..1e93511306d27a9c9667925ee9b84d9bfb4f92bc 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_22.10 \ ubuntu_23.04 \ fedora_37 \ fedora_38 \ diff --git a/extras/packaging/gnu-linux/docker/Dockerfile_ubuntu_22.10 b/extras/packaging/gnu-linux/docker/Dockerfile_ubuntu_22.10 deleted file mode 100644 index 406cace07f20778c5600cff497c42f25c4e69173..0000000000000000000000000000000000000000 --- a/extras/packaging/gnu-linux/docker/Dockerfile_ubuntu_22.10 +++ /dev/null @@ -1,22 +0,0 @@ -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 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 c9d4e0a1e78f74f3d80a9b956aca6d772966898c..37392707091dd455db9e0c685e07545b54ceeb48 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}" = "kinetic" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_22.10" ]; then - ENDTAG="ubuntu_22.10" elif [ "${UBUNTU_CODENAME}" = "lunar" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_23.04" ]; then ENDTAG="ubuntu_23.04" elif [ "${ID}" = "debian" ] && \