Commit Graph

731 Commits

Author SHA1 Message Date
Isaac Connor a2ae29dfbe Add php5-gd to depends 2016-02-08 09:47:52 -05:00
Dmitry Smirnov 5bcc414038 codespell: misc. spelling corrections
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-08 20:41:36 +11:00
Isaac Connor 0674fa2d7a Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-02-04 12:21:33 -05:00
Isaac Connor 89cff287cd Merge branch 'master' into storageareas 2016-02-04 12:14:16 -05:00
SteveGilvarry e76d5ad1cb Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-02-04 07:33:40 +11:00
Andy Bauer 5a8989b168 Minor RPM packaging changes 2016-02-02 11:47:55 -06:00
Isaac Connor 48283191ec Merge branch 'master' into storageareas 2016-02-01 15:47:08 -05:00
Isaac Connor f46b10d399 bump release 2016-02-01 15:46:45 -05:00
SteveGilvarry 7301e803ed Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
2016-01-30 15:45:08 +11:00
Andrew Bauer a990b23164 Update zoneminder.f22.spec 2016-01-29 21:25:34 -06:00
Andrew Bauer fa50327420 Update zoneminder.f23.spec 2016-01-29 21:24:50 -06:00
Isaac Connor ebbecd5cc4 add php5-gd to depends. We use it for image scaling 2016-01-14 13:41:09 -05:00
Isaac Connor 818cd614eb Merge branch 'multi-server' into storageareas 2016-01-08 10:17:37 -05:00
Isaac Connor 5ce26ac4df Change logrotate defaults to daily/rotate 7, which works better with logcheck 2016-01-08 09:59:03 -05:00
Isaac Connor 3066f66f25 add sphinx-rtd-theme 2016-01-05 13:21:54 -05:00
Isaac Connor 5c3c8b68a3 Add sphinx rtd theme as a dependency 2016-01-05 09:40:31 -05:00
Isaac Connor 1918b9b576 bump 2016-01-04 14:44:36 -05:00
Isaac Connor b1205bcaa9 Merge branch 'multi-server' into storageareas
Conflicts:
	CMakeLists.txt
	configure.ac
	scripts/zmaudit.pl.in
	version
2016-01-02 14:45:24 -05:00
Andy Bauer a93f78b7e6 Bump rpm specfiles to 1.29.0 2016-01-02 10:35:52 -06:00
Isaac Connor 1da87332b7 blah 2016-01-01 21:22:12 -05:00
Isaac Connor 93dbc3f0c1 Merge multi-server updates and bump version 2016-01-01 16:31:02 -05:00
Andrew Bauer d5ec34889e Merge pull request #1211 from SteveGilvarry/multiserver-docs
Adding multiserver documentation
2016-01-01 09:01:31 -06:00
Isaac Connor f38f216f59 Merge branch 'master' into storageareas 2015-12-29 14:59:44 -05:00
Isaac Connor 13689d7a7d Merge branch 'storageareas' into newpointone
Conflicts:
	web/lang/en_gb.php
	web/skins/classic/views/filter.php
2015-12-28 13:13:49 -05:00
Isaac Connor 63352ac7c9 changelog update 2015-12-28 13:10:27 -05:00
Andrew Bauer e6e8a75b64 Update zoneminder.f23.spec 2015-12-27 11:48:53 -06:00
Isaac Connor 33a3661958 cleanup, revent to openprint style objects 2015-12-23 14:03:40 -05:00
Isaac Connor 769b1f713c Merge branch 'multi-server' into storageareas
Conflicts:
	distros/ubuntu1204/apache.conf
2015-12-23 13:13:25 -05:00
SteveGilvarry 1ff2043774 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2015-12-23 19:24:08 +11:00
Isaac Connor 962d74f6a7 blah 2015-12-22 11:38:36 -05:00
Isaac Connor eccfced6d4 Merge branch 'multi-server' into newpointone
Conflicts:
	distros/ubuntu1204/apache.conf
2015-12-22 09:54:13 -05:00
Isaac Connor 64f1475058 blah 2015-12-22 09:47:35 -05:00
Isaac Connor b33c0764fe update to new cgi-bin path 2015-12-21 12:59:52 -05:00
Isaac Connor dfd7986c01 Merge branch 'master' into multi-server
Conflicts:
	distros/debian_cmake/links
	distros/ubuntu1504_cmake/zoneminder.postinst
