Commit Graph

129 Commits

Author SHA1 Message Date
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 d070b36aec Merge branch 'master' of https://github.com/manupap1/ZoneMinder into plugin_support 2014-12-31 12:23:26 +01: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 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 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
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
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 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