Isaac Connor
|
7756d5067c
|
the changelog entries are irrelevant, so don't keep them. Package scripts will generate their contents
|
2017-05-23 14:46:54 -04:00 |
|
Isaac Connor
|
f6950ab6fe
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-05-15 12:51:22 -04:00 |
|
Isaac Connor
|
fc52766606
|
Merge branch 'master' into storageareas
|
2017-05-08 22:17:37 -04:00 |
|
Isaac Connor
|
ff368f2b6f
|
add php-apc and apcu
|
2017-05-08 21:35:49 -04:00 |
|
Isaac Connor
|
25baac4e24
|
Merge branch 'release-1.30.3'
|
2017-05-08 21:32:59 -04:00 |
|
Isaac Connor
|
a7b377bf35
|
delete merge conflict files
|
2017-05-08 21:30:31 -04:00 |
|
Isaac Connor
|
c510092356
|
delete merge conflict files
|
2017-05-08 21:30:28 -04:00 |
|
Isaac Connor
|
7b81f0464b
|
Due to switch to apc for caching in api, don't need the tmp dirs
|
2017-05-05 09:45:36 -04:00 |
|
Isaac Connor
|
bccddcad88
|
Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder
|
2017-05-05 09:42:24 -04:00 |
|
Isaac Connor
|
cccc3df700
|
Merge branch 'master' into storageareas
|
2017-05-03 16:43:44 -04:00 |
|
Isaac Connor
|
6b4c808c29
|
fix typo
|
2017-05-03 09:19:36 -04:00 |
|
Isaac Connor
|
219402c3d9
|
require php5-acpu
|
2017-05-03 09:04:55 -04:00 |
|
Isaac Connor
|
48d9167c5d
|
Don't apply patches.
|
2017-04-27 12:05:47 -04:00 |
|
Isaac Connor
|
2b0561b481
|
delete the old merge files
|
2017-04-27 12:05:13 -04:00 |
|
Isaac Connor
|
273229858f
|
Merge branch 'master' into storageareas
|
2017-04-16 11:26:18 -04:00 |
|
Isaac Connor
|
3b2d708a16
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-04-16 11:24:51 -04:00 |
|
Isaac Connor
|
d039227f79
|
Merge branch 'master' into storageareas
|
2017-04-12 13:51:10 -04:00 |
|
Isaac Connor
|
6e7bd9311d
|
add the api tmp cache folders to the tmpfiles
|
2017-04-12 13:41:02 -04:00 |
|
Isaac Connor
|
adbb5f431d
|
fix version of x264
|
2017-03-11 11:00:46 -05:00 |
Isaac Connor
|
e04cc1be05
|
add mp4 and x264 to ubuntu1204 and remove duplicated mp4.x264 lines from ubuntu1604.
|
2017-03-11 10:41:39 -05:00 |
|
Isaac Connor
|
fdcb93eacc
|
Merge branch 'master' into storageareas
|
2017-03-06 16:22:28 -05:00 |
Andy Bauer
|
5ea9f695de
|
Merge branch 'master' into travis_test1
|
2017-03-05 13:02:59 -06:00 |
|
Andy Bauer
|
ca71ee8e71
|
remove rules.new
|
2017-03-05 12:40:27 -06:00 |
|
Andy Bauer
|
4fe70f0e7d
|
recreate patch
|
2017-03-05 12:39:03 -06:00 |
|
Andy Bauer
|
c6fc6cb0ca
|
change patch method
|
2017-03-05 11:46:45 -06:00 |
|
Andy Bauer
|
f66408b998
|
update the path to zm.conf
|
2017-03-05 10:50:09 -06:00 |
|
Andy Bauer
|
cfeb12fc73
|
fix permissions on zm.conf in deb pkg scripts
|
2017-03-05 10:37:44 -06:00 |
|
Isaac Connor
|
5ae34a7561
|
Merge branch 'master' into storageareas
|
2017-01-02 09:39:10 -05:00 |
klemens
|
0d549f1db3
|
spelling fixes
|
2016-12-29 10:31:05 +01:00 |
Isaac Connor
|
e8da04df56
|
Merge branch 'apache_indexes' into storageareas
|
2016-11-22 13:09:44 -05:00 |
|
Isaac Connor
|
6361f14387
|
Rremove Index from options to prevent directory listings
|
2016-11-08 09:30:24 -05: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
|
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 |
|
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 |
Isaac Connor
|
b3fd156c11
|
add boost to build depends
|
2016-05-25 20:01:42 -04:00 |
|
Isaac Connor
|
b36694ad8b
|
Merge branch 'master' into storageareas
|
2016-08-12 10:04:52 -04:00 |
|
Isaac Connor
|
2451768295
|
Merge branch 'master' into storageareas
|
2016-08-08 18:08:46 -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
|
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 |
|
Isaac Connor
|
d06a0cf2a4
|
2016042801 build
|
2016-04-28 12:58:09 -04:00 |
|
Isaac Connor
|
02a56b811b
|
Don't be recursive when chowning /var/cache/zoneminder
|
2016-04-20 14:38:51 -04: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
|
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
|
cf76360ecb
|
bring up to date with the one in debian
|
2016-04-06 13:03:24 -04:00 |
|
Isaac Connor
|
3e5a4b6481
|
remove autotools builds, replace them with cmake versions
|
2016-04-06 08:43:20 -04:00 |
|
Isaac Connor
|
b81395843c
|
fix spacing in control file
|
2016-03-30 10:56:10 -04:00 |
|
Isaac Connor
|
f8582ad9b6
|
add libsys-cpu-perl and libsys-meminfo-perl
|
2016-03-08 15:56:26 -05:00 |
|
Isaac Connor
|
4f4e65f86c
|
split into multiple lines and add onvif deps
|
2016-03-03 09:00:08 -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
|
e37cf0e218
|
append /www to docroot for all debian/ubuntu dists
|
2015-10-23 16:08:32 -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
|
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 |
|
Isaac Connor
|
7a08127d21
|
release snapshot 2015071501
|
2015-07-15 12:02:20 -04: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 |
|
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 |
|
Isaac Connor
|
51bd39c7f6
|
already done in master
|
2015-01-03 13:59:54 -05: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 |
|
Isaac Connor
|
f954d4b034
|
add a changelog entry
|
2014-11-20 11:07:58 -05: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
|
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
|
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 |
|
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 |
|
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 |
|
Isaac Connor
|
b8acac5c32
|
add polkit stuff required by systemd patch
|
2014-09-07 17:16:35 -04: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 |
|
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 |
|
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 |
|
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 |
nkwood
|
942b9c65da
|
Update init.d
|
2013-12-23 15:01:21 -06:00 |
|
Isaac Connor
|
7064141161
|
check for mysql existence first.
|
2013-12-17 13:13:45 -05:00 |