Commit Graph

569 Commits

Author SHA1 Message Date
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 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
Emmanuel Papin 520e0d8664 Add missing dependencies to Build-Depends for debian package building 2015-07-21 17:02:52 +02:00
Emmanuel Papin 9ee7d67056 Include openalpr plugin 2015-07-21 16:53:32 +02:00
Emmanuel Papin b294569147 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support
Merging conflicts fixed in files:
	CMakeLists.txt
	configure.ac
	distros/debian_cmake/control
	src/zm_monitor.h
	web/lang/de_de.php
	web/skins/classic/views/monitor.php
2015-07-20 16:49:04 +02: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
Emmanuel Papin 7e8648d563 Add missing lines in distros/debian8_cmake/rules 2015-06-04 21:39:56 +02:00
Emmanuel Papin 5492fd9e93 Fix conflict during package installation 2015-06-03 20:10:02 +02:00
Emmanuel Papin a8524d9b3b Add debian8_cmake folder 2015-06-02 22:58:49 +02:00
Emmanuel Papin 3f20a08d16 Add cmake support 2015-05-31 02:37:58 +02:00
Emmanuel Papin 872fead1fa Rename zoneminder library 2015-05-30 14:11:42 +02:00
Emmanuel Papin 33f7342cec Enable plugin support on legacy debian folder and add a missing conditional build in zm_monitor.cpp 2015-05-30 00:30:35 +02:00
Emmanuel Papin 746deece73 Rename some files, remove links to unused libraries on binaries and some cleanup 2015-05-29 22:26:11 +02:00
Emmanuel Papin eff56664c3 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support
Conflicts:
	web/lang/de_de.php
	web/skins/classic/views/monitor.php
	web/skins/classic/views/plugin.php
2015-05-28 23:43:13 +02: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
Emmanuel Papin 7766ec4c72 Rename debian dev package 2015-05-14 14:10:46 +02:00
Emmanuel Papin 6b2c435460 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support_list
Conflicts:
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
2015-05-14 11:12:38 +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
Emmanuel Papin 6a8eb03f0a Do not delete newly added file 2015-05-06 22:03:58 +02:00
Emmanuel Papin 630c8f335f Merge master 2015-05-05 23:37:20 +02: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
Emmanuel Papin 0988eaeb06 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support 2015-03-07 14:44:05 +01: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
Emmanuel Papin 9929233e75 Merge branch 'master' into plugin_support_test
Conflicts:
	configure.ac
	web/lang/fr_fr.php
2015-02-25 23:14:25 +01: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
Emmanuel Papin 5060fc490f Merge branch 'master' into plugin_support_test 2015-02-15 15:03:23 +01: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 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