ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3326 from Carbenium/bullseye-readiness 

misc: Final bits for Debian Bullseye support
This commit is contained in:
Isaac Connor 2021-08-03 19:59:53 -04:00 committed by GitHub
parent 4392198d14 fb1849ff47
commit dffc7aa2fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/create-packages.yml vendored
View File

@ -14,6 +14,8 @@ jobs:
os_dist: os_dist:
- os: debian - os: debian
dist: buster dist: buster
- os: debian
dist: bullseye
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:

8
docs/installationguide/debian.rst
View File

@ -56,13 +56,13 @@ Add the following to the /etc/apt/sources.list.d/zoneminder.list file
:: ::
# ZoneMinder repository # 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: You can do this using:
.. code-block:: .. 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. 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 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 **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 # 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+o and <Enter> to save
CTRL+x to exit CTRL+x to exit

2
docs/installationguide/ubuntu.rst
View File

@ -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. Update repo and upgrade.

2
utils/do_debian_package.sh
View File

@ -88,7 +88,7 @@ fi;
if [ "$DISTROS" == "" ]; then if [ "$DISTROS" == "" ]; then
if [ "$RELEASE" != "" ]; then if [ "$RELEASE" != "" ]; then
DISTROS="bionic,focal,groovy,hirsute" DISTROS="bionic,focal,hirsute"
else else
DISTROS=`lsb_release -a 2>/dev/null | grep Codename | awk '{print $2}'`; DISTROS=`lsb_release -a 2>/dev/null | grep Codename | awk '{print $2}'`;
fi; fi;

2
utils/packpack/startpackpack.sh
View File

@ -369,7 +369,7 @@ elif [ "${OS}" == "debian" ] || [ "${OS}" == "ubuntu" ] || [ "${OS}" == "raspbia
setdebpkgname setdebpkgname
movecrud 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 ln -sfT distros/ubuntu2004 debian
elif [ "${DIST}" == "beowulf" ]; then elif [ "${DIST}" == "beowulf" ]; then
ln -sfT distros/beowulf debian ln -sfT distros/beowulf debian