diff --git a/INSTALL.md b/INSTALL.md index 8d94849a2..766eb3d8b 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -29,7 +29,7 @@ sudo apt-get update && sudo apt-get install libqt-jami #### Install libqt-jami, Debian based -To install libqt-jami on Debian, execute these commands replacing `debian_` by your distribution version. For example "debian_11" +To install libqt-jami on Debian, execute these commands replacing `debian_` by your distribution version. For example "debian_12" ```bash sudo apt install gnupg dirmngr ca-certificates curl --no-install-recommends diff --git a/extras/packaging/gnu-linux/Makefile b/extras/packaging/gnu-linux/Makefile index 0eda14511..2af170832 100644 --- a/extras/packaging/gnu-linux/Makefile +++ b/extras/packaging/gnu-linux/Makefile @@ -160,7 +160,6 @@ endif # Traditionally built packages (in Docker containers). # DISTRIBUTIONS := \ - debian_11 \ debian_12 \ debian_13 \ debian_testing \ diff --git a/extras/packaging/gnu-linux/docker/Dockerfile_debian_11 b/extras/packaging/gnu-linux/docker/Dockerfile_debian_11 deleted file mode 100644 index 08491d4af..000000000 --- a/extras/packaging/gnu-linux/docker/Dockerfile_debian_11 +++ /dev/null @@ -1,38 +0,0 @@ -FROM debian:bullseye - -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 \ - curl - -# nodejs -RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - -RUN apt install nodejs -y - -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 - -# Install CMake 3.21 for Qt 6 -ADD extras/packaging/gnu-linux/scripts/install-cmake.sh /opt/install-cmake.sh -RUN /opt/install-cmake.sh - -ADD extras/packaging/gnu-linux/scripts/install-ffmpeg-for-qt.sh /opt/install-ffmpeg-for-qt.sh -ADD extras/packaging/gnu-linux/scripts/build-package-debian.sh /opt/build-package-debian.sh - -# Setting this variable so that FFmpeg gets built without pipewiregrab -# (see daemon/contrib/bootstrap and daemon/contrib/src/ffmpeg/rules.mak) -# We rely on PipeWire for screen sharing on Wayland, but the version available on Debian 11 is too old. -ENV DISABLE_PIPEWIRE=true - -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 ea304c5b6..d02f471b9 100755 --- a/extras/packaging/gnu-linux/rules/debian/jami-all.postinst +++ b/extras/packaging/gnu-linux/rules/debian/jami-all.postinst @@ -91,9 +91,7 @@ if [ -f /etc/os-release ]; then . /etc/os-release # Set-up Jami repository end tag - if [ "${VERSION_CODENAME}" = "bullseye" ] || [ "${ID}_${VERSION_ID}" = "debian_11" ]; then - ENDTAG="debian_11" - elif [ "${VERSION_CODENAME}" = "bookworm" ] || [ "${ID}_${VERSION_ID}" = "debian_12" ]; then + if [ "${VERSION_CODENAME}" = "bookworm" ] || [ "${ID}_${VERSION_ID}" = "debian_12" ]; then ENDTAG="debian_12" elif [ "${VERSION_CODENAME}" = "trixie" ] || [ "${ID}_${VERSION_ID}" = "debian_13" ]; then ENDTAG="debian_13"