From 50b73cf3d210f00b9f8fad0d47f00b665797c025 Mon Sep 17 00:00:00 2001 From: Peter Keresztes Schmidt Date: Tue, 3 Aug 2021 19:02:39 +0200 Subject: [PATCH 1/6] utils/packpack: Fix failure when building for Ubuntu Hirsute --- utils/packpack/startpackpack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/packpack/startpackpack.sh b/utils/packpack/startpackpack.sh index 152652376..19077c7fc 100755 --- a/utils/packpack/startpackpack.sh +++ b/utils/packpack/startpackpack.sh @@ -369,7 +369,7 @@ elif [ "${OS}" == "debian" ] || [ "${OS}" == "ubuntu" ] || [ "${OS}" == "raspbia setdebpkgname movecrud - if [ "${DIST}" == "focal" ] || [ "${DIST}" == "groovy" ] || [ "${DIST}" == "hirsuit" ] || [ "${DIST}" == "buster" ]; then + if [ "${DIST}" == "focal" ] || [ "${DIST}" == "groovy" ] || [ "${DIST}" == "hirsute" ] || [ "${DIST}" == "buster" ]; then ln -sfT distros/ubuntu2004 debian elif [ "${DIST}" == "beowulf" ]; then ln -sfT distros/beowulf debian From 7d84568b6581c36adf928bc36940ea84d23140f9 Mon Sep 17 00:00:00 2001 From: Peter Keresztes Schmidt Date: Tue, 3 Aug 2021 19:05:27 +0200 Subject: [PATCH 2/6] utils: Remove support for Ubuntu Groovy Groovy went EOL as on July 22, 2021. See https://fridge.ubuntu.com/2021/07/25/ubuntu-20-10-groovy-gorilla-end-of-life-reached-on-july-22-2021/ --- utils/do_debian_package.sh | 2 +- utils/packpack/startpackpack.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/do_debian_package.sh b/utils/do_debian_package.sh index 685b56bc0..80b3a832d 100755 --- a/utils/do_debian_package.sh +++ b/utils/do_debian_package.sh @@ -88,7 +88,7 @@ fi; if [ "$DISTROS" == "" ]; then if [ "$RELEASE" != "" ]; then - DISTROS="bionic,focal,groovy,hirsute" + DISTROS="bionic,focal,hirsute" else DISTROS=`lsb_release -a 2>/dev/null | grep Codename | awk '{print $2}'`; fi; diff --git a/utils/packpack/startpackpack.sh b/utils/packpack/startpackpack.sh index 19077c7fc..ee0e79c05 100755 --- a/utils/packpack/startpackpack.sh +++ b/utils/packpack/startpackpack.sh @@ -369,7 +369,7 @@ elif [ "${OS}" == "debian" ] || [ "${OS}" == "ubuntu" ] || [ "${OS}" == "raspbia setdebpkgname movecrud - if [ "${DIST}" == "focal" ] || [ "${DIST}" == "groovy" ] || [ "${DIST}" == "hirsute" ] || [ "${DIST}" == "buster" ]; then + if [ "${DIST}" == "focal" ] || [ "${DIST}" == "hirsute" ] || [ "${DIST}" == "buster" ]; then ln -sfT distros/ubuntu2004 debian elif [ "${DIST}" == "beowulf" ]; then ln -sfT distros/beowulf debian From b5765b4535873d81efb1690ad4dcb387acf18378 Mon Sep 17 00:00:00 2001 From: Peter Keresztes Schmidt Date: Tue, 3 Aug 2021 19:10:09 +0200 Subject: [PATCH 3/6] utils/startpackpack: Fix build for Ubuntu Bionic --- utils/packpack/startpackpack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/packpack/startpackpack.sh b/utils/packpack/startpackpack.sh index ee0e79c05..9c35c48bf 100755 --- a/utils/packpack/startpackpack.sh +++ b/utils/packpack/startpackpack.sh @@ -369,7 +369,7 @@ elif [ "${OS}" == "debian" ] || [ "${OS}" == "ubuntu" ] || [ "${OS}" == "raspbia setdebpkgname movecrud - if [ "${DIST}" == "focal" ] || [ "${DIST}" == "hirsute" ] || [ "${DIST}" == "buster" ]; then + if [ "${DIST}" == "bionic" ] || [ "${DIST}" == "focal" ] || [ "${DIST}" == "hirsute" ] || [ "${DIST}" == "buster" ]; then ln -sfT distros/ubuntu2004 debian elif [ "${DIST}" == "beowulf" ]; then ln -sfT distros/beowulf debian From 2c0cf7a5a7613029e640c8627472dfbc314865c1 Mon Sep 17 00:00:00 2001 From: Peter Keresztes Schmidt Date: Tue, 3 Aug 2021 19:11:51 +0200 Subject: [PATCH 4/6] utils/startpackpack: Add support for Debian Bullseye --- utils/packpack/startpackpack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/packpack/startpackpack.sh b/utils/packpack/startpackpack.sh index 9c35c48bf..0e4b517b0 100755 --- a/utils/packpack/startpackpack.sh +++ b/utils/packpack/startpackpack.sh @@ -369,7 +369,7 @@ elif [ "${OS}" == "debian" ] || [ "${OS}" == "ubuntu" ] || [ "${OS}" == "raspbia setdebpkgname movecrud - if [ "${DIST}" == "bionic" ] || [ "${DIST}" == "focal" ] || [ "${DIST}" == "hirsute" ] || [ "${DIST}" == "buster" ]; then + if [ "${DIST}" == "bionic" ] || [ "${DIST}" == "focal" ] || [ "${DIST}" == "hirsute" ] || [ "${DIST}" == "buster" ] || [ "${DIST}" == "bullseye" ]; then ln -sfT distros/ubuntu2004 debian elif [ "${DIST}" == "beowulf" ]; then ln -sfT distros/beowulf debian From cce4b0aac4a61513cb0c0fe87ce1d2c93fd498a2 Mon Sep 17 00:00:00 2001 From: Peter Keresztes Schmidt Date: Tue, 3 Aug 2021 19:15:41 +0200 Subject: [PATCH 5/6] docs: Reference current 1.36 version in installation instructions --- docs/installationguide/debian.rst | 8 ++++---- docs/installationguide/ubuntu.rst | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/installationguide/debian.rst b/docs/installationguide/debian.rst index d29d71743..c6e0cebcf 100644 --- a/docs/installationguide/debian.rst +++ b/docs/installationguide/debian.rst @@ -56,13 +56,13 @@ Add the following to the /etc/apt/sources.list.d/zoneminder.list file :: # ZoneMinder repository - deb https://zmrepo.zoneminder.com/debian/release-1.34 buster/ + deb https://zmrepo.zoneminder.com/debian/release-1.36 buster/ You can do this using: .. code-block:: - echo "deb https://zmrepo.zoneminder.com/debian/release-1.34 buster/" | sudo tee /etc/apt/sources.list.d/zoneminder.list + echo "deb https://zmrepo.zoneminder.com/debian/release-1.36 buster/" | sudo tee /etc/apt/sources.list.d/zoneminder.list Because ZoneMinder's package repository provides a secure connection through HTTPS, apt must be enabled for HTTPS. :: @@ -158,7 +158,7 @@ You are now ready to go with ZoneMinder. Open a browser and type either ``localh Easy Way: Debian Stretch ------------------------ -This procedure will guide you through the installation of ZoneMinder on Debian 9 (Stretch). This section has been tested with ZoneMinder 1.34 on Debian 9.8. +This procedure will guide you through the installation of ZoneMinder on Debian 9 (Stretch). This section has been tested with ZoneMinder 1.36 on Debian 9.8. **Step 1:** Make sure your system is up to date @@ -204,7 +204,7 @@ Add the following to the bottom of the file :: # ZoneMinder repository - deb https://zmrepo.zoneminder.com/debian/release-1.34 stretch/ + deb https://zmrepo.zoneminder.com/debian/release-1.36 stretch/ CTRL+o and to save CTRL+x to exit diff --git a/docs/installationguide/ubuntu.rst b/docs/installationguide/ubuntu.rst index b1da2d360..d59d58f38 100644 --- a/docs/installationguide/ubuntu.rst +++ b/docs/installationguide/ubuntu.rst @@ -41,7 +41,7 @@ guide you with a quick search. :: - add-apt-repository ppa:iconnor/zoneminder-1.34 + add-apt-repository ppa:iconnor/zoneminder-1.36 Update repo and upgrade. From fb1849ff47b1f3e8b288c64fa74088202faa7485 Mon Sep 17 00:00:00 2001 From: Peter Keresztes Schmidt Date: Tue, 3 Aug 2021 19:21:17 +0200 Subject: [PATCH 6/6] CI: Test package build with Debian Bullseye as well --- .github/workflows/create-packages.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/create-packages.yml b/.github/workflows/create-packages.yml index 68025e72a..6a76da322 100644 --- a/.github/workflows/create-packages.yml +++ b/.github/workflows/create-packages.yml @@ -14,6 +14,8 @@ jobs: os_dist: - os: debian dist: buster + - os: debian + dist: bullseye runs-on: ubuntu-latest steps: