Commit Graph

415 Commits

Author SHA1 Message Date
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 4bbf1439bb Update debian changelog file 2015-01-27 19:24:50 +01:00
Emmanuel Papin cd16b7168e Merge branch 'master' into plugin_support
Conflicts:
	distros/debian8/changelog
2015-01-27 19:22:06 +01: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 ce90a37bb8 Merge branch 'debian_package_split' into plugin_support
Conflicts:
	distros/debian8/patches/series
2015-01-13 01:11:04 +01: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 39e6de8f68 Fix conflict when merging from master 2015-01-04 12:29:20 +01:00
Emmanuel Papin f551b50ec0 Merge branch 'master' of https://github.com/manupap1/ZoneMinder into plugin_support
Conflicts:
	distros/debian8/patches/01_vendor-perl.diff
	distros/debian8/patches/series
2015-01-04 12:23:29 +01:00
Emmanuel Papin 0de7217317 Remove no longer needed patch because applied to master 2015-01-03 14:13:41 +01:00
Emmanuel Papin 7fc359e940 Merge branch 'master' of https://github.com/manupap1/ZoneMinder into plugin_support 2015-01-03 13:46: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
Emmanuel Papin d070b36aec Merge branch 'master' of https://github.com/manupap1/ZoneMinder into plugin_support 2014-12-31 12:23:26 +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 a9986d6aa0 Merge branch 'debian_package_split' into plugin_support 2014-12-28 11:09:42 +01: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 7c3ddece88 Remove some remaining files auto-generated by libtool in rules file 2014-12-21 18:50:04 +01:00
Emmanuel Papin bc89082548 Refresh a patch in the debian directory 2014-12-21 18:23:51 +01:00
Emmanuel Papin d2b1bfae13 Fix conflict when merging debian_package_split 2014-12-21 17:04:46 +01:00
Emmanuel Papin db61f93c35 Merge branch 'debian_package_split' into plugin_support_test
Conflicts:
	distros/debian8/control
2014-12-21 16:56:10 +01:00
Emmanuel Papin cb3b8a901e Merge branch 'master' into plugin_support_test
Conflicts:
	distros/debian/control
	web/skins/classic/views/js/Makefile.am
2014-12-21 16:49:25 +01: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 b4f35c20f1 Fix a conflict when merging plugin_support 2014-12-13 22:06:30 +01:00
Emmanuel Papin f339518787 Merge branch plugin_support 2014-12-13 22:05:11 +01:00
Emmanuel Papin bff7fc1e2e Enable build of plugin support and dev package in debian8 folder 2014-12-13 21:58:17 +01:00
Emmanuel Papin f1ce69a8c1 Update version in changelog for plugin support 2014-12-13 21:49:08 +01:00
Emmanuel Papin d961831355 Fix conflict when merging upstream master 2014-12-13 19:54:54 +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 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