Merge pull request #3326 from Carbenium/bullseye-readiness

misc: Final bits for Debian Bullseye support

.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:

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 <Enter> to save
 CTRL+x to exit

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.
 

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;

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}" == "bionic" ] || [ "${DIST}" == "focal" ] || [ "${DIST}" == "hirsute" ] || [ "${DIST}" == "buster" ] || [ "${DIST}" == "bullseye" ]; then
     ln -sfT distros/ubuntu2004 debian
   elif [ "${DIST}" == "beowulf" ]; then
     ln -sfT distros/beowulf debian