Isaac Connor
cf49a234b3
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-11-22 13:05:03 -05:00
Andrew Bauer
b67450b8ae
Update zoneminder.php-fpm.conf.in
2016-11-17 19:48:35 -06:00
Isaac Connor
c360e27b02
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-11-17 13:13:47 -05:00
Andrew Bauer
bcc5a57b02
prelimniary support for nginx on fedora
2016-11-15 18:34:25 -06:00
Isaac Connor
2df6cd17fa
add libswresample to build depends
2016-11-11 22:30:35 -05:00
Isaac Connor
6361f14387
Rremove Index from options to prevent directory listings
2016-11-08 09:30:24 -05:00
Isaac Connor
a6c77f08d2
use generic libboost-dev
2016-10-02 15:22:52 -04:00
Isaac Connor
056e560b70
Merge ../ZoneMinder.master into storageareas
2016-10-02 12:25:51 -04:00
Isaac Connor
07d6e1303b
Merge branch 'compress_logs' into storageareas
2016-10-02 12:22:46 -04:00
Isaac Connor
9e3f6226ed
add compress and delaycompress to the zoneminder logrotate settings
2016-10-02 10:05:07 -04:00
Isaac Connor
f09c6c92e8
blah
2016-09-30 12:22:35 -04:00
Isaac Connor
e11ded83ba
get rid of watch:
2016-09-30 12:15:23 -04:00
Isaac Connor
bf013cd88e
remove libswsresample
2016-09-30 11:58:55 -04:00
Isaac Connor
53d3e063e8
smal re-order
2016-09-30 09:35:52 -04:00
Isaac Connor
603d903297
add an environment setting for TZ which eliminates a stat on /etc/locatime on every log line
2016-09-29 14:24:49 -04:00
Isaac Connor
3dfe1185ff
add ffmpeg as option to libav-tols
2016-09-13 10:11:50 -04:00
Andy Bauer
4895942308
update fedora rpm readme
2016-08-16 09:49:45 -05:00
Isaac Connor
1058796374
add an echo to tell us that updating is done and we are trying to start.
2016-08-12 10:04:35 -04:00
Isaac Connor
bdcc53d309
add an echo to tell us that updating is done and we are trying to start.
2016-08-12 10:04:10 -04:00
Isaac Connor
c1d2407ed3
add an echo to tell us that updating is done and we are trying to start.
2016-08-12 10:02:15 -04:00
Isaac Connor
6b70ff964b
fix path in cake api cleanup rules
2016-08-10 09:06:15 -04:00
Andrew Bauer
6c8001f362
Merge pull request #1549 from SteveGilvarry/initd_sql_wait
...
Implement suggested wait for MySQL start
2016-08-06 09:14:58 -05:00
Andrew Bauer
004b651d61
RPM specfile config change
...
use make macros, rather than hard coded values
2016-07-31 15:06:39 -05:00
Andrew Bauer
3c6692d0d5
RPM specfile config change
...
fix logrotate script
2016-07-31 07:29:37 -05:00
Andrew Bauer
477c02382b
Update CMakeLists.txt
...
Minor change for fedora rpmbuild
2016-07-06 19:06:28 -05:00
Andrew Bauer
1f060f1938
Update zoneminder.init
...
Remove my initials
2016-07-05 11:35:08 -05:00
Steve Gilvarry
1f53377d8a
Implement suggested wait for MySQL start
2016-07-05 07:28:52 +10:00
Andy Bauer
980d3f6e7f
rpm housecleaning, change the way jscalendar is installed
2016-07-03 11:34:35 -05:00
Andrew Bauer
f3583e5707
rpm specfile - add support for f24, remove support for f22
2016-06-24 15:39:57 -05:00
Andy Bauer
58e1a9ac4a
rpm README changes
2016-06-01 07:30:41 -05:00
Disassembler
8eee25795a
Remove deprecated register_globals from Apache/PHP configs
2016-05-30 14:02:46 +02:00
Isaac Connor
b3fd156c11
add boost to build depends
2016-05-25 20:01:42 -04:00
Isaac Connor
abd43bdc9f
Merge ../ZoneMinder.master into storageareas
2016-09-29 14:25:11 -04:00
Isaac Connor
f9fd715657
Merge branch 'master' into storageareas
2016-09-29 14:25:02 -04:00
Isaac Connor
f1012f60ec
add libswresample to build depends
2016-09-29 12:31:02 -04:00
Isaac Connor
441020e8b8
fix_type
2016-09-29 10:49:40 -04:00
Isaac Connor
ce2c52c07d
allow libavdevice55 and 57
2016-09-27 16:15:24 -04:00
Isaac Connor
da5bad7ec2
Merge ../ZoneMinder.connortechnology into storageareas
2016-09-27 15:09:14 -04:00
Isaac Connor
24e33fec7f
allow libvlccore8
2016-09-27 15:08:00 -04:00
Isaac Connor
730d7a648d
add -f to rm
2016-09-27 14:15:38 -04:00
Isaac Connor
ee93424bf9
update jpeh deps to match official debian repo
2016-09-27 12:33:50 -04:00
Isaac Connor
a03d2a393f
add ffmpeg as an option to libav-tools
2016-09-20 13:22:49 -04:00
Isaac Connor
2b4bad86cb
Merge branch 'master' into storageareas
2016-09-13 10:21:10 -04:00
Isaac Connor
2bc5742aec
Merge branch 'feature-h264-videostorage' into storageareas
2016-09-13 09:53:39 -04:00
Isaac Connor
fb35f5c48a
Merge ../ZoneMinder.master into feature-h264-videostorage
2016-08-31 10:58:19 -04:00
Isaac Connor
eafe3d7748
Merge branch 'master' into storageareas
2016-08-17 10:31:55 -04:00
Isaac Connor
b36694ad8b
Merge branch 'master' into storageareas
2016-08-12 10:04:52 -04:00
Steve Gilvarry
5d8159462c
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-08-11 00:51:46 +10:00
Isaac Connor
2451768295
Merge branch 'master' into storageareas
2016-08-08 18:08:46 -04:00
Steve Gilvarry
ea1ae815f1
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-08-05 23:03:06 +10:00
Isaac Connor
208337635a
Merge branch 'master' into storageareas
2016-08-01 19:30:01 -04:00
Steve Gilvarry
3543c37f5e
Add libx264-dev and libmp4v2-dev to build requires to save hassle of
...
ensuring they are installed before build.
2016-07-31 08:24:52 +10:00
Isaac Connor
a30610fbda
Merge branch 'master' into storageareas
2016-07-12 10:31:10 -04:00
Isaac Connor
b8c406f969
Merge branch 'master' into storageareas
2016-06-03 09:32:55 -04:00
Isaac Connor
e62ea454ba
Merge branch 'master' into storageareas
2016-05-17 10:48:52 -04:00
Isaac Connor
09e4aca0be
add libdata-uuid-perl to debian/ubuntu dependencies
2016-05-17 09:26:36 -04:00
Isaac Connor
660ce5bf8c
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-05-13 10:12:51 -04:00
Isaac Connor
532dc98e9e
fix zms
2016-05-11 11:38:53 -04:00
Isaac Connor
b44cee4a81
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-05-11 09:16:20 -04:00
Isaac Connor
cfd986de44
Merge branch 'master' into storageareas
2016-05-10 08:43:46 -04:00
Isaac Connor
4d20d35f8d
add back missing depends for perl modules which are needed both for building and installing
2016-05-10 08:43:38 -04:00
Isaac Connor
f609b838cd
Merge branch 'master' into storageareas
2016-05-09 21:34:25 -04:00
Isaac Connor
5566d1881d
add perl dbd mysql to build depends. Seems to need it.
2016-05-09 21:34:12 -04:00
Isaac Connor
566f18c9ae
bump
2016-05-09 21:09:43 -04:00
Isaac Connor
b88861e145
add back ffmpeg libs
2016-05-09 19:42:14 -04:00
Isaac Connor
beebe74e7b
Merge branch 'merge_db_connects' into storageareas
2016-05-09 12:26:17 -04:00
Isaac Connor
5b8f713037
fix libavutils -> libavutil
2016-05-07 11:28:53 -04:00
Isaac Connor
5158bbc670
add non-ffmpeg versions of libraries to depends list. ubunutu1604 doesn't seem to list them with the ffmpeg specification
2016-05-07 09:43:30 -04:00
Isaac Connor
f9a24d7171
bump today's release
2016-05-05 14:51:57 -04:00
Isaac Connor
79572270d3
bump version
2016-05-02 10:46:23 -04:00
Isaac Connor
00f38cdd1b
version bump
2016-05-02 10:39:41 -04:00
Steve Gilvarry
97a4cf0852
Add the changes...doh
2016-05-01 15:06:45 +10:00
Steve Gilvarry
d7f7a0f074
Rename ubuntu1504, which is unsupported, to ubuntu 1604. Fix control file
...
to current libav packages and php virtual packages. Update debian build
script to use new folder for any non-trusty build.
2016-05-01 13:46:09 +10:00
Isaac Connor
d06a0cf2a4
2016042801 build
2016-04-28 12:58:09 -04:00
Steve Gilvarry
6549f7bf29
Merge pull request #1403 from ZoneMinder/fix_grant
...
Fix grant
2016-04-28 21:49:21 +10:00
Isaac Connor
386afc3546
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-04-26 20:02:04 -04:00
Isaac Connor
6a31966781
shift to match debian
2016-04-22 13:35:20 -04:00
Isaac Connor
8b96872efe
shoudl be php-mysql for php7
2016-04-20 15:04:50 -04:00
Isaac Connor
e218e91e24
add php7 versions for 1604
2016-04-20 14:58:18 -04:00
Isaac Connor
c626baae14
Merge branch 'fix_grant' into storageareas
2016-04-20 14:39:06 -04:00
Isaac Connor
02a56b811b
Don't be recursive when chowning /var/cache/zoneminder
2016-04-20 14:38:51 -04:00
Isaac Connor
060df90ff3
bump versions
2016-04-20 09:38:07 -04:00
Isaac Connor
7e1a80658b
Merge branch 'master' into storageareas
2016-04-17 09:30:33 -04:00
Isaac Connor
d424a297c4
need php5-gd
2016-04-17 09:29:55 -04:00
Isaac Connor
3f27f4893c
Merge branch 'fix_grant' into storageareas
2016-04-15 12:55:13 -04:00
Isaac Connor
78c6e14e0c
Merge branch 'master' into storageareas
2016-04-09 14:52:28 -04:00
Andy Bauer
dafdf1a289
rpm specfile changes
2016-04-08 19:22:27 -05:00
Isaac Connor
e473839704
substitute ZM_DB_NAME,ZM_DB_USER and ZM_DB_PASS from zm.conf for defaults
2016-04-06 15:50:51 -04:00
Isaac Connor
3dd010b40a
User and and instead of defaults
2016-04-06 15:44:56 -04:00
Isaac Connor
6cdbcfc9e6
add back identified by
2016-04-06 13:55:18 -04:00
Isaac Connor
6199a54838
more work, check for local db, check for existence of mysql, sync up between debian ubuntu1204 ubuntu1504
2016-04-06 13:45:46 -04:00
Isaac Connor
699b6458d5
bring up to date with debian postinst. Will not install the db, create the user and will run zmupdate.
2016-04-06 13:08:30 -04:00
Isaac Connor
cf76360ecb
bring up to date with the one in debian
2016-04-06 13:03:24 -04:00
Isaac Connor
fb05e1baad
grant requires rights regardless of password
2016-04-06 13:01:20 -04:00
Isaac Connor
59a8b37df2
Merge branch 'master' into storageareas
2016-04-06 11:47:20 -04:00
Isaac Connor
765f79a87f
Merge branch 'icon_video' into storageareas
2016-04-06 11:16:38 -04:00
Isaac Connor
3e5a4b6481
remove autotools builds, replace them with cmake versions
2016-04-06 08:43:20 -04:00
Isaac Connor
9a795432cf
merge all the commits from the messed up iconnor_video branch
2016-04-05 17:14:46 -04:00
Isaac Connor
60642c1fff
Merge branch 'iconnor_video' into storageareas
2016-04-05 12:32:33 -04:00
Isaac Connor
f73d8be765
Merge branch 'master' into feature-h264-videostorage
2016-04-05 09:43:34 -04:00
Isaac Connor
238a25a302
Merge branch 'master' into iconnor_video
2016-04-05 09:38:59 -04:00
Isaac Connor
0f1a530891
ciontrol files need spaces on multi-line lines
2016-04-05 09:03:37 -04:00
SteveGilvarry
4d7ded5ef0
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
configure.ac
src/Makefile.am
web/js/Makefile.am
2016-04-05 22:06:14 +10:00
Andy Bauer
7ff8d36598
Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation
2016-04-04 20:44:53 -05:00
Isaac Connor
82b32578ec
Merge branch 'master' into iconnor_video
2016-04-01 12:54:09 -04:00
Isaac Connor
abcf48b65c
Merge branch 'master' into feature-h264-videostorage
2016-04-01 08:53:45 -04:00
Isaac Connor
56d95bb949
Merge branch 'iconnor_video' into storageareas
2016-03-31 14:02:56 -04:00
Isaac Connor
74301b3ff3
Add the dependencies for libmp4v2
2016-03-31 11:53:36 -04:00
Isaac Connor
c9a1a9020d
Merge h264
2016-03-31 11:03:36 -04:00
Isaac Connor
e5a36c02bd
Merge remote-tracking branch 'origin/master' into video_remote
2016-03-30 16:55:24 -04:00
Isaac Connor
55e237fd3f
tabs to spaces, add back perl modules to Builds-Depends
2016-03-30 11:10:54 -04:00
Isaac Connor
ea49dc20d1
Merge branch 'master' into storageareas
2016-03-30 10:58:07 -04:00
Isaac Connor
b81395843c
fix spacing in control file
2016-03-30 10:56:10 -04:00
Isaac Connor
f0a307e082
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
...
Conflicts:
distros/ubuntu1504_cmake/control
2016-03-29 11:53:17 -04:00
Isaac Connor
e4d0f2ffda
fixup depends
2016-03-29 11:50:51 -04:00
Isaac Connor
7f34a0df37
Remove deprecated --enable-crashtrace
2016-03-29 11:48:30 -04:00
Isaac Connor
3a8352eb6b
Merge branch 'master' into storageareas
2016-03-21 10:25:03 -04:00
Jon Burgess
06e04127d6
Fix spelling in other README files as well
2016-03-18 23:27:43 +00:00
Jon Burgess
94057a94ff
Fix spelling of 'environment'
2016-03-18 22:42:34 +00:00
Isaac Connor
688dd67697
Merge branch 'add_onvif_deps' into storageareas
2016-03-09 11:18:35 -05:00
Isaac Connor
ee0c134a9b
need spaces at beginning of lien
2016-03-09 11:18:27 -05:00
Isaac Connor
740dc12f7c
remove extra comma
2016-03-09 11:17:50 -05:00
SteveGilvarry
24ebc33ea4
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-03-09 20:54:11 +11:00
Isaac Connor
9647a680f6
Merge branch 'add_onvif_deps' into storageareas
2016-03-08 16:06:30 -05:00
Isaac Connor
094b041c43
There must be spaces before the comma
2016-03-08 16:06:16 -05:00
Isaac Connor
f8582ad9b6
add libsys-cpu-perl and libsys-meminfo-perl
2016-03-08 15:56:26 -05:00
Isaac Connor
c27387610c
add libsys-cpu-perl and libsys-meminfo-perl
2016-03-08 15:56:17 -05:00
Isaac Connor
b0835660b1
add libsys-cpu-perl and libsys-meminfo-perl
2016-03-08 15:56:08 -05:00
Isaac Connor
12a277912e
add libsys-cpu-perl and libsys-meminfo-perl
2016-03-08 15:56:01 -05:00
Isaac Connor
cf1d475dbb
add libsys-cpu-perl and libsys-meminfo-perl
2016-03-08 15:55:56 -05:00
Isaac Connor
b9996b4fc0
add libsys-cpu-perl and libsys-meminfo-perl
2016-03-08 15:55:37 -05:00
Isaac Connor
cfbf2cced1
add libsys-cpu-perl and libsys-meminfo-perl
2016-03-08 15:55:29 -05:00
Isaac Connor
455c268a0c
add libsys-cpu-perl and libsys-meminfo-perl
2016-03-08 15:55:11 -05:00
Isaac Connor
172b687ab3
Merge branch 'add_onvif_deps' into storageareas
2016-03-07 22:18:39 -05:00
Isaac Connor
97249110a4
must still support libgnutls28 for raspbian
2016-03-07 22:18:22 -05:00
Isaac Connor
98b3b92bbf
Merge branch 'add_onvif_deps' into storageareas
2016-03-07 21:54:25 -05:00
Isaac Connor
ef9f218c77
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-03-07 21:52:42 -05:00
Isaac Connor
0e8fc7953d
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-03-07 21:46:10 -05:00
Isaac Connor
30ffae5bc1
Merge branch 'master' into storageareas
2016-03-07 21:42:06 -05:00
Isaac Connor
9abcdc76c6
Merge branch 'master' into add_onvif_deps
2016-03-07 21:27:47 -05:00
Andrew Bauer
de85e18829
rpm specfile changes for 1.30.0
2016-03-03 08:33:49 -06:00
Isaac Connor
3340f9e375
split into multiple lines and add onvif deps
2016-03-03 09:01:26 -05:00
Isaac Connor
5e617753e5
split into multiple lines and add onvif deps
2016-03-03 09:01:15 -05:00
Isaac Connor
4f4e65f86c
split into multiple lines and add onvif deps
2016-03-03 09:00:08 -05:00
Isaac Connor
3c9173fa5c
split into multiple lines and add onvif deps
2016-03-03 08:59:11 -05:00
Isaac Connor
41db18a8c6
split into multiple lines and add onvif deps
2016-03-03 08:59:03 -05:00
Isaac Connor
61ffae79d1
split into multiple lines and add onvif deps
2016-03-03 08:58:53 -05:00
Isaac Connor
d4ed493333
add onvif dependencies and cleanup build-depends
2016-03-02 10:56:07 -05:00
SteveGilvarry
3ce620eb89
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-02-27 19:46:56 +11:00
SteveGilvarry
0277a66700
Remove eyezm from distros and Cmake.
...
Conflicts:
distros/debian8/control
2016-02-26 22:41:27 +11:00
Isaac Connor
90dd078c22
bump release
2016-02-22 09:14:57 -05:00
Isaac Connor
e9be186e6f
changelog
2016-02-19 10:50:43 -05:00
Isaac Connor
b3f5c10591
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2016-02-16 08:59:56 -05:00
Isaac Connor
292e3a141f
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-02-12 13:53:34 -05:00
Isaac Connor
5da8df45a7
Merge branch 'hide_rtspdescribe' into storageareas
2016-02-12 13:53:09 -05:00
Isaac Connor
b7256a6891
Merge branch 'master' into storageareas
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_create.sql.in
version
2016-02-10 09:17:40 -05:00
Isaac Connor
a2ae29dfbe
Add php5-gd to depends
2016-02-08 09:47:52 -05:00
Dmitry Smirnov
5bcc414038
codespell: misc. spelling corrections
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-08 20:41:36 +11:00
Isaac Connor
0674fa2d7a
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-02-04 12:21:33 -05:00
Isaac Connor
89cff287cd
Merge branch 'master' into storageareas
2016-02-04 12:14:16 -05:00
SteveGilvarry
e76d5ad1cb
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-02-04 07:33:40 +11:00
Andy Bauer
5a8989b168
Minor RPM packaging changes
2016-02-02 11:47:55 -06:00
Isaac Connor
48283191ec
Merge branch 'master' into storageareas
2016-02-01 15:47:08 -05:00
Isaac Connor
f46b10d399
bump release
2016-02-01 15:46:45 -05:00
SteveGilvarry
7301e803ed
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2016-01-30 15:45:08 +11:00
Andrew Bauer
a990b23164
Update zoneminder.f22.spec
2016-01-29 21:25:34 -06:00
Andrew Bauer
fa50327420
Update zoneminder.f23.spec
2016-01-29 21:24:50 -06:00
Isaac Connor
ebbecd5cc4
add php5-gd to depends. We use it for image scaling
2016-01-14 13:41:09 -05:00
Isaac Connor
818cd614eb
Merge branch 'multi-server' into storageareas
2016-01-08 10:17:37 -05:00
Isaac Connor
5ce26ac4df
Change logrotate defaults to daily/rotate 7, which works better with logcheck
2016-01-08 09:59:03 -05:00
Isaac Connor
3066f66f25
add sphinx-rtd-theme
2016-01-05 13:21:54 -05:00
Isaac Connor
5c3c8b68a3
Add sphinx rtd theme as a dependency
2016-01-05 09:40:31 -05:00
Isaac Connor
1918b9b576
bump
2016-01-04 14:44:36 -05:00
Isaac Connor
b1205bcaa9
Merge branch 'multi-server' into storageareas
...
Conflicts:
CMakeLists.txt
configure.ac
scripts/zmaudit.pl.in
version
2016-01-02 14:45:24 -05:00
Andy Bauer
a93f78b7e6
Bump rpm specfiles to 1.29.0
2016-01-02 10:35:52 -06:00
Isaac Connor
1da87332b7
blah
2016-01-01 21:22:12 -05:00
Isaac Connor
93dbc3f0c1
Merge multi-server updates and bump version
2016-01-01 16:31:02 -05:00
Andrew Bauer
d5ec34889e
Merge pull request #1211 from SteveGilvarry/multiserver-docs
...
Adding multiserver documentation
2016-01-01 09:01:31 -06:00
Isaac Connor
f38f216f59
Merge branch 'master' into storageareas
2015-12-29 14:59:44 -05:00
Isaac Connor
13689d7a7d
Merge branch 'storageareas' into newpointone
...
Conflicts:
web/lang/en_gb.php
web/skins/classic/views/filter.php
2015-12-28 13:13:49 -05:00
Isaac Connor
63352ac7c9
changelog update
2015-12-28 13:10:27 -05:00
Andrew Bauer
e6e8a75b64
Update zoneminder.f23.spec
2015-12-27 11:48:53 -06:00
Isaac Connor
33a3661958
cleanup, revent to openprint style objects
2015-12-23 14:03:40 -05:00
Isaac Connor
769b1f713c
Merge branch 'multi-server' into storageareas
...
Conflicts:
distros/ubuntu1204/apache.conf
2015-12-23 13:13:25 -05:00
SteveGilvarry
1ff2043774
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2015-12-23 19:24:08 +11:00
Isaac Connor
962d74f6a7
blah
2015-12-22 11:38:36 -05:00
Isaac Connor
eccfced6d4
Merge branch 'multi-server' into newpointone
...
Conflicts:
distros/ubuntu1204/apache.conf
2015-12-22 09:54:13 -05:00
Isaac Connor
64f1475058
blah
2015-12-22 09:47:35 -05:00
Isaac Connor
b33c0764fe
update to new cgi-bin path
2015-12-21 12:59:52 -05:00
Isaac Connor
dfd7986c01
Merge branch 'master' into multi-server
...
Conflicts:
distros/debian_cmake/links
distros/ubuntu1504_cmake/zoneminder.postinst
2015-12-21 12:57:45 -05:00
Isaac Connor
f6fd4671fe
make zmfilter aware of StorageAreas
2015-12-21 12:40:39 -05:00
Isaac Connor
fc981e063e
snap release adding zmvideo
2015-12-21 10:01:55 -05:00
Isaac Connor
f4debc203d
Only run zmupdate.pl if the mysql db is located here
2015-12-20 12:23:40 -05:00
Isaac Connor
9743bad13f
Add a valid config if a person is using mod_fcgid instead of mod_php
2015-12-20 12:21:18 -05:00
Isaac Connor
4ef35c8c70
No need for a cgi-bin link
2015-12-20 11:23:01 -05:00
Isaac Connor
9c2707deba
update paths to /usr/share/zoneminder/www and /usr/lib/zoneminder/cgi-bin
2015-12-20 11:22:12 -05:00
Isaac Connor
623c8a14b0
add multi-package build for 14.04
2015-12-18 14:16:45 -05:00
Isaac Connor
14cde582cf
Merge branch 'multi-server' into multiserverplusstorage
...
Conflicts:
src/zm_monitor.h
2015-12-14 16:55:26 -05:00
Isaac Connor
b2b1afa8ad
Merge master
2015-12-14 15:49:32 -05:00
Isaac Connor
b21b26a41b
remove requirment for mysql. Mysql could be on another machine
2015-12-09 12:34:16 -05:00
Isaac Connor
af59dbee2e
== should be =
2015-12-04 10:40:55 -05:00
Isaac Connor
70fb6a6786
output message when not doing dbupdate. put quotes in to fix bash error when ZM_DB_HOST is not defined
2015-12-02 11:17:23 -05:00
SteveGilvarry
220ee5e516
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2015-11-29 13:17:22 +11:00
Isaac Connor
7514f43ef4
only update db if db is local
2015-11-27 13:54:31 -05:00
Isaac Connor
f7cc2fb44f
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
2015-11-23 10:42:14 -05:00
Isaac Connor
7d97ecb9c9
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-11-23 10:40:08 -05:00
Andy Bauer
cbfdc5d88d
rpm packaging updates
2015-11-21 15:23:13 -06:00
Andy Bauer
e65f91d404
update rpm documentation
2015-11-21 15:18:43 -06:00
Isaac Connor
4d6c4355db
Merge branch 'master' into multi-server
2015-11-20 16:07:50 -05:00
Isaac Connor
37b041b561
add index to recommended default permissions on zmuser
2015-11-20 16:00:57 -05:00
Andy Bauer
9052274d0d
Update rpm documentation to reference index permission
2015-11-17 12:20:51 -06:00
Isaac Connor
e00049f17a
change format to native
2015-11-16 09:30:09 -05:00
Isaac Connor
d5cc602bfa
Merge branch 'master' into multi-server
2015-11-09 12:36:34 -05:00
Isaac Connor
16274e46bc
grant create,index to zmuser when updating
2015-11-09 12:36:26 -05:00
Isaac Connor
ac76d224b8
grant create,index to zmuser when updating
2015-11-09 12:36:23 -05:00
Isaac Connor
82edfc2f16
grant create,index to zmuser when updating
2015-11-09 12:34:24 -05:00
Isaac Connor
6b994132f1
grant create,index to zmuser when updating
2015-11-09 12:34:11 -05:00
Heng Liu
4e263f5913
Merge branch 'master' into feature-h264-videostorage
...
Conflicts:
src/zm_ffmpeg.h
2015-11-04 14:39:52 -08:00
Isaac Connor
b28a562f1b
Merge branch 'master' into multi-server
2015-10-30 12:32:42 -04:00
Isaac Connor
920bea8deb
split up depends into multiple lines
2015-10-30 12:19:43 -04:00
Isaac Connor
589ee2f37b
split up depends into multiple lines
2015-10-30 12:19:35 -04:00
Isaac Connor
a45a52601d
change format to native, which makes building packages so much easier
2015-10-30 12:19:12 -04:00
SteveGilvarry
d45cf9607b
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2015-10-28 08:12:46 +11:00
Isaac Connor
029044bca3
merge master, bump version
2015-10-23 16:14:49 -04:00
Isaac Connor
e37cf0e218
append /www to docroot for all debian/ubuntu dists
2015-10-23 16:08:32 -04:00
SteveGilvarry
d8494aba2d
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
src/zm_remote_camera_rtsp.h
web/skins/classic/views/monitor.php
2015-10-23 22:07:22 +11:00
Isaac Connor
d0e5dd62b5
Merge pull request #1103 from seebaer1976/patch-6
...
Update preinst
2015-10-16 12:06:44 -04:00
Isaac Connor
582cbe7567
Merge branch 'master' into multi-server
2015-10-15 09:01:19 -04:00
seebaer1976
7ebf3de8a2
Update preinst
...
korrektur
2015-10-09 18:13:13 +02:00
Isaac Connor
8db4c22192
Merge pull request #1100 from seebaer1976/patch-2
...
Update links
2015-10-09 09:23:32 -04:00
Isaac Connor
729e9536d7
Merge pull request #1101 from seebaer1976/patch-4
...
Update rules
2015-10-09 09:23:13 -04:00
Isaac Connor
79078f8308
Merge pull request #1102 from seebaer1976/patch-5
...
Update apache.conf
2015-10-09 09:22:55 -04:00
seebaer1976
b17819d181
Update apache.conf
...
Update links
2015-10-09 13:50:15 +02:00
seebaer1976
b042152694
Update rules
...
update links
2015-10-09 13:48:26 +02:00
seebaer1976
4284f8b089
Update preinst
...
Update links
2015-10-09 13:45:19 +02:00
seebaer1976
23a6000380
Update links
...
Update links
2015-10-09 13:41:02 +02:00
Andy Bauer
b74abe88c9
minor centos 7 specfile change
2015-10-03 17:07:22 -05:00
Andrew Bauer
3242cde0bf
move zm.conf under /etc/zm for Fedora
2015-10-03 13:38:51 -05:00
Andrew Bauer
4fb2bcb393
Fedora specfile changes
2015-10-03 13:21:58 -05:00
Andrew Bauer
e8c4adbcca
Use make macros inside Fedora config files rather than hardcode
2015-10-03 12:54:18 -05:00
Andrew Bauer
6861ea00d2
Add Fedora 22 Target Distro
2015-10-03 12:40:34 -05:00
Andrew Bauer
269e9bd475
Configure Fedora packages for HTTPS
2015-10-03 12:35:22 -05:00
Andrew Bauer
a79d0fc502
update README.fedora
2015-10-03 11:04:58 -05:00
Andrew Bauer
9fae2bdf67
symlink README.https into Fedora folder
2015-10-03 10:45:41 -05:00
Andrew Bauer
d6667100b4
Merge pull request #1084 from ZoneMinder/tz
...
Tz
2015-10-13 07:19:45 -05:00
Isaac Connor
4edf997791
change docroot to /usr/share/zoneminder/www and cgi-bin to /usr/lib/zoneminder/cgi-bin
2015-10-02 12:32:12 +00:00
Isaac Connor
c9d7087c91
Setting the TZ ENV variable prevents every gettimeofday call from reading /etc/timezone
2015-10-01 11:47:12 -04:00
Isaac Connor
2d749f0b66
Setting the TZ ENV variable prevents every gettimeofday call from reading /etc/timezone
2015-10-01 11:46:51 -04:00
Isaac Connor
07348d4321
don't need apache patch anymore
2015-09-29 08:50:50 -04:00
Andrew Bauer
e97341ced5
Merge pull request #1054 from knnniggett/cambozola
...
link to cambozola pacakge, rather than download during build
2015-09-14 14:02:10 -05:00
Isaac Connor
e88d63cb35
need to check the case of having a / at the end
2015-09-14 14:55:37 -04:00
Andrew Bauer
03172af921
link to cambozola pacakge, rather than download during build
2015-09-14 13:51:48 -05:00
Isaac Connor
3f3c637227
don't need apache patch anymore
2015-09-14 14:36:19 -04:00
Isaac Connor
407ed7ec66
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-09-14 14:14:23 -04:00
Isaac Connor
6e47812669
This patch is no longer needed
2015-09-14 14:14:13 -04:00
Andrew Bauer
c8fecee68b
Update CMakeLists.txt
...
nbtelecom was returning http 403. switching to skylineservers. In the future, I will add jscalendar packages to zmreop as that is better practice.
2015-09-12 18:03:20 -05:00
Andrew Bauer
0ff14008b3
Update zoneminder.el6.conf.in
...
ScriptAlias should point to ZM_CGIDIR instead of ZM_WEBDIR
2015-09-12 17:49:03 -05:00
Andrew Bauer
ebb6e7158a
rpm packaging changes for centos 6
2015-09-08 18:16:19 -05:00
Andrew Bauer
427c71f5e8
Update README.Centos7
2015-09-07 16:54:13 -05:00
Andrew Bauer
41cfadbcb1
Update zoneminder.el7.spec
...
typo
2015-09-07 16:14:58 -05:00
Andrew Bauer
dc9a5b13fe
redhat rpm packaging modifications
2015-09-07 15:50:42 -05:00
Andy Bauer
9320efdd45
rpm specfile - modify symlinks
2015-08-29 18:04:26 -05:00
Andy Bauer
4ddeddeb32
rpm specfile - correct typo
2015-08-29 17:28:06 -05:00
Andy Bauer
4915b7fc72
rpm spec file - create cakephp tmp folder symlink
2015-08-29 16:52:16 -05:00
Andy Bauer
d9c3061b52
Add reference to mysql Create permission in rpm README's
2015-08-29 14:01:45 -05:00
Andrew Bauer
ef8830b373
Update zoneminder.el6.spec
...
rpm specfile - update location of perl packlist
2015-08-29 11:12:55 -05:00
Isaac Connor
3ff9c38a2e
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-08-20 20:36:21 -04:00
Isaac Connor
8e01dad828
add the api tmp link
2015-08-20 20:36:09 -04:00
Isaac Connor
6a1bbd2055
remove systemd overrides
2015-08-20 13:49:04 -04:00
Isaac Connor
96a710671d
add the api tmp dir link to /tmp/zm
2015-08-19 16:23:36 -04:00
Isaac Connor
daba109e7d
set AllowOverride All for api dir
2015-08-19 16:09:03 -04:00
Isaac Connor
492cafe08e
set AllowOverride All for api dir
2015-08-19 16:08:48 -04:00
Isaac Connor
e4f1795fa4
1404 doesn't have 3.9.6, so go back to 3.9.4
2015-08-19 13:35:06 -04:00
Isaac Connor
93e948e0d8
these links need to move under www to work
2015-08-19 13:31:56 -04:00
Isaac Connor
4767a6fb38
remove systemd, and extra Standards-Version
2015-08-18 14:01:56 -04:00
Isaac Connor
16897b7c94
rough in ubuntu1204 version of cmake build
2015-08-18 11:57:56 -04:00
Isaac Connor
3b3ae0adf5
This will be used from now on when generating master snapshots for ubuntu1504 for a single zoneminder.deb
...
It was taken from the debian official package on August 17th 2015. Various unneeded patches were removed
and the dependencies were change to use the ffmpeg version of av libraries. Also, since ubuntu1504 does not have cakephp 2 available
we cannot use a packaged version of that, so we still need our own copy for the api
2015-08-17 14:03:27 -04:00
Isaac Connor
8e491475d1
typos and whitespace fixes
2015-08-16 12:45:45 -04:00
Andrew Bauer
b69fd1e86d
configure apache to follow symlinks so it find nph-zms
2015-08-13 20:23:52 -05:00
Andrew Bauer
af5fd5890b
Fix redalert.wav symlinks
2015-08-10 08:13:37 -05:00
Isaac Connor
1e60fccd81
Cherry-Pick from iconnor - make it compile on ubuntu 15.04. Which is libav 56.1.0
...
Conflicts:
src/zm_ffmpeg.cpp
src/zm_remote_camera_rtsp.cpp
Conflicts:
distros/ubuntu1204/changelog
2015-07-28 21:39:47 +10:00
Isaac Connor
b90d8c4f73
db_get fails if there is no debconf entry (for example if the package is not yet configured)
2015-07-23 15:08:06 -04:00
Isaac Connor
27ef821a4f
db_get fails if there is no debconf entry (for example if the
...
package is not yet configured)
2015-07-23 15:07:32 -04:00
Andrew Bauer
fffea54ed1
Merge pull request #944 from ZoneMinder/php-gd
...
add php-gd to list of dependencies for debian and ubuntu builds
2015-07-16 13:08:33 -05:00
Isaac Connor
424b7d50bd
php-gd should isntead be php5-gd
2015-07-16 13:59:06 -04:00
Isaac Connor
e3042c59a5
add php-gd to list of dependencies for debian and ubuntu builds
2015-07-16 13:40:16 -04:00
Andrew Bauer
eb5bb641d6
rpm packaging - require php-gd
2015-07-16 12:15:24 -05:00
Isaac Connor
09efee3be3
limit man install to 8 to not conflict with man pages in libzoneminder-perl
2015-07-15 15:46:53 -04:00
Isaac Connor
2f3779473b
release SNAPSHOT2015071501
2015-07-15 15:45:02 -04:00
Isaac Connor
4f0466739f
remove generated .debhelpers
2015-07-15 12:04:00 -04:00
Isaac Connor
7a08127d21
release snapshot 2015071501
2015-07-15 12:02:20 -04:00
Isaac Connor
c7e30436be
cleanup and add usr/share/man to core install dirs so that man files get installed
2015-07-13 11:31:23 -04:00
Isaac Connor
58448adb51
Merge pull request #896 from knnniggett/pod2man
...
Generate man pages for perl scripts & C Binaries in the bin folder
2015-07-03 11:40:24 -04:00
Isaac Connor
956e2936a3
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-06-25 16:26:49 -04:00
Bill McGonigle
e3727af243
softlayer-dal appears to defunct as a sourceforge mirror. Get jscalendar from nbtelcom instead.
2015-06-24 01:32:53 -04:00
Andrew Bauer
d03469125a
Add perl-podlators build dependency to redhat distros
2015-06-20 18:07:29 -05:00
Isaac Connor
69cdce22e1
cleanout build files
2015-06-19 12:04:09 -04:00
Isaac Connor
99384983a5
merge from recent ubuntu1504 switch to ffmpeg version of av libs
2015-06-18 13:09:42 -04:00
Isaac Connor
03de98980f
cleanup log
2015-06-12 11:53:08 -04:00
Isaac Connor
18674b7973
cleanup
2015-06-12 11:51:43 -04:00
Isaac Connor
7759e57776
update changelog to match last snapshot
2015-06-12 11:50:10 -04:00
Isaac Connor
106d543367
add ubuntu15.04 using cmake with split packages
2015-06-12 11:20:24 -04:00
Sebastian Kaminski
3266b0b57e
change for systemd
2015-05-24 22:13:09 +02:00
Sebastian Kaminski
3080ecdb20
add service and temp files
2015-05-24 22:09:43 +02:00
Sebastian Kaminski
a671b452a8
change dependencies for ubuntu 15.04
2015-05-24 22:05:09 +02:00
Sebastian Kaminski
f45af08947
copy ubutnu1204 without init.d
2015-05-24 22:01:51 +02:00
Andrew Bauer
e127228233
Update zoneminder.el7.spec
...
some documentation was not being packaged and neither was the selinux policy file
2015-05-07 18:13:33 -05:00
Andrew Bauer
cbbe40ea1c
Update zoneminder.el7.spec
...
Recent perl changes place the .packlist file under a different folder on CentOS 7
2015-05-07 17:56:04 -05:00
Isaac Connor
1668949f18
Merge pull request #792 from knnniggett/perl
...
cmake - use perl INSTALLDIRS
2015-04-15 11:07:14 -04:00
Andrew Bauer
0eeba1c514
don't check for perl packlist in f21 specfile
2015-04-10 15:36:57 -05:00
Isaac Connor
411b518b14
Merge pull request #774 from knnniggett/tmpfiles
...
Use tmpfiles.d to manage tmpdir and sockdir
2015-04-10 13:42:28 -04:00
Andrew Bauer
0cf82a0b71
Allow user to override perl installation. Replace old perl cmake vars with new.
2015-04-10 12:09:01 -05:00
Andrew Bauer
a3637b9eed
Add libv4l-devel as a build req for el7, f20, & f21
2015-04-03 17:41:46 -05:00
Andrew Bauer
c0af30bdf1
fix permissions on config file
2015-03-31 20:45:12 -05:00
Andrew Bauer
7802089b82
Use tmpfiles.d to manage tmpdir and sockdir
2015-03-31 20:30:27 -05:00
Isaac Connor
75cfc3f0cd
bump release
2015-03-02 17:16:00 -05:00
Isaac Connor
098e66951e
remove netpbm from debian packaging
2015-03-02 17:15:27 -05:00
Andrew Bauer
111e75e8e9
add psmisc pacakge requirement to rpm specfiles
2015-02-23 08:09:48 -06:00
Andrew Bauer
397bc57692
Update zoneminder.el6.spec
2015-02-23 07:18:32 -06:00
Andrew Bauer
7d747b72d7
bump version for el6 and f20 specfiles
2015-02-23 07:12:57 -06:00
Andrew Bauer
42744f4359
Update zoneminder.f21.spec
...
bump version in cmake flag
2015-02-21 09:17:16 -06:00
Andrew Bauer
568fea61fa
Merge pull request #704 from clipo1979/master
...
Make el6 and el7 build process a little more automated
2015-02-19 19:18:26 -06:00
Andy Bauer
9f3ff787d1
Merge branch '478-onvif-support' of https://github.com/altaroca/ZoneMinder into altaroca-478-onvif-support
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_create.sql.in
distros/redhat/archive/zoneminder.el6.spec
distros/redhat/zoneminder.el6.spec
web/skins/classic/views/monitor.php
2015-02-18 18:53:47 -06:00
Isaac Connor
22b73c1610
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-02-18 16:32:06 -05:00
Andrew Bauer
e3351441c7
fix cmake error, rename init script to zoneminder, modify el6 target distro
2015-02-15 15:59:58 -06:00
clipo1979
18abb3761d
Update CMakeLists.txt
2015-02-15 15:50:21 +00:00
clipo1979
e762a615d3
Rename zoneminder.el6.conf to zoneminder.el6.conf.in
2015-02-15 15:48:40 +00:00
clipo1979
c6f256fef4
Rename zoneminder.el6.logrotate to zoneminder.el6.logrotate.in
2015-02-15 15:48:14 +00:00
clipo1979
aa00de486b
Rename zoneminder.el7.logrotate to zoneminder.el7.logrotate.in
2015-02-15 15:47:42 +00:00
clipo1979
200f48da34
Rename zoneminder.tmpfiles to zoneminder.tmpfiles.in
2015-02-15 15:46:00 +00:00
clipo1979
4fc4789b08
Update zoneminder.el6.conf
2015-02-15 14:23:28 +00:00
clipo1979
813de8540f
Update zoneminder.el6.logrotate
2015-02-15 14:21:16 +00:00
clipo1979
160503df14
Update zoneminder.el7.logrotate
2015-02-15 14:20:23 +00:00
clipo1979
6b8ce2e0d4
Rename zoneminder.in to zm.in
2015-02-15 14:06:54 +00:00
clipo1979
e80702bb22
Update CMakeLists.txt
2015-02-15 14:03:06 +00:00
clipo1979
5f96882ec7
Update CMakeLists.txt
2015-02-15 14:00:34 +00:00
clipo1979
39c5d3ad06
Update zoneminder.tmpfiles
2015-02-15 13:48:46 +00:00
clipo1979
308a8b9df3
Update CMakeLists.txt
2015-02-15 13:34:17 +00:00
clipo1979
12964f5635
Update CMakeLists.txt
2015-02-15 11:44:46 +00:00
clipo1979
3e03745603
Rename zoneminder.el7.conf to zoneminder.el7.conf.in
2015-02-15 11:43:10 +00:00
clipo1979
b42b646e5e
Update zoneminder.el7.conf
2015-02-15 11:39:27 +00:00
Andrew Bauer
c54b9aa6bc
Update zoneminder.f21.spec
...
typo
2015-02-14 11:29:34 -06:00
Andrew Bauer
9ac5b2b1c5
create zoneminder spec file for fedora 21
2015-02-14 11:25:03 -06:00
Isaac Connor
cdb5180964
bump snapshot release
2015-02-13 13:14:50 -05:00
Isaac Connor
eb73c16246
add mysql-client-5.6 as an option in depends
2015-02-13 13:06:03 -05:00
Andrew Bauer
8480eda48c
Update README.Centos7
2015-02-13 06:55:45 -06:00
Andrew Bauer
4d33a55f9e
Update README.Centos7
2015-02-13 06:50:50 -06:00
Andrew Bauer
f20a233ab2
Update zoneminder.el7.spec
...
move zm.conf to /etc/zm
2015-02-11 17:57:13 -06:00
Andrew Bauer
ccad736893
Update README.Centos7
2015-02-11 13:55:02 -06:00
Andrew Bauer
b741da01e8
renumber the items
2015-02-09 13:36:22 -06:00
Andrew Bauer
e8732d76b9
Minor documentation tweaks
2015-02-09 13:29:21 -06:00
Andrew Bauer
8304a8d428
Update instructions in README.Centos7
2015-02-09 09:28:35 -06:00
Andrew Bauer
51bf50f79a
Add mariadb to buildrequires
2015-02-09 07:58:34 -06:00
Andrew Bauer
9944a40763
Run zmupdate noninteractively following an upgrade
2015-02-08 19:08:21 -06:00
Andrew Bauer
c475cc69d2
Change zm ScriptAlias to prevent an overlap with the default ScriptAlias
2015-02-08 18:52:42 -06:00
Andrew Bauer
0cf5bc5efb
install tmpfiles config file
2015-02-08 18:16:21 -06:00
Andrew Bauer
f3671ddd8b
add ZM_TARGET_DISTRO string after else statement
2015-02-08 18:07:46 -06:00
Andrew Bauer
c619dded76
reorganize files to allow el6 and el7 files to exist simultaneously
2015-02-08 17:56:44 -06:00
Andrew Bauer
9bc28c96f0
Centos 7 rpm packaging
2015-02-08 16:16:31 -06:00
Emmanuel Papin
279459bf2c
Merge branch 'master' of https://github.com/manupap1/ZoneMinder into debian_package_split
2015-01-15 21:35:52 +01:00
Emmanuel Papin
c6c4e70a36
Switch debian8 folder to native source format
2015-01-15 21:32:01 +01:00
Andrew Bauer
44606942fa
Rename zoneminder.cmake.f20.spec to zoneminder.f20.spec
2015-01-13 08:17:42 -06:00
Andrew Bauer
010fd69b0b
Rename zoneminder.cmake.el6.spec to zoneminder.el6.spec
2015-01-13 08:17:20 -06:00
Andrew Bauer
7c99886af2
Update zoneminder.cmake.el6.spec
...
net-tools is the package that contains the arp command.
2015-01-13 08:16:05 -06:00
Andrew Bauer
3b418bb455
Update zoneminder.cmake.f20.spec
...
net-tools is the package that contains the arp command
2015-01-13 08:15:02 -06:00
Emmanuel Papin
47ef5c999f
Add dependency to apache2 for zoneminder-core package
2015-01-12 22:22:40 +01:00
Emmanuel Papin
f05dc5e2a3
Rename debian patch
2015-01-12 21:03:29 +01:00
Emmanuel Papin
e1824aad4b
Fix a conflict when merging upstream master
2015-01-12 20:52:14 +01:00
Emmanuel Papin
0650ca1de0
Merge branch 'master' of https://github.com/manupap1/ZoneMinder into debian_package_split
...
Conflicts:
distros/debian8/patches/01_vendor-perl.diff
distros/debian8/patches/series
2015-01-12 20:48:59 +01:00
Emmanuel Papin
0de7217317
Remove no longer needed patch because applied to master
2015-01-03 14:13:41 +01:00
Emmanuel Papin
d61becb0d7
Merge branch 'master' of https://github.com/manupap1/ZoneMinder into debian_package_split
2015-01-03 13:22:40 +01:00
Isaac Connor
d958a13114
this patch has been applied to master branch and is no longer needed.
2014-12-30 09:49:14 -05:00
Emmanuel Papin
bb2cecee8a
Update of build dependencies
2014-12-28 11:04:53 +01:00
Andrew Cook
c69badc70d
Don't check for zmdc.pl when stopping via systemd
...
If this check ever actually returns true, it makes ExecStop a no-op
and systemd will forcefully kill all processes in the service
see man systemd.service
This also prevents a deadlock when running systemctl stop,
zmpkg.pl detects bash as it's parent and attempts to call
systemctl stop itself, which blocks forever waiting for the
task it's in to complete
2014-12-23 20:32:14 +11:00
Emmanuel Papin
d8e682c48b
Update of perl library dependencies
2014-12-21 04:02:41 +01:00
Emmanuel Papin
3bfee679f8
Move the refreshed patches to the right folder
2014-12-21 02:38:17 +01:00
Emmanuel Papin
2aa3f7e2da
Refresh the debian patches
2014-12-21 01:52:42 +01:00
Emmanuel Papin
aff6958398
Provide a patch to rename the service file in zmsystemctl.pl.in
2014-12-21 01:38:32 +01:00
Emmanuel Papin
df2473cdf7
Use a wilcard to reference man files
2014-12-20 21:11:44 +01:00
Emmanuel Papin
5bd3b18c7b
Merge branch 'master' of https://github.com/manupap1/ZoneMinder into debian_package_split
2014-12-20 20:30:54 +01:00
Emmanuel Papin
fb1566c829
Fix package dependencies
2014-12-20 20:26:34 +01:00
Emmanuel Papin
939f126e76
Set the right filename for the systemd service and don't call zmupdate interactively
2014-12-20 20:21:29 +01:00
Emmanuel Papin
6cdb046b34
Do not repeat admin password question if already answered
2014-12-20 20:12:33 +01:00
Emmanuel Papin
5457d5c5e5
Move call to zmupdate.pl in core package because it requires zm.conf file and perl libraries
2014-12-19 16:32:36 +01:00
Emmanuel Papin
ae1bf955e5
Update zm.conf file in package which provide it
2014-12-19 15:49:40 +01:00
Emmanuel Papin
27ca8f7ee4
Rename database package and update descriptions
2014-12-18 20:05:59 +01:00
Emmanuel Papin
9745a1fb0b
Remove useless file libzoneminder-perl.manpages
2014-12-18 15:04:50 +01:00
Emmanuel Papin
5e41665d88
Fix some lintian errors and warning after package spliting
2014-12-18 11:03:54 +01:00
Isaac Connor
b921b6f254
the debian packaging has this, and apparently we need it to build
2014-12-17 16:23:04 -05:00
Isaac Connor
5dd1b6a388
this is in debian
2014-12-17 16:11:26 -05:00
Isaac Connor
9b860fb08c
libjpeg updates to match debian
2014-12-17 16:10:54 -05:00
Isaac Connor
67fc4c5ea9
update to what has been done in debian
2014-12-17 15:43:32 -05:00
Isaac Connor
e9e6d84c7b
bump release #
2014-12-17 15:30:20 -05:00
Emmanuel Papin
9f6e4dd794
Set the new dbg package name in the rules file
2014-12-16 21:15:11 +01:00
Emmanuel Papin
3b3a4772a4
Fix installatino of man files and sql files
2014-12-16 20:58:54 +01:00
Emmanuel Papin
7189de829c
Split files in multiple packages (lb, core, ui...)
2014-12-16 12:42:51 +01:00
Isaac Connor
0251500f09
Merge pull request #634 from manupap1/debconf_support
...
Add debconf / dbconfig support to debian8 folder
2014-12-14 10:08:59 -05:00
Emmanuel Papin
af6941f1ef
Fix lintian warning 'description-synopsis-starts-with-article' and more typo in control file
2014-12-13 17:53:53 +01:00
Emmanuel Papin
a27e99b104
Add section 'debug' and priority 'extra' to zoneminder debug package to fix two lintian warnings
2014-12-13 17:50:52 +01:00
Emmanuel Papin
655af1d373
Upgrade Standards-Version in control file to fix a lintian warning
2014-12-13 17:43:24 +01:00
Emmanuel Papin
7cdaf1a41e
Upgrade build dependency to version 9 of debhelper (fix a lintian warning) and fix some typo in control file
2014-12-13 17:39:06 +01:00
Emmanuel Papin
63d75debff
Use dh_install and dh_link in override_dh_install
2014-12-13 17:32:01 +01:00
Emmanuel Papin
59e2d0873d
Add required README.source file when using a patching system
2014-12-13 17:30:21 +01:00
Emmanuel Papin
28516df0ec
Use dh_auto_configure instead of standard configure command
2014-12-13 17:04:07 +01:00
Emmanuel Papin
099529c787
Switch patching system to quilt and add a patch to fix perl install directory
2014-12-13 16:57:46 +01:00
Emmanuel Papin
cd0b85aaa6
Move dbconfig stuff from rules script to postinst and postrm scripts
2014-12-12 15:06:51 +01:00
Emmanuel Papin
aa31c9b292
Fix regex when removing a sql request in zm_create.sql file
2014-12-12 13:22:33 +01:00
Emmanuel Papin
74f08787d4
Remove buggy functions and debug mode
2014-12-12 13:04:17 +01:00
Emmanuel Papin
665ffcb2bc
Fix a premature exit when reconfiguring
2014-12-10 16:11:56 +01:00
Emmanuel Papin
065850ad2b
Improve debconf data input
2014-12-08 16:57:37 +01:00
Emmanuel Papin
b1c25efcd9
Remove dependency to mysql.service in zoneminder.service
2014-12-07 18:48:11 +01:00
Emmanuel Papin
91719ff7f4
Install and remove package without error even if no database
2014-12-07 15:18:08 +01:00
Emmanuel Papin
f2168f50d1
Fix permissions on /etc/zm/zm.conf as requested by the debian policy
2014-12-07 11:51:08 +01:00
Emmanuel Papin
aab181ffa6
Fix some comments in postinst script
2014-12-07 02:43:08 +01:00
Emmanuel Papin
31fda1fc7c
Bring localization to debconf menus and add french language
2014-12-07 02:38:00 +01:00
Emmanuel Papin
9d4c08ff45
Add version to build dependency on po-debconf
2014-12-07 01:51:36 +01:00
Emmanuel Papin
af0770c33f
Use 'true' to prevent config script from dying and fix a bad variable name
2014-12-07 00:04:26 +01:00
Emmanuel Papin
b201ad2d7e
Do not do some actions when upgrading
2014-12-06 21:39:50 +01:00
Emmanuel Papin
328ccc1bc6
Update the database version after dbconfig upgrade
2014-12-06 21:15:04 +01:00
Emmanuel Papin
6c0854f16f
Fix bad setting of admin account
2014-12-06 18:48:09 +01:00
Emmanuel Papin
8def8a7b94
Re-work of debconf dbconfig integration
2014-12-06 17:50:13 +01:00
Emmanuel Papin
01e57dbbe9
Readd dependency to debconf and dbconfig-common
2014-12-06 14:05:16 +01:00
Emmanuel Papin
65bd73b102
Fix conflict when merging from master
2014-12-06 14:03:24 +01:00
Emmanuel Papin
94dce6729f
Add missing dependency to policykit-1
2014-12-05 23:02:20 +01:00
Emmanuel Papin
441b6631e3
Get a chance to enter config
2014-12-03 23:21:41 +01:00
Emmanuel Papin
e5a986376e
Remove unneeded call to db_purge in postrm script and source the debconf file where it is required
2014-12-03 22:52:10 +01:00
Emmanuel Papin
e0e00e7a64
Add some double quote to string for proper coding
2014-12-03 20:30:33 +01:00
Emmanuel Papin
400e656f52
Adjust a debconf message
2014-12-03 20:27:42 +01:00
Emmanuel Papin
bdc2b383de
Fix exit codes in zoneminder.config
2014-12-03 18:22:19 +01:00
Emmanuel Papin
da3467aa77
Remove a potential remaining file when purging and rework of apache deconfiguration
2014-12-03 17:43:39 +01:00
Emmanuel Papin
805933b501
Re-add missing argument to apache_install function
2014-12-03 17:27:27 +01:00
Emmanuel Papin
6c417e02e4
Only link files with zm_update-*.sql pattern
2014-12-03 16:42:31 +01:00
Emmanuel Papin
0f53347133
Fix package name for directory creation
2014-12-03 16:19:42 +01:00
Emmanuel Papin
ae4e13a9c6
Remove some trailing whitespaces
2014-12-03 16:02:39 +01:00
Emmanuel Papin
1e805ca706
Add dependency to debconf and dbconfig-common
2014-12-03 16:01:31 +01:00
Emmanuel Papin
b164f7953d
Create the directories in dbconfig folder
2014-12-03 15:40:13 +01:00
Emmanuel Papin
8a51a754aa
Install the sql files for dbconfig
2014-12-03 15:38:31 +01:00
Emmanuel Papin
9eb21bc3dd
Fix exit code in debian scripts and remove manual database deletion in postrm script
2014-12-03 14:12:26 +01:00
Emmanuel Papin
7cb62cd3a0
Set debug mode
2014-12-03 13:40:30 +01:00
Emmanuel Papin
99c4bce7e2
Merge branch 'master' of https://github.com/manupap1/ZoneMinder into new_debian8_folder_with_debconf
2014-12-02 01:01:47 +01:00
Emmanuel Papin
cc4324ef37
Work on the debconf integration
2014-12-02 00:58:18 +01:00
Isaac Connor
07695ce138
Merge pull request #605 from manupap1/new_debian8_folder
...
New debian folder for jessie release
2014-12-01 11:25:31 -05:00
Emmanuel Papin
df8b625228
Add files for debconf support
2014-11-30 17:55:26 +01:00
Emmanuel Papin
e0f8136b68
Remove warning insserv: warning: current start runlevel(s) of script 'zoneminder' overrides LSB defaults (empty).
2014-11-30 00:11:10 +01:00
Andrew Bauer
e4fa475d87
Merge pull request #588 from ZoneMinder/digest_auth
...
Digest auth
2014-11-29 08:32:08 -06:00
Emmanuel Papin
9a0e766e4c
Revert commits to fix source-is-missing errors (does not work as expected)
2014-11-29 02:08:21 +01:00
Emmanuel Papin
b8119a1e58
Files without sources shall be added in the debian/missing-sources folder
2014-11-29 01:48:38 +01:00
Emmanuel Papin
7ceec9979e
Fix remaining lintian errors by adding files with missing sources to debian/missing-sources
2014-11-29 01:31:25 +01:00
Emmanuel Papin
578dcef4b8
Do not attempt to remove database if no mysql instance (fix a piuparts error)
2014-11-28 21:36:11 +01:00
Emmanuel Papin
b0e3671f99
Fix a typo in debian/rules
2014-11-28 21:30:02 +01:00
Emmanuel Papin
2665eaeb88
First attempt to fix lintian warning debug-file-with-no-debug-symbols
2014-11-28 20:17:48 +01:00
Emmanuel Papin
ad474e81a6
Remove lintian warning "possibly-insecure-handling-of-tmp-files-in-maintainer-script"
...
This reverts commit 720f92a6bb
.
2014-11-28 19:37:42 +01:00
Emmanuel Papin
d318a6f2eb
Source init functions in init scrit (remove a lintian warning)
2014-11-28 19:33:36 +01:00
Emmanuel Papin
56234d7d2e
Provide a dummy init file to fix a lintian error
2014-11-28 19:16:30 +01:00
Emmanuel Papin
720f92a6bb
Delete remaining files and folders in postrm script
2014-11-28 18:32:36 +01:00
Emmanuel Papin
8a9ad93b81
Enable apache CGI module in postinst script (not enabled in debian 8 by default)
2014-11-28 18:07:09 +01:00
Emmanuel Papin
d8973d6cbd
Configure apache in postrm script (code taken from phpmyadmin)
2014-11-28 17:46:37 +01:00
Emmanuel Papin
bfb71952fd
Add missing argument in postint script
2014-11-28 17:14:07 +01:00
Emmanuel Papin
6628f29fdc
Configure apache in postinst script (code taken from phpmyadmin)
2014-11-28 16:45:05 +01:00
Emmanuel Papin
d60131925f
Fix a typo in debian/rules
2014-11-28 15:52:22 +01:00
Emmanuel Papin
5a36ab1923
Revert "Attempt to fix lintian error init.d-script-not-included-in-package"
...
This reverts commit c1e98707c4
.
2014-11-28 15:38:45 +01:00
Emmanuel Papin
b75bea3e16
Revert "Attempt to fix error init.d-script-not-included-in-packag"
...
This reverts commit c84f1b644b
.
2014-11-28 15:37:35 +01:00
Emmanuel Papin
c3a72892e6
Revert "Fist attempt to fix lintian error init.d-script-not-included-in-package"
...
This reverts commit f9ae34ae1d
.
2014-11-28 15:36:06 +01:00
Emmanuel Papin
f9ae34ae1d
Fist attempt to fix lintian error init.d-script-not-included-in-package
2014-11-27 23:31:40 +01:00
Emmanuel Papin
c84f1b644b
Attempt to fix error init.d-script-not-included-in-packag
2014-11-27 23:17:49 +01:00
Emmanuel Papin
c1e98707c4
Attempt to fix lintian error init.d-script-not-included-in-package
2014-11-27 22:40:29 +01:00
Emmanuel Papin
537d8b7994
Add instructions in override_dh_clean to delete remaining Makefiles
2014-11-27 21:24:20 +01:00
Emmanuel Papin
ecee33e9a3
Display the name of the tarball when generating it
2014-11-27 20:58:01 +01:00
Emmanuel Papin
4bf1be59cd
Use deb-systemd-invoke instead of systemctl in zoneminder.postinst
2014-11-27 20:21:56 +01:00
Emmanuel Papin
bf945cf6f3
Some lintian fixes in changelog and more information
2014-11-27 20:14:17 +01:00
Emmanuel Papin
aad3475bad
Revert "Add build dependency to build-essential and devscripts"
...
This reverts commit 41c14df2c9
.
2014-11-27 18:36:41 +01:00
Emmanuel Papin
6b6e44bf0e
Fix lintian warning description-synopsis-starts-with-article
2014-11-27 18:32:23 +01:00
Emmanuel Papin
b9b36d6e9d
Fix some lintian warning in control and postrm files
2014-11-27 18:27:59 +01:00
Emmanuel Papin
5e3476b301
Use systemctl to control zoneminder service in postinst script
2014-11-27 18:25:09 +01:00
Emmanuel Papin
3e7e3960f5
Rename an entry in changelog to fix a lintian warning
2014-11-27 17:47:14 +01:00
Emmanuel Papin
cb64a1fadd
No need to escape double quote in get-orig-source
2014-11-27 17:13:47 +01:00
Emmanuel Papin
cdf5dc6bf4
Fix error in get-orig-source if files contain spaces
2014-11-27 15:46:10 +01:00
Emmanuel Papin
716bf6113f
Some clean-up when generating orig tarball
2014-11-27 14:20:13 +01:00
Emmanuel Papin
41c14df2c9
Add build dependency to build-essential and devscripts
2014-11-27 14:01:37 +01:00
Emmanuel Papin
7df006ca9e
Add more information in debian/changelog
2014-11-27 12:16:08 +01:00
Emmanuel Papin
d16fd5e39e
Fix get-orig-source rule for debian packaging
2014-11-27 11:33:35 +01:00
Emmanuel Papin
0d30f5170b
Revert "Remove unneeded build dependency to quilt (a dpkg feature is used)"
...
This reverts commit 4411024420
.
2014-11-26 20:29:01 +01:00
Emmanuel Papin
74e3068f56
Add file README.source as recommanded by debian policy
2014-11-26 19:14:28 +01:00
Emmanuel Papin
3d2f3a8821
Delete remaining file src/zm_config_defines.h with override_dh_clean rule
2014-11-26 18:51:16 +01:00
Emmanuel Papin
236293b8a7
Add a rule to generate original source tarball from github
2014-11-26 18:37:22 +01:00
Emmanuel Papin
441fca34a6
Add more files to extend-diff-ignore
2014-11-26 18:34:07 +01:00
Emmanuel Papin
ed5e42aedc
Convert debian source package to version 3.0 (quilt)
2014-11-26 18:14:50 +01:00
Emmanuel Papin
4411024420
Remove unneeded build dependency to quilt (a dpkg feature is used)
2014-11-26 11:27:35 +01:00
Emmanuel Papin
d790f94ff8
Use dh_systemd to manage service and tmpfile
2014-11-26 10:59:36 +01:00
Emmanuel Papin
f048b5297d
Update changelog
2014-11-26 00:34:51 +01:00
Emmanuel Papin
da75cc4404
Fix file permissions for preinst file
2014-11-26 00:08:15 +01:00
Emmanuel Papin
68e5501004
Rename some debian files to allow building of multiple packages
2014-11-26 00:06:28 +01:00
Emmanuel Papin
6941a7df2e
Remove the deprecated sysVinit script
2014-11-25 23:56:29 +01:00
Emmanuel Papin
441c22ed53
Configure systemd to create the /var/run/zm directory at boot time on debian jessie
2014-11-25 23:51:57 +01:00
Emmanuel Papin
997ab779ac
Provide and install a zoneminder.service file to get zm running with systemd on debian jessie
2014-11-25 23:50:46 +01:00
Emmanuel Papin
be420e65c4
Fix a reference to the build directory in debian package by using dh_install
2014-11-25 23:28:35 +01:00
Emmanuel Papin
319fef80cf
Use dh_link instead of standard ln command
2014-11-25 23:01:06 +01:00
Emmanuel Papin
faac3ebe48
Use dh_auto_configure instead of standard configure and some cosmetic
2014-11-25 22:58:26 +01:00
Emmanuel Papin
c2ffe69533
Provide a patch to fix installation directory for man pages on debian
2014-11-25 22:55:01 +01:00
Emmanuel Papin
d493f97e34
Replace deprecated dpatch by quilt
2014-11-25 22:48:11 +01:00
Emmanuel Papin
5a7851a76b
Some cosmetic in debian/control
2014-11-25 22:37:04 +01:00
Emmanuel Papin
e9ca774290
Upgrade Standards-Version in debian/control (fix a warning on debian tracker)
2014-11-25 22:34:26 +01:00
Emmanuel Papin
81a625eb23
Upgrade debhelper version in debian/control
2014-11-25 22:25:55 +01:00
Emmanuel Papin
76000bac78
Add runtime dependency to libgcrypt
2014-11-25 22:20:57 +01:00
Emmanuel Papin
6ea81bb783
Remove dependency to alternative packages not available in debian jessie
2014-11-25 22:18:29 +01:00
Emmanuel Papin
45c2eca87f
Copy distros/debian folder to distros/debian8
2014-11-25 22:09:55 +01:00
Emmanuel Papin
f901e73dfd
libgcrypt20-dev added in Build-Depends
2014-11-25 11:10:12 +01:00
Emmanuel Papin
c287f76511
Remove unneeded dependency
2014-11-25 10:45:04 +01:00
Emmanuel Papin
61118142b9
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into debian_dep
2014-11-25 10:29:28 +01:00
Andrew Bauer
4ac699c167
Merge pull request #594 from ndobbs/feature-ndobbs_selinux_rhel6_support
...
updated local_zoneminder type extension file
2014-11-24 17:46:55 -06:00
Nate Dobbs
b81f87af69
updated local_zoneminder type extension file to support ZM running on CentOS/RHEL 6.x in SElinux ENFORCING mode
2014-11-24 17:36:47 -05:00
Andrew Bauer
4c353abecd
Update zoneminder.cmake.el6.spec
2014-11-24 15:41:09 -06:00
Andrew Bauer
7c75867300
Update zoneminder.cmake.f20.spec
2014-11-24 15:40:45 -06:00
Emmanuel Papin
fe5898c014
Deal with all libjpeg* libraries on debian
2014-11-24 22:22:57 +01:00
Isaac Connor
c55c9a716c
add libgnutls28-dev as an option to libgnutls-dev
...
add the other libjpeg*-dev options, any of which should do
2014-11-24 14:09:57 -05:00
Isaac Connor
f954d4b034
add a changelog entry
2014-11-20 11:07:58 -05:00
Isaac Connor
70c63bd394
Merge branch 'master' into storageareas
...
Conflicts:
db/zm_create.sql.in
distros/debian/control
distros/ubuntu1204/changelog
src/CMakeLists.txt
src/zm_config_defines.h
src/zm_monitor.h
2014-11-19 14:11:39 -05:00
Isaac Connor
4f9a2e1689
update Depends to match ubuntu.
2014-11-17 09:17:03 -05:00
Andrew Bauer
2dc73810db
Update rpm specfiles to make use of zmeditconfigdata.sh
2014-11-15 12:55:33 -06:00
Isaac Connor
582ac59963
update to same as ubuntu
2014-11-14 17:24:21 +01:00
Andrew Bauer
a520cc0653
Add ONVIF files to rpm spec files
2014-11-14 17:10:31 +01:00
Cosme Domínguez Díaz
972dedd15a
* distros/debian -> Autotools
...
* distros/debian_cmake -> CMake
2014-11-11 22:48:04 +01:00
Cosme Domínguez Díaz
96859e3b11
* Use CMake instead of Autotools.
...
* Some lintian love (minor fixes and cosmetic changes...)
* Don't remove database data if we are using a remote MySQL server.
2014-11-09 14:18:14 +01:00
Isaac Connor
60ea505139
add avdevice55 as a dependcy instead of 53, which we need for utopic
2014-10-31 14:11:34 -04:00
Isaac Connor
2f32c3895b
Merge branch 'release-1.28'
...
Conflicts:
web/skins/flat/js/skin.js
2014-10-22 15:10:19 -04:00
Isaac Connor
e23c756ca4
Revert "replace uri_encode with uri_escape"
...
This reverts commit ce5396f4ea
.
2014-10-21 15:17:34 -04:00
Isaac Connor
ce5396f4ea
replace uri_encode with uri_escape
2014-10-21 09:47:31 -04:00
Isaac Connor
693c4b2e68
Merge branch 'release-1.28'
2014-10-20 16:45:59 -04:00
Isaac Connor
c4394c3c92
add liburi-encode-perl to dependencies, we use it in M8640, will likely use it elsewhere
2014-10-20 16:45:15 -04:00
Andrew Bauer
408bbbd535
Merge branch 'release-1.28'
2014-10-19 07:44:27 -05:00
Andrew Bauer
fcf39fc9fa
Update zoneminder.cmake.f20.spec
...
Fix path to README file
2014-10-18 17:36:12 -05:00
Isaac Connor
4fd2230b1d
add release 1.28.0
2014-10-17 09:27:54 -04:00
Isaac Connor
61ebb56424
add 1.28.0 release
2014-10-17 09:26:59 -04:00
Isaac Connor
525d4110da
bump snapshot #
2014-10-15 13:14:36 -04:00
Andrew Bauer
7dbad45e30
Update README.Fedora
2014-10-12 15:54:54 -05:00
Andrew Bauer
f8cf0401ce
fedora specfile changes
2014-10-05 10:27:50 -05:00
Andrew Bauer
6aac41b06f
Redhat and Fedora distro folder housekeeping
2014-10-05 09:54:29 -05:00
Andrew Bauer
56fd08d6e9
Change TMPDIR default to /var/tmp, Add ZM_SOCKDIR
2014-10-05 09:42:47 -05:00
Isaac Connor
fa44376291
Todays snapshot
2014-09-26 14:45:23 -04:00
Isaac Connor
af536624ce
add libmime-tools-perl which provides MIME::Entity which is required for email sending
2014-09-26 09:10:26 -04:00
Jan M. Hochstein
f1b2ba091c
Update meta makefiles
2014-09-12 16:06:19 +02:00
Andrew Bauer
cccd1ee14f
Update README.CentOS
...
Change README documentation to recommend disabling selinux
2014-09-11 10:53:11 -05:00
Isaac Connor
b8acac5c32
add polkit stuff required by systemd patch
2014-09-07 17:16:35 -04:00
Isaac Connor
60d7f8285c
requirements to build on debian
2014-09-05 12:23:38 -04:00
Isaac Connor
b5c29f30f4
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2014-09-05 11:48:44 -04:00
Isaac Connor
576aca029e
sync with ubuntu version
2014-09-05 11:47:20 -04:00
Kyle Johnson
4d579e239a
Merge pull request #502 from knnniggett/systemd-2
...
Initial systemd support.
2014-09-03 15:59:42 -04:00
Andrew Bauer
19646bd004
Merge pull request #501 from PX03AFK/opensuse
...
Minor corrections to README.OpenSuse
2014-08-27 06:58:04 -05:00
Isaac Connor
5bc7242582
spaces vs tabs are important in rules, debian is more picky than ubuntu
...
fix placement of an if to prevent accessing unmapped mem_ptr
2014-08-19 09:11:49 -04:00
Andrew Bauer
1e8e710f5a
full systemd support
2014-08-10 08:47:11 -05:00
David Wilcox
bde7fc8476
Minor corrections to README.OpenSuse
...
A few typos and a correction to a web link
2014-08-07 15:31:13 +01:00
Cosme Domínguez Díaz
786f6518fa
Allow use webservers other than apache.
2014-08-04 00:23:47 +02:00
Andrew Bauer
cd35eb52d8
Add ONVIF files to rpm spec files
2014-08-03 10:48:56 -05:00
Isaac Connor
f0437c6ce4
sync to ubuntu version
2014-08-01 13:53:59 -04:00
Isaac Connor
f48f2dbf30
update to same as ubuntu
2014-08-01 13:28:04 -04:00
Isaac Connor
2087780ec1
tweaks to make debian build with support for mariadb, update version and start using a fourth version digit set
2014-07-29 14:43:13 -04:00
Isaac Connor
b2f1c2fe68
Merge branch 'v4l_to_monitor'
2014-07-24 14:35:23 -04:00
Isaac Connor
6d2be734d2
add mariadb as a dependency option
2014-07-24 11:24:57 -04:00
Isaac Connor
864f68197d
change mysql-server to Recommends
2014-07-15 14:06:32 -04:00
Isaac Connor
9385471392
move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera
2014-07-13 16:39:27 -04:00
Isaac Connor
f33b127e7e
add curl dependencies
2014-07-11 10:51:12 -04:00
whopperg
4a070f93bb
Update rules
...
There was a missing tab-indent. So dpkg-buildpackage under debian didnt work:
Error:
debian/rules:77: *** missing separator. Stop.
2014-07-06 11:48:41 +02:00
Isaac Connor
e2987067f4
add avtools instead of ffmpg
2014-06-26 13:09:52 -04:00
Isaac Connor
0f4e9eb3e4
add these dependencies, apparently they are required for sftp upload
2014-06-17 10:54:42 -04:00
Isaac Connor
a73e367d5e
add libav-tools as an option instead of ffmpeg
2014-06-04 11:21:43 -04:00
Kfir Itzhak
7aef6e9389
Merge pull request #387 from PX03AFK/patch-4
...
Update zoneminder.cmake.OS13.spec - minor corrections
2014-04-25 11:06:35 +03:00
Kfir Itzhak
c64b1318db
Merge pull request #389 from PX03AFK/patch-6
...
Update README.OpenSuse
2014-04-25 11:05:37 +03:00
David Wilcox
ca2b6f36f5
Update README.OpenSuse
...
Additional info on amending database if using version which has /tmp as work space
2014-04-17 15:44:44 -04:00
David Wilcox
103dc0c00d
Update CMakeLists.txt
...
Adds named variables to ease change in the future
2014-04-17 15:42:37 -04:00
David Wilcox
ee7fe5bfaa
Update zoneminder.cmake.OS13.spec
...
Correct requires for cpanm and make as they should be post
change cpanm call to be full path name
correct permissions on events, images and temp
2014-04-17 15:41:04 -04:00
David Wilcox
5cd165e9d5
Update zoneminder.tmpfiles
...
Incorrect directory
2014-04-03 22:16:38 -04:00
Isaac Connor
3212974bdf
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2014-03-28 10:12:39 -04:00
Andrew Bauer
dda1034927
Merge pull request #362 from PX03AFK/patch-2
...
Update zoneminder.cmake.OS13.spec
2014-03-27 17:58:27 -05:00
David Wilcox
c4645de0e6
Update zoneminder.cmake.OS13.spec
2014-03-26 23:06:42 -04:00
David Wilcox
a7a5f5d543
Update README.OpenSuse
2014-03-26 23:05:20 -04:00
Isaac Connor
ffa952419c
Merge branch 'mysql2PDO'
...
Conflicts:
distros/ubuntu1204/changelog
scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm
web/includes/actions.php
2014-03-20 16:48:03 -04:00
Andrew Bauer
e0f8583110
Merge pull request #348 from PX03AFK/opensuse
...
Initial upload for opensuse rpm
2014-03-19 12:09:53 -05:00
root
43b259c5cd
Initial upload for opensuse rpm
2014-03-18 23:31:58 -04:00
Kyle Johnson
75d390d70a
Merge branch 'release-1.27'
2014-03-15 00:51:13 -04:00
Andrew Bauer
f8f0ec57dc
further refinement of build requirements
2014-03-14 06:56:05 -05:00
Andrew Bauer
9f616c0d2b
Make httpd both an install and build requirement
2014-03-12 06:58:53 -05:00
Andrew Bauer
f9fab8d487
Need to make httpd a build requirement for cmake builds so the apache user can be properly auto-detected
2014-03-11 20:38:51 -05:00
Andrew Bauer
a5d1f2afb7
Create a hardened build per Fedora packaging guidelines
2014-03-11 19:01:32 -05:00
Andrew Bauer
16c59f7cb0
Update README.Fedora
...
typo
2014-03-08 14:04:40 -06:00
Andrew Bauer
bc4630fddc
Update local_zoneminder.te
...
Changes based on forum feedback
2014-02-22 15:39:10 -06:00
Andrew Bauer
4f2b09a36d
remove noreplace flag on zm.conf in spec file
2014-02-01 19:30:23 -06:00
Andrew Bauer
d87682e5aa
Edit vlc requirements in spec files
2014-02-01 17:49:04 -06:00
Andrew Bauer
647cf5b180
update Fedora & CentOS README's
2014-02-01 16:39:33 -06:00
Andrew Bauer
4088f9bc00
Add libcurl requirement to rpm spec files
2014-02-01 15:01:36 -06:00
Andrew Bauer
22b54dd046
Bump spec files revision to 1.27
2014-02-01 12:24:30 -06:00
Andrew Bauer
23144606dc
Merge pull request #318 from ZoneMinder/zmcamtool
...
zmcamtool.pl - import and export ptz camera controls & camera presets
2014-01-29 07:34:40 -08:00
Andrew Bauer
52794e4dad
Add vlc-devel to rpm build requirements
2014-01-26 14:02:06 -06:00
Andrew Bauer
f00e72be1e
Initial commit for new zmcamtool.pl script
2014-01-21 16:22:30 -06:00
Kyle Johnson
6534aa546c
Fixed readme.debian fstab bind examples
...
After receiving a bug report that the examples did not work, I tried them myself. They did not work, so I updated them to something that does work.
2014-01-02 08:24:58 -05:00
Andrew Bauer
ab06878b7b
Update zoneminder.cmake.f19.spec
...
Add BuildRequires perl(Sys::Syslog) to successfully build with mock
2014-01-01 15:03:12 -06:00
Dmitry Katsubo
e745bbf14e
No need to redefine RUNDIR and ZM_RUNDIR, as they already depend on DESTDIR.
2013-12-30 15:32:06 +01:00
Dmitry Katsubo
7bf0bcf4ef
Updated package version (otherwise build process stops).
2013-12-30 15:31:50 +01:00
Andrew Bauer
dbd2ee348e
define variables to toggle x10 & ffmpeg support
2013-12-23 19:41:00 -06:00
Andrew Bauer
c4d22672ac
Specfile changes related to zmfix
2013-12-23 17:06:31 -06:00
nkwood
f4d6d99ab2
Update zoneminder.f19.spec
2013-12-23 15:09:12 -06:00
nkwood
4a89c8d5e9
Update zoneminder.el6.spec
2013-12-23 15:08:19 -06:00
nkwood
f12dd88e5d
Update zoneminder.cmake.f19.spec
2013-12-23 15:06:38 -06:00
nkwood
8e7d89024f
Update zoneminder.cmake.el6.spec
2013-12-23 15:05:11 -06:00
nkwood
942b9c65da
Update init.d
2013-12-23 15:01:21 -06:00
nkwood
922385d761
Update init.d
2013-12-23 14:55:56 -06:00
Andrew Bauer
45385526d7
Update README.CentOS
...
Future versions of zmupdate will requite the Lock Tables permission. Documentation updated accordingly.
2013-12-21 09:45:40 -06:00
Andrew Bauer
db2398d1ba
Update README.Fedora
...
Future versions of zmupdate will requite the Lock Tables permission. Documentation updated accordingly.
2013-12-21 09:45:21 -06:00
Isaac Connor
7064141161
check for mysql existence first.
2013-12-17 13:13:45 -05:00
Andrew Bauer
43b8990d73
Update zoneminder.el6.spec
...
Bump revision and changelog
2013-12-16 14:46:28 -06:00
Andrew Bauer
2ca23bf07a
Update zoneminder.cmake.el6.spec
...
Bump revision and changelog
2013-12-16 14:45:50 -06:00
Andrew Bauer
0f14db811d
Update zoneminder.f19.spec
...
Bump revision and changelog
2013-12-16 14:45:11 -06:00
Andrew Bauer
3ce3df8645
Update zoneminder.cmake.f19.spec
...
Bump revision and changelog
2013-12-16 14:44:22 -06:00
Andrew Bauer
570606f01f
Update zoneminder.cmake.f19.spec
...
Bugfix. Perl path had x86_64 hardcoded. Use macro instead.
2013-12-16 14:43:33 -06:00
Andrew Bauer
49e4d1089a
Update zoneminder.cmake.el6.spec
...
Bugfix. Perl path was hardcoded to x86_64. Use macro instead.
2013-12-16 14:42:22 -06:00
Isaac Connor
433370c9e3
Merge branch 'master' into storageareas
...
Conflicts:
distros/ubuntu1204/changelog
src/zm_monitor.h
2013-12-15 15:16:14 -05:00
Andrew Bauer
8d2dac67b3
Update zoneminder.in
2013-12-14 09:14:44 -06:00
Isaac Connor
73dbe81064
update to 1.26.5
2013-12-13 13:45:55 -05:00
Isaac Connor
969eed5ce7
add libapache2-mod-fcgid as an option instead of libapache2-mod-php5
...
add config to use it instead of modphp5
2013-12-10 13:57:22 -05:00
Andrew Bauer
d0debfa450
Update zoneminder.in
...
The freshen database feature does not appear to be necessary and may even corrupt the dB under certain conditions. Commenting out.
2013-11-26 15:21:28 -06:00
Isaac Connor
4555a8bf92
Merge pull request #240 from ZoneMinder/postinstcleanup
...
remove extra stuff that I don't think we need because we are the source.
2013-11-19 08:29:51 -08:00
Isaac Connor
c840f1b622
suggest mysql-server
2013-11-08 12:08:06 -05:00
Isaac Connor
6d6503c006
suggest mysql-server
2013-11-08 12:07:45 -05:00
Isaac Connor
2cd0d0b405
repeat the dbh package lines for debian as well
2013-11-08 11:25:06 -05:00
Isaac Connor
463d8a136f
Merge branch 'master' into mysql2PDO
...
Conflicts:
zm.conf.in
2013-11-08 11:22:09 -05:00
Isaac Connor
e9c0509399
add rules for a dbg package
2013-11-08 11:09:23 -05:00
Will Scales
82a3f4622f
Update zoneminder.service
...
Added "After=" rule to [unit] section to prevent Zoneminder from starting before mysqld.
2013-11-06 06:30:43 -06:00
Isaac Connor
a1cb1e6de2
bump version # for snapshot
2013-11-04 09:56:20 -05:00
Isaac Connor
6c6da67427
Merge branch 'master' into mysql2PDO
2013-11-03 15:57:45 -05:00
Isaac Connor
7b585d182a
remove extra stuff that I don't think we need because we are the source.
...
Also unconditionally call zmupdate.pl since it should do all the checking of versions to see if anything needs doing.
We don't need to be doing that work in a postinst bash script.
2013-11-03 15:49:37 -05:00
Kfir Itzhak
a341778ca2
Merge branch 'cmakefixes'
...
Conflicts:
distros/fedora/zoneminder.cmake.f19.spec
distros/redhat/zoneminder.cmake.el6.spec
2013-10-21 16:58:04 +03:00
Andrew Bauer
c25a7ffc99
Update zoneminder.cmake.f19.spec
...
We need to strip the prefix from perl_vendorlib before passing it to cmake
2013-10-20 12:59:31 -05:00
Andrew Bauer
183ce4b422
Update zoneminder.cmake.el6.spec
...
We need to strip the prefix from perl_vendorlib macro before passing it to cmake.
2013-10-20 12:44:09 -05:00
Kfir Itzhak
cdd2920767
Merge pull request #217 from knnniggett/cmake_redhat
...
cmake support files for redhat/centos distros
2013-10-19 13:03:16 -07:00
Andrew Bauer
d544a92ccb
change chkconfig default
2013-10-19 13:54:25 -05:00
Andrew Bauer
60962566a5
cmake support files for redhat/centos distros
2013-10-19 13:50:59 -05:00
Andrew Bauer
72973ff7e7
Add new zoneminder cmake specfile
2013-10-19 12:14:43 -05:00
Andy Bauer
b1c76ad0b6
Cmake support files for fedora distro
2013-10-19 08:49:47 -05:00
Isaac Connor
92d22b5202
Merge branch 'master' into mysql2PDO
2013-10-16 16:58:33 -04:00
Isaac Connor
9e2d7cfd24
initial convert to PDO with no testing
2013-10-16 16:07:58 -04:00
Andrew Bauer
62dbb6e5fb
Update README.Fedora
...
typo
2013-10-14 06:47:29 -05:00
Andy Bauer
32cf3663f3
Update README.Fedora
...
add "sudo"
2013-10-13 08:22:16 -05:00
Andy Bauer
a3dc2b50d3
Update README.CentOS
2013-10-11 06:47:32 -05:00
Andy Bauer
b7e69f0104
Update zoneminder.cmake.f19.spec
...
Remove noreplace %config flag from zm.conf. We want upgrades to overwrite this file.
2013-10-10 13:30:38 -05:00
Andy Bauer
e16c2502d6
Update zoneminder.f19.spec
2013-10-10 13:29:46 -05:00
Andy Bauer
1e756a1529
Update zoneminder.cmake.el6.spec
...
Remove noreplace %config flag from zm.conf. We want upgrades to overwrite this file.
2013-10-10 13:29:15 -05:00
Andy Bauer
8f512729f3
Update zoneminder.el6.spec
...
Remove noreplace %config flag from zm.conf. We want upgrades to overwrite this file.
2013-10-10 13:28:42 -05:00
Andy Bauer
6f313ad866
Update zoneminder.f19.spec
...
fix typo
2013-10-10 06:32:45 -05:00
Andy Bauer
4218ef0113
Update README.Fedora
2013-10-09 18:37:48 -05:00
Andy Bauer
78effbab45
Update README.Fedora
2013-10-09 18:36:59 -05:00
Andy Bauer
33f7673656
Update README.Fedora
2013-10-09 18:35:39 -05:00