Commit Graph

74 Commits

Author SHA1 Message Date
Isaac Connor 2b4bad86cb Merge branch 'master' into storageareas 2016-09-13 10:21:10 -04:00
Isaac Connor 3dfe1185ff add ffmpeg as option to libav-tols 2016-09-13 10:11:50 -04:00
Isaac Connor b36694ad8b Merge branch 'master' into storageareas 2016-08-12 10:04:52 -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 6b70ff964b fix path in cake api cleanup rules 2016-08-10 09:06:15 -04:00
Isaac Connor b8c406f969 Merge branch 'master' into storageareas 2016-06-03 09:32:55 -04:00
Disassembler 8eee25795a Remove deprecated register_globals from Apache/PHP configs 2016-05-30 14:02:46 +02: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 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 3f27f4893c Merge branch 'fix_grant' into storageareas 2016-04-15 12:55:13 -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 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 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 3e5a4b6481 remove autotools builds, replace them with cmake versions 2016-04-06 08:43:20 -04:00
Isaac Connor 60642c1fff Merge branch 'iconnor_video' into storageareas 2016-04-05 12:32:33 -04:00
Isaac Connor 0f1a530891 ciontrol files need spaces on multi-line lines 2016-04-05 09:03:37 -04:00
Isaac Connor 9647a680f6 Merge branch 'add_onvif_deps' into storageareas 2016-03-08 16:06:30 -05:00
Isaac Connor cfbf2cced1 add libsys-cpu-perl and libsys-meminfo-perl 2016-03-08 15:55:29 -05:00
Isaac Connor 98b3b92bbf Merge branch 'add_onvif_deps' into storageareas 2016-03-07 21:54:25 -05:00
Isaac Connor 61ffae79d1 split into multiple lines and add onvif deps 2016-03-03 08:58:53 -05:00
Isaac Connor b2b1afa8ad Merge master 2015-12-14 15:49:32 -05:00
Isaac Connor 16274e46bc grant create,index to zmuser when updating 2015-11-09 12:36:26 -05:00
Isaac Connor 6b994132f1 grant create,index to zmuser when updating 2015-11-09 12:34:11 -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
Emmanuel Papin 0de7217317 Remove no longer needed patch because applied to master 2015-01-03 14:13:41 +01: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 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 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 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
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 2f32c3895b Merge branch 'release-1.28'
Conflicts:
	web/skins/flat/js/skin.js
2014-10-22 15:10:19 -04:00
Isaac Connor 4fd2230b1d add release 1.28.0 2014-10-17 09:27:54 -04:00