Isaac Connor
9e5ca7832a
add new dependency libarray-util-perl
2021-04-29 14:49:54 -04:00
Isaac Connor
33ed35c1f6
Use new zmupdate -s param touse system maintenance use to perform updates
2021-04-28 10:05:21 -04:00
Isaac Connor
d1687df6af
Bump version to 1.35.27 for ModetDuringPTZ changes
2021-04-23 14:52:29 -04:00
Andrew Bauer
6d90fd7bd6
update specfile to use latest rtspserver commit
2021-04-23 11:53:38 -05:00
Isaac Connor
484ff7dbaa
Fail postinst if zmupdate fails
2021-04-19 11:51:35 -04:00
Isaac Connor
285c06ca23
Bump version to 1.35.26
2021-04-12 15:59:31 -04:00
Isaac Connor
053406bade
Bump to version 1.35.25
2021-04-11 12:59:18 -04:00
Peter Keresztes Schmidt
3b705c15fe
build: Store all generated sources in CMAKE_BINARY_DIR
...
config.h is already generated there so move zm_config_data.h and zm_config_define.h
there as well. Also limit the scope of CMAKE_BINARY_DIR as include directory to the zm target.
All in all this makes zm_config_data and zm_config_define available when building the tests target.
2021-04-11 01:28:23 +02:00
Isaac Connor
08d9ca453a
Bump version to 1.35.24
2021-04-09 19:45:23 -04:00
Andrew Bauer
3be21d0457
add rpm support for RtspServer submodule
2021-04-07 09:23:36 -05:00
Isaac Connor
198d205188
bump version for 1.35.23
2021-03-30 18:33:46 -04:00
Isaac Connor
3d13daaf25
Bump version for 1.35.22
2021-03-26 17:03:27 -04:00
Isaac Connor
531850c57e
require libjwt-gnutls0. Our built in jwt-cpp doesn't seem to work
2021-03-23 13:52:05 -04:00
Isaac Connor
527defc0c8
Bump version to 1.35.21 for Snapshots
2021-03-12 09:28:47 -05:00
Isaac Connor
93e4691b08
remove liblivemedia as a dependency. We have gone another way
2021-03-10 16:17:26 -05:00
Isaac Connor
fda0656f84
Bump version to 1.35.20 to pick up SecondPath db change
2021-03-03 12:07:33 -05:00
Isaac Connor
be99d09772
Accept liblivemedia64 for buster
2021-01-26 22:05:13 -05:00
Isaac Connor
9beaf613bf
Add liblivemedia as a dependency to build rtsp_server
2021-03-02 09:05:58 -05:00
Isaac Connor
243d028118
Add liblivemedia dependencies to build rtsp server
2021-03-02 09:05:58 -05:00
Isaac Connor
836ef731c1
Don't use libjquery-js
2021-03-01 16:47:18 -05:00
Isaac Connor
01c74fdac3
Add RTSPStreamName to Monitors table. Bump version to 1.35.19
2021-03-01 16:46:48 -05:00
Isaac Connor
0dc748acb5
drop back to compat 12 for buster
2021-02-17 14:13:42 -05:00
Isaac Connor
99568b8046
remove debian vcs
2021-02-17 13:41:52 -05:00
Isaac Connor
1f2c7d3f98
allow debhelper >13
2021-02-17 13:17:30 -05:00
Isaac Connor
d2777d2fe4
Remove ffmpeg from recommends. We depend on it
2021-02-17 12:53:30 -05:00
Isaac Connor
0edbb3d9c4
debug is optional, not extra
2021-02-17 12:52:06 -05:00
Isaac Connor
0d0be59b6b
Need to require debhelper 13
2021-02-17 12:51:44 -05:00
Isaac Connor
a3ed986343
Fix filename
2021-02-17 12:40:41 -05:00
Isaac Connor
4a1efe56ff
remove --parallel which isn't needed anymore
2021-02-17 12:40:27 -05:00
Isaac Connor
8c85ffd904
Remove apache2.2 auth lines
2021-02-17 12:40:14 -05:00
Isaac Connor
8a3ea42528
Remove Uploaders. Update mysql packages to be default-
2021-02-17 12:39:56 -05:00
Isaac Connor
b4c594b15c
Use apache2_invoke instead of enmod
2021-02-17 12:32:06 -05:00
Isaac Connor
8e4922665f
Add icons to installed files
2021-02-17 11:56:43 -05:00
Isaac Connor
6007914344
we don't build libzoneminder-perl at this time, so don't try to instal it's man pages
2021-02-17 11:49:59 -05:00
Isaac Connor
a60d683f73
Don't build man pages. They will be built by dh
2021-02-17 11:07:33 -05:00
Isaac Connor
66efc3ba59
.tmpfile is deprecated. Use .tmpfiles
2021-02-17 10:29:21 -05:00
Isaac Connor
233b666595
maybe fix docs building
2021-02-16 17:19:13 -05:00
Isaac Connor
e7f3bc357d
More syncup with official debian build
2021-02-16 17:03:17 -05:00
Isaac Connor
36c7d17111
Remove dh-systemd update standards-version and homepage
2021-02-16 16:32:19 -05:00
Isaac Connor
b0f9b210a8
Update for debhelper > 12
2021-02-16 16:22:29 -05:00
Isaac Connor
f08979aae9
Bump compat to 13
2021-02-16 14:13:42 -05:00
Isaac Connor
cc09f68426
We use our own jquery. Debian can do it's own thing
2021-02-10 17:07:18 -05:00
Andrew Bauer
2a440685eb
remove zma binary from rpm specfile
2021-02-09 20:55:52 -06:00
Peter Keresztes Schmidt
bccadba1f6
Distros/Ubuntu2004: Remove an extra newline from the control file
...
This breaks the build with following message:
dpkg-buildpackage: error: syntax error in debian/control at line 41: block lacks the 'Package' field
2021-02-07 19:36:05 +01:00
Isaac Connor
5fac0903b1
We include jquery ourselves
2021-02-06 20:11:38 -05:00
Isaac Connor
3d20183020
Remove mp4v2
2021-02-04 17:32:53 -05:00
Isaac Connor
8f9637f21a
Merge pull request #3129 from Carbenium/cmake-reformat
...
Build: Reindent the CMakeLists
2021-02-04 17:20:34 -05:00
Peter Keresztes Schmidt
6c9983155c
Build: Reindent the CMakeLists
...
Indent with 2 spaces
Also remove expressions form closing tags. They have been made optional a while ago since they make reading rather more difficult.
2021-02-04 22:00:56 +01:00
Peter Keresztes Schmidt
dd527f0888
Consolidate __STDC_FORMAT_MACROS and __STDC_CONSTANT_MACROS definition
...
Move the definitions to zm_define.h and include the header at the appropriate locations.
These macros have not been adopted by the C++11 standard.
However glibc 2.17 (CentOS 7) still depends on them to provide the macros which are guarded by these defines.
2021-02-04 19:58:29 +01:00
Isaac Connor
3fd98ee9c1
Bump version to add RTSPServer column to Monitors
2021-02-03 08:33:10 -05:00
Andrew Bauer
fdbab5adc3
rpmspecfile README - update zmuser creation on newer sql's
2021-02-02 15:18:54 -06:00
Andrew Bauer
c55b80beab
rpmspecfile - generate ssl cert for both apache and nginx
2021-01-31 16:14:39 -06:00
Isaac Connor
be95bd2fa7
deprecate python-sphinx in favour of python3-sphinx. Remove mp4v2 and libx264
2021-01-28 16:17:15 -05:00
Isaac Connor
4dcce4ac95
Merge branch 'rtsp_server'
2021-01-26 14:22:10 -05:00
Isaac Connor
671d58f0d0
bump version and put back ZM_MIN_RTSP_PORT setting
2021-01-26 12:35:17 -05:00
Andrew Bauer
0b35a6f09a
remove mootools from debian packaging
2021-01-18 07:59:54 -06:00
Andrew Bauer
b9c0823774
don't install tools folder
2021-01-18 07:41:08 -06:00
Isaac Connor
a1917d83d0
Merge branch 'master' into zma_to_thread
2020-12-22 19:52:09 -05:00
Andrew Bauer
24d558b31a
spelling
2020-12-19 12:14:56 -06:00
Andrew Bauer
96ade2f9d0
update rpm nginx readme
2020-12-19 10:09:12 -06:00
Andrew Bauer
80afbbd9ce
fixup rpmspecfile cert generation
2020-12-19 08:11:20 -06:00
Isaac Connor
2936d64b91
Always take ownership of dirs in /var/cache/zoneminder. The previous behaviour would have only done it on a new install. Fixes #3096
2020-12-18 10:54:08 -05:00
Isaac Connor
0702b64cc4
Merge branch 'master' into zma_to_thread
2020-12-15 10:51:40 -05:00
Isaac Connor
5c1135b2a7
Merge branch 'master' into no_decode
2020-12-10 15:15:32 -05:00
Isaac Connor
b261fbb397
Merge branch 'master' into zma_to_thread
2020-12-07 16:26:26 -05:00
Isaac Connor
7ef34bce7b
Include new fonts dir in install
2020-12-03 13:30:51 -05:00
Isaac Connor
1c45019eeb
Bump version to 1.35.15
2020-12-03 13:16:42 -05:00
Isaac Connor
bbc2c2a607
Crud has more than 1 friend
2020-11-12 13:27:10 -05:00
Isaac Connor
df783f4835
Merge branch 'master' into zma_to_thread
2020-11-12 12:53:55 -05:00
Isaac Connor
7faf774cd0
Use FriendsOfCake crud 3.2.0
2020-11-12 09:15:02 -05:00
Isaac Connor
a3a6d94b6f
bump version to 1.15.14
2020-11-06 14:16:34 -05:00
Isaac Connor
3e5f87cb41
Bump version to 1.35.13
2020-11-04 14:42:01 -05:00
Isaac Connor
9a9f80c15c
show which user we are updating permissions for
2020-10-28 14:07:29 -04:00
Isaac Connor
86bf491fe1
Add Locking to filters, bump db to 1.35.12.
2020-10-28 12:55:32 -04:00
Isaac Connor
4c92c99ba1
bump version for 1.35.11 db updates
2020-10-28 12:39:50 -04:00
Isaac Connor
59884375fa
Add references permission so that our zmupdate can add foreign keys
2020-10-28 09:23:46 -04:00
Isaac Connor
2eda49333f
Merge branch 'master' into zma_to_thread
2020-10-20 16:20:29 -04:00
Isaac Connor
8227de8642
bump version to 1.35.10 to pick up Filter AutoUnarchive column
2020-10-12 11:04:16 -04:00
Isaac Connor
faade3ea15
Enable dependencies for vnc monitor type in buster/focal and newer
2020-10-07 10:52:59 -04:00
Isaac Connor
7261a7b1dd
Merge branch 'sessions_in_db'
2020-10-02 15:57:11 -04:00
Isaac Connor
a58e5e96d7
bump version
2020-10-02 15:57:05 -04:00
Isaac Connor
fb0fae7b20
buster only has libjpeg62-turbo-dev
2020-10-02 15:22:43 -04:00
Isaac Connor
4b10d22ea8
correct the version on libjpeg-turbo
2020-10-02 12:55:44 -04:00
Isaac Connor
d139dc010b
prefer libjpegturbo to libjpeg8 or 9
2020-10-01 13:47:39 -04:00
Isaac Connor
63e42ca651
Still need libjpeg
2020-10-01 12:57:46 -04:00
Isaac Connor
3eae356ed7
Bump to 1.35.8. Change table engine to InnoDb for Monitor_Status.
2020-09-30 09:39:31 -04:00
Isaac Connor
02d4785e71
Split out user creation/updating into it's own function
2020-09-29 17:26:55 -04:00
Isaac Connor
a39a656373
Merge branch 'master' into zma_to_thread
2020-09-29 11:02:40 -04:00
Isaac Connor
37b0fc4bbd
bump version to pickup geolocation updates
2020-09-28 09:34:08 -04:00
Isaac Connor
f7ec83323d
Fix conditional
2020-09-23 16:16:30 -04:00
Isaac Connor
ab513689f4
Don't auto-start zoneminder. DEBHELPER appears to add lines that already do it and they conflict.
2020-09-23 16:12:21 -04:00
Isaac Connor
a68c95ba73
fix logic on systemd and mysql/mariadb existence
2020-09-23 16:07:46 -04:00
Isaac Connor
5410fcf18c
Detect systemd and fall back to sysV. We do this for beowulf and WSL
2020-09-23 14:41:26 -04:00
Isaac Connor
04aab54044
Detect systemd and use sysV style commands if it isn't
2020-09-23 11:31:16 -04:00
Isaac Connor
45cc4dd531
put back sysV init script for beowulf/wsl
2020-09-23 11:30:40 -04:00
Andrew Bauer
f7cbc2f5e0
remove uneeded setconfig options in redhat specfil
2020-09-19 09:10:16 -05:00
Andrew Bauer
b3c5a985ed
use BindsTo in redhat systemd service file
2020-09-17 09:16:28 -05:00
Isaac Connor
b4fbe84f6b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-26 13:31:36 -04:00
Isaac Connor
abebc74e1e
sphinx-build is in python3-sphinx
2020-08-26 13:31:32 -04:00
Andrew Bauer
f003dd7782
remove zoneinder-upload folder from cmakelists
2020-08-25 16:57:06 -05:00