Merge branch 'release-1.36'

2026-03-24 08:41:40 -04:00 · 2021-08-09 10:27:24 -04:00
parent 066bb891af ea83e8c3b1
commit cb4e17e49a
3 changed files with 5 additions and 1 deletions
--- a/db/zm_update-1.36.6.sql
+++ b/db/zm_update-1.36.6.sql
@@ -0,0 +1 @@
+ALTER TABLE `Monitors` MODIFY `Longitude`  DECIMAL(11,8);
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -436,6 +436,9 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin
 * Fri Jun 18 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.37.0-1
 - 1.37.x development build

+* Tue Jun 22 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.5-1
+- 1.36.5 release
+
 * Fri Jun 18 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.4-2
 - apcu-bc deprecated on fedora, use memcached instead
 - only refer to cmake3 when building on el7
--- a/distros/ubuntu2004/control
+++ b/distros/ubuntu2004/control
@@ -30,7 +30,7 @@ Build-Depends: debhelper (>= 12), sphinx-doc, python3-sphinx, dh-linktree, dh-ap
              ,libcrypt-eksblowfish-perl
              ,libdata-entropy-perl
              ,libvncserver-dev
-              ,libjwt-gnutls-dev
+              ,libjwt-gnutls-dev|libjwt-dev
 Standards-Version: 4.5.0
 Homepage: https://www.zoneminder.com/
				`@@ -0,0 +1 @@`
				ALTER TABLE `Monitors` MODIFY `Longitude` DECIMAL(11,8);