From 5503769023eb87470dc38e9ff94f92dbaa79f6cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois-Simon=20Fauteux-Chapleau?=
<francois-simon.fauteux-chapleau@savoirfairelinux.com>
Date: Fri, 2 Aug 2024 11:37:31 -0400
Subject: [PATCH] packaging: remove Ubuntu 23.04 (EOL)
Support for Ubuntu 23.04 ended in January 2024.
Change-Id: Ib4a7a045762a391552da69ace333e46f10afdfb9
---
extras/packaging/gnu-linux/Makefile | 1 -
.../gnu-linux/docker/Dockerfile_ubuntu_23.04 | 22 -------------------
.../gnu-linux/rules/debian/jami-all.postinst | 2 --
3 files changed, 25 deletions(-)
delete mode 100644 extras/packaging/gnu-linux/docker/Dockerfile_ubuntu_23.04
diff --git a/extras/packaging/gnu-linux/Makefile b/extras/packaging/gnu-linux/Makefile
index 5c6d34eec..a40541dad 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 470502f40..000000000
--- 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 9b25ca627..f391117ac 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
--
GitLab