2015-12-21 12:57:45 -05:00
Isaac Connor f6fd4671fe make zmfilter aware of StorageAreas 2015-12-21 12:40:39 -05:00
Isaac Connor fc981e063e snap release adding zmvideo 2015-12-21 10:01:55 -05:00
Isaac Connor f4debc203d Only run zmupdate.pl if the mysql db is located here 2015-12-20 12:23:40 -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 4ef35c8c70 No need for a cgi-bin link 2015-12-20 11:23:01 -05:00
Isaac Connor 9c2707deba update paths to /usr/share/zoneminder/www and /usr/lib/zoneminder/cgi-bin 2015-12-20 11:22:12 -05:00
Isaac Connor 623c8a14b0 add multi-package build for 14.04 2015-12-18 14:16:45 -05:00
Isaac Connor 14cde582cf Merge branch 'multi-server' into multiserverplusstorage
Conflicts:
	src/zm_monitor.h
2015-12-14 16:55:26 -05:00
Isaac Connor b2b1afa8ad Merge master 2015-12-14 15:49:32 -05:00
Isaac Connor b21b26a41b remove requirment for mysql. Mysql could be on another machine 2015-12-09 12:34:16 -05:00
Isaac Connor af59dbee2e == should be = 2015-12-04 10:40:55 -05:00
Isaac Connor 70fb6a6786 output message when not doing dbupdate. put quotes in to fix bash error when ZM_DB_HOST is not defined 2015-12-02 11:17:23 -05:00
SteveGilvarry 220ee5e516 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2015-11-29 13:17:22 +11:00
Isaac Connor 7514f43ef4 only update db if db is local 2015-11-27 13:54:31 -05:00
Isaac Connor f7cc2fb44f Merge branch 'master' into multi-server
Conflicts:
	src/zm_monitor.cpp
2015-11-23 10:42:14 -05:00
Isaac Connor 7d97ecb9c9 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-11-23 10:40:08 -05:00
Andy Bauer cbfdc5d88d rpm packaging updates 2015-11-21 15:23:13 -06:00
Andy Bauer e65f91d404 update rpm documentation 2015-11-21 15:18:43 -06:00
Isaac Connor 4d6c4355db Merge branch 'master' into multi-server 2015-11-20 16:07:50 -05:00
Isaac Connor 37b041b561 add index to recommended default permissions on zmuser 2015-11-20 16:00:57 -05:00
Andy Bauer 9052274d0d Update rpm documentation to reference index permission 2015-11-17 12:20:51 -06:00
Isaac Connor e00049f17a change format to native 2015-11-16 09:30:09 -05:00
Isaac Connor d5cc602bfa Merge branch 'master' into multi-server 2015-11-09 12:36:34 -05:00
Isaac Connor 16274e46bc grant create,index to zmuser when updating 2015-11-09 12:36:26 -05:00
Isaac Connor ac76d224b8 grant create,index to zmuser when updating 2015-11-09 12:36:23 -05:00
Isaac Connor 82edfc2f16 grant create,index to zmuser when updating 2015-11-09 12:34:24 -05:00
Isaac Connor 6b994132f1 grant create,index to zmuser when updating 2015-11-09 12:34:11 -05:00
Heng Liu 4e263f5913 Merge branch 'master' into feature-h264-videostorage
Conflicts:
	src/zm_ffmpeg.h
2015-11-04 14:39:52 -08:00
Isaac Connor b28a562f1b Merge branch 'master' into multi-server 2015-10-30 12:32:42 -04:00
Isaac Connor 920bea8deb split up depends into multiple lines 2015-10-30 12:19:43 -04:00
Isaac Connor 589ee2f37b split up depends into multiple lines 2015-10-30 12:19:35 -04:00
Isaac Connor a45a52601d change format to native, which makes building packages so much easier 2015-10-30 12:19:12 -04:00
SteveGilvarry d45cf9607b Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2015-10-28 08:12:46 +11:00
Isaac Connor 029044bca3 merge master, bump version 2015-10-23 16:14:49 -04:00
Isaac Connor e37cf0e218 append /www to docroot for all debian/ubuntu dists 2015-10-23 16:08:32 -04:00
SteveGilvarry d8494aba2d Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
	src/zm_remote_camera_rtsp.h
	web/skins/classic/views/monitor.php
2015-10-23 22:07:22 +11:00
Isaac Connor d0e5dd62b5 Merge pull request #1103 from seebaer1976/patch-6
Update preinst
2015-10-16 12:06:44 -04:00
Isaac Connor 582cbe7567 Merge branch 'master' into multi-server 2015-10-15 09:01:19 -04:00
seebaer1976 7ebf3de8a2 Update preinst
korrektur
2015-10-09 18:13:13 +02:00
Isaac Connor 8db4c22192 Merge pull request #1100 from seebaer1976/patch-2
Update links
2015-10-09 09:23:32 -04:00
Isaac Connor 729e9536d7 Merge pull request #1101 from seebaer1976/patch-4
Update rules
2015-10-09 09:23:13 -04:00
Isaac Connor 79078f8308 Merge pull request #1102 from seebaer1976/patch-5
Update apache.conf
2015-10-09 09:22:55 -04:00
seebaer1976 b17819d181 Update apache.conf
Update links
2015-10-09 13:50:15 +02:00
seebaer1976 b042152694 Update rules
update links
2015-10-09 13:48:26 +02:00
seebaer1976 4284f8b089 Update preinst
Update links
2015-10-09 13:45:19 +02:00
seebaer1976 23a6000380 Update links
Update links
2015-10-09 13:41:02 +02:00
Andy Bauer b74abe88c9 minor centos 7 specfile change 2015-10-03 17:07:22 -05:00
Andrew Bauer 3242cde0bf move zm.conf under /etc/zm for Fedora 2015-10-03 13:38:51 -05:00
Andrew Bauer 4fb2bcb393 Fedora specfile changes 2015-10-03 13:21:58 -05:00
Andrew Bauer e8c4adbcca Use make macros inside Fedora config files rather than hardcode 2015-10-03 12:54:18 -05:00
Andrew Bauer 6861ea00d2 Add Fedora 22 Target Distro 2015-10-03 12:40:34 -05:00
Andrew Bauer 269e9bd475 Configure Fedora packages for HTTPS 2015-10-03 12:35:22 -05:00
Andrew Bauer a79d0fc502 update README.fedora 2015-10-03 11:04:58 -05:00
Andrew Bauer 9fae2bdf67 symlink README.https into Fedora folder 2015-10-03 10:45:41 -05:00
Andrew Bauer d6667100b4 Merge pull request #1084 from ZoneMinder/tz
Tz
2015-10-13 07:19:45 -05:00
Isaac Connor 4edf997791 change docroot to /usr/share/zoneminder/www and cgi-bin to /usr/lib/zoneminder/cgi-bin 2015-10-02 12:32:12 +00:00
Isaac Connor c9d7087c91 Setting the TZ ENV variable prevents every gettimeofday call from reading /etc/timezone 2015-10-01 11:47:12 -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 07348d4321 don't need apache patch anymore 2015-09-29 08:50:50 -04:00
Andrew Bauer e97341ced5 Merge pull request #1054 from knnniggett/cambozola
link to cambozola pacakge, rather than download during build
2015-09-14 14:02:10 -05:00
Isaac Connor e88d63cb35 need to check the case of having a / at the end 2015-09-14 14:55:37 -04:00
Andrew Bauer 03172af921 link to cambozola pacakge, rather than download during build 2015-09-14 13:51:48 -05:00
Isaac Connor 3f3c637227 don't need apache patch anymore 2015-09-14 14:36:19 -04:00
Isaac Connor 407ed7ec66 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-09-14 14:14:23 -04:00
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 1e60fccd81 Cherry-Pick from iconnor - make it compile on ubuntu 15.04. Which is libav 56.1.0
Conflicts:
	src/zm_ffmpeg.cpp
	src/zm_remote_camera_rtsp.cpp

Conflicts:
	distros/ubuntu1204/changelog
2015-07-28 21:39:47 +10: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
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
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
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
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
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
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
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 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 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 0de7217317 Remove no longer needed patch because applied to master 2015-01-03 14:13: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
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 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 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 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