407ed7ec66
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-09-14 14:14:23 -04:00
6e47812669
This patch is no longer needed
2015-09-14 14:14:13 -04:00
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
0ff14008b3
Update zoneminder.el6.conf.in
...
ScriptAlias should point to ZM_CGIDIR instead of ZM_WEBDIR
2015-09-12 17:49:03 -05:00
ebb6e7158a
rpm packaging changes for centos 6
2015-09-08 18:16:19 -05:00
427c71f5e8
Update README.Centos7
2015-09-07 16:54:13 -05:00
41cfadbcb1
Update zoneminder.el7.spec
...
typo
2015-09-07 16:14:58 -05:00
dc9a5b13fe
redhat rpm packaging modifications
2015-09-07 15:50:42 -05:00
9320efdd45
rpm specfile - modify symlinks
2015-08-29 18:04:26 -05:00
4ddeddeb32
rpm specfile - correct typo
2015-08-29 17:28:06 -05:00
4915b7fc72
rpm spec file - create cakephp tmp folder symlink
2015-08-29 16:52:16 -05:00
d9c3061b52
Add reference to mysql Create permission in rpm README's
2015-08-29 14:01:45 -05:00
ef8830b373
Update zoneminder.el6.spec
...
rpm specfile - update location of perl packlist
2015-08-29 11:12:55 -05:00
3ff9c38a2e
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-08-20 20:36:21 -04:00
8e01dad828
add the api tmp link
2015-08-20 20:36:09 -04:00
6a1bbd2055
remove systemd overrides
2015-08-20 13:49:04 -04:00
96a710671d
add the api tmp dir link to /tmp/zm
2015-08-19 16:23:36 -04:00
daba109e7d
set AllowOverride All for api dir
2015-08-19 16:09:03 -04:00
492cafe08e
set AllowOverride All for api dir
2015-08-19 16:08:48 -04:00
e4f1795fa4
1404 doesn't have 3.9.6, so go back to 3.9.4
2015-08-19 13:35:06 -04:00
93e948e0d8
these links need to move under www to work
2015-08-19 13:31:56 -04:00
4767a6fb38
remove systemd, and extra Standards-Version
2015-08-18 14:01:56 -04:00
16897b7c94
rough in ubuntu1204 version of cmake build
2015-08-18 11:57:56 -04:00
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
8e491475d1
typos and whitespace fixes
2015-08-16 12:45:45 -04:00
b69fd1e86d
configure apache to follow symlinks so it find nph-zms
2015-08-13 20:23:52 -05:00
af5fd5890b
Fix redalert.wav symlinks
2015-08-10 08:13:37 -05:00
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
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
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
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
424b7d50bd
php-gd should isntead be php5-gd
2015-07-16 13:59:06 -04:00
e3042c59a5
add php-gd to list of dependencies for debian and ubuntu builds
2015-07-16 13:40:16 -04:00
eb5bb641d6
rpm packaging - require php-gd
2015-07-16 12:15:24 -05:00
09efee3be3
limit man install to 8 to not conflict with man pages in libzoneminder-perl
2015-07-15 15:46:53 -04:00
2f3779473b
release SNAPSHOT2015071501
2015-07-15 15:45:02 -04:00
4f0466739f
remove generated .debhelpers
2015-07-15 12:04:00 -04:00
7a08127d21
release snapshot 2015071501
2015-07-15 12:02:20 -04:00
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
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
956e2936a3
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-06-25 16:26:49 -04:00
e3727af243
softlayer-dal appears to defunct as a sourceforge mirror. Get jscalendar from nbtelcom instead.
2015-06-24 01:32:53 -04:00
d03469125a
Add perl-podlators build dependency to redhat distros
2015-06-20 18:07:29 -05:00
69cdce22e1
cleanout build files
2015-06-19 12:04:09 -04:00
99384983a5
merge from recent ubuntu1504 switch to ffmpeg version of av libs
2015-06-18 13:09:42 -04:00
03de98980f
cleanup log
2015-06-12 11:53:08 -04:00
18674b7973
cleanup
2015-06-12 11:51:43 -04:00
7759e57776
update changelog to match last snapshot
2015-06-12 11:50:10 -04:00
106d543367
add ubuntu15.04 using cmake with split packages
2015-06-12 11:20:24 -04:00
3266b0b57e
change for systemd
2015-05-24 22:13:09 +02:00
3080ecdb20
add service and temp files
2015-05-24 22:09:43 +02:00
a671b452a8
change dependencies for ubuntu 15.04
2015-05-24 22:05:09 +02:00
f45af08947
copy ubutnu1204 without init.d
2015-05-24 22:01:51 +02:00
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
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
1668949f18
Merge pull request #792 from knnniggett/perl
...
cmake - use perl INSTALLDIRS
2015-04-15 11:07:14 -04:00
0eeba1c514
don't check for perl packlist in f21 specfile
2015-04-10 15:36:57 -05:00
411b518b14
Merge pull request #774 from knnniggett/tmpfiles
...
Use tmpfiles.d to manage tmpdir and sockdir
2015-04-10 13:42:28 -04:00
0cf82a0b71
Allow user to override perl installation. Replace old perl cmake vars with new.
2015-04-10 12:09:01 -05:00
a3637b9eed
Add libv4l-devel as a build req for el7, f20, & f21
2015-04-03 17:41:46 -05:00
c0af30bdf1
fix permissions on config file
2015-03-31 20:45:12 -05:00
7802089b82
Use tmpfiles.d to manage tmpdir and sockdir
2015-03-31 20:30:27 -05:00
75cfc3f0cd
bump release
2015-03-02 17:16:00 -05:00
098e66951e
remove netpbm from debian packaging
2015-03-02 17:15:27 -05:00
111e75e8e9
add psmisc pacakge requirement to rpm specfiles
2015-02-23 08:09:48 -06:00
397bc57692
Update zoneminder.el6.spec
2015-02-23 07:18:32 -06:00
7d747b72d7
bump version for el6 and f20 specfiles
2015-02-23 07:12:57 -06:00
42744f4359
Update zoneminder.f21.spec
...
bump version in cmake flag
2015-02-21 09:17:16 -06:00
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
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
22b73c1610
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-02-18 16:32:06 -05:00
e3351441c7
fix cmake error, rename init script to zoneminder, modify el6 target distro
2015-02-15 15:59:58 -06:00
18abb3761d
Update CMakeLists.txt
2015-02-15 15:50:21 +00:00
e762a615d3
Rename zoneminder.el6.conf to zoneminder.el6.conf.in
2015-02-15 15:48:40 +00:00
c6f256fef4
Rename zoneminder.el6.logrotate to zoneminder.el6.logrotate.in
2015-02-15 15:48:14 +00:00
aa00de486b
Rename zoneminder.el7.logrotate to zoneminder.el7.logrotate.in
2015-02-15 15:47:42 +00:00
200f48da34
Rename zoneminder.tmpfiles to zoneminder.tmpfiles.in
2015-02-15 15:46:00 +00:00
4fc4789b08
Update zoneminder.el6.conf
2015-02-15 14:23:28 +00:00
813de8540f
Update zoneminder.el6.logrotate
2015-02-15 14:21:16 +00:00
160503df14
Update zoneminder.el7.logrotate
2015-02-15 14:20:23 +00:00
6b8ce2e0d4
Rename zoneminder.in to zm.in
2015-02-15 14:06:54 +00:00
e80702bb22
Update CMakeLists.txt
2015-02-15 14:03:06 +00:00
5f96882ec7
Update CMakeLists.txt
2015-02-15 14:00:34 +00:00
39c5d3ad06
Update zoneminder.tmpfiles
2015-02-15 13:48:46 +00:00
308a8b9df3
Update CMakeLists.txt
2015-02-15 13:34:17 +00:00
12964f5635
Update CMakeLists.txt
2015-02-15 11:44:46 +00:00
3e03745603
Rename zoneminder.el7.conf to zoneminder.el7.conf.in
2015-02-15 11:43:10 +00:00
b42b646e5e
Update zoneminder.el7.conf
2015-02-15 11:39:27 +00:00
c54b9aa6bc
Update zoneminder.f21.spec
...
typo
2015-02-14 11:29:34 -06:00
9ac5b2b1c5
create zoneminder spec file for fedora 21
2015-02-14 11:25:03 -06:00
cdb5180964
bump snapshot release
2015-02-13 13:14:50 -05:00
eb73c16246
add mysql-client-5.6 as an option in depends
2015-02-13 13:06:03 -05:00
8480eda48c
Update README.Centos7
2015-02-13 06:55:45 -06:00
4d33a55f9e
Update README.Centos7
2015-02-13 06:50:50 -06:00
f20a233ab2
Update zoneminder.el7.spec
...
move zm.conf to /etc/zm
2015-02-11 17:57:13 -06:00
ccad736893
Update README.Centos7
2015-02-11 13:55:02 -06:00
b741da01e8
renumber the items
2015-02-09 13:36:22 -06:00
e8732d76b9
Minor documentation tweaks
2015-02-09 13:29:21 -06:00
8304a8d428
Update instructions in README.Centos7
2015-02-09 09:28:35 -06:00
51bf50f79a
Add mariadb to buildrequires
2015-02-09 07:58:34 -06:00
9944a40763
Run zmupdate noninteractively following an upgrade
2015-02-08 19:08:21 -06:00
c475cc69d2
Change zm ScriptAlias to prevent an overlap with the default ScriptAlias
2015-02-08 18:52:42 -06:00
0cf5bc5efb
install tmpfiles config file
2015-02-08 18:16:21 -06:00
f3671ddd8b
add ZM_TARGET_DISTRO string after else statement
2015-02-08 18:07:46 -06:00
c619dded76
reorganize files to allow el6 and el7 files to exist simultaneously
2015-02-08 17:56:44 -06:00
9bc28c96f0
Centos 7 rpm packaging
2015-02-08 16:16:31 -06:00
279459bf2c
Merge branch 'master' of https://github.com/manupap1/ZoneMinder into debian_package_split
2015-01-15 21:35:52 +01:00
c6c4e70a36
Switch debian8 folder to native source format
2015-01-15 21:32:01 +01:00
44606942fa
Rename zoneminder.cmake.f20.spec to zoneminder.f20.spec
2015-01-13 08:17:42 -06:00
010fd69b0b
Rename zoneminder.cmake.el6.spec to zoneminder.el6.spec
2015-01-13 08:17:20 -06:00
7c99886af2
Update zoneminder.cmake.el6.spec
...
net-tools is the package that contains the arp command.
2015-01-13 08:16:05 -06:00
3b418bb455
Update zoneminder.cmake.f20.spec
...
net-tools is the package that contains the arp command
2015-01-13 08:15:02 -06:00
47ef5c999f
Add dependency to apache2 for zoneminder-core package
2015-01-12 22:22:40 +01:00
f05dc5e2a3
Rename debian patch
2015-01-12 21:03:29 +01:00
e1824aad4b
Fix a conflict when merging upstream master
2015-01-12 20:52:14 +01:00
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
0de7217317
Remove no longer needed patch because applied to master
2015-01-03 14:13:41 +01:00
d61becb0d7
Merge branch 'master' of https://github.com/manupap1/ZoneMinder into debian_package_split
2015-01-03 13:22:40 +01:00
d958a13114
this patch has been applied to master branch and is no longer needed.
2014-12-30 09:49:14 -05:00
bb2cecee8a
Update of build dependencies
2014-12-28 11:04:53 +01:00
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
d8e682c48b
Update of perl library dependencies
2014-12-21 04:02:41 +01:00
3bfee679f8
Move the refreshed patches to the right folder
2014-12-21 02:38:17 +01:00
2aa3f7e2da
Refresh the debian patches
2014-12-21 01:52:42 +01:00
aff6958398
Provide a patch to rename the service file in zmsystemctl.pl.in
2014-12-21 01:38:32 +01:00
df2473cdf7
Use a wilcard to reference man files
2014-12-20 21:11:44 +01:00
5bd3b18c7b
Merge branch 'master' of https://github.com/manupap1/ZoneMinder into debian_package_split
2014-12-20 20:30:54 +01:00
fb1566c829
Fix package dependencies
2014-12-20 20:26:34 +01:00
939f126e76
Set the right filename for the systemd service and don't call zmupdate interactively
2014-12-20 20:21:29 +01:00
6cdb046b34
Do not repeat admin password question if already answered
2014-12-20 20:12:33 +01:00
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
ae1bf955e5
Update zm.conf file in package which provide it
2014-12-19 15:49:40 +01:00
27ca8f7ee4
Rename database package and update descriptions
2014-12-18 20:05:59 +01:00
9745a1fb0b
Remove useless file libzoneminder-perl.manpages
2014-12-18 15:04:50 +01:00
5e41665d88
Fix some lintian errors and warning after package spliting
2014-12-18 11:03:54 +01:00
b921b6f254
the debian packaging has this, and apparently we need it to build
2014-12-17 16:23:04 -05:00
5dd1b6a388
this is in debian
2014-12-17 16:11:26 -05:00
9b860fb08c
libjpeg updates to match debian
2014-12-17 16:10:54 -05:00
67fc4c5ea9
update to what has been done in debian
2014-12-17 15:43:32 -05:00
e9e6d84c7b
bump release #
2014-12-17 15:30:20 -05:00
9f6e4dd794
Set the new dbg package name in the rules file
2014-12-16 21:15:11 +01:00
3b3a4772a4
Fix installatino of man files and sql files
2014-12-16 20:58:54 +01:00
7189de829c
Split files in multiple packages (lb, core, ui...)
2014-12-16 12:42:51 +01:00
0251500f09
Merge pull request #634 from manupap1/debconf_support
...
Add debconf / dbconfig support to debian8 folder
2014-12-14 10:08:59 -05:00
af6941f1ef
Fix lintian warning 'description-synopsis-starts-with-article' and more typo in control file
2014-12-13 17:53:53 +01:00
a27e99b104
Add section 'debug' and priority 'extra' to zoneminder debug package to fix two lintian warnings
2014-12-13 17:50:52 +01:00
655af1d373
Upgrade Standards-Version in control file to fix a lintian warning
2014-12-13 17:43:24 +01:00
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
63d75debff
Use dh_install and dh_link in override_dh_install
2014-12-13 17:32:01 +01:00
59e2d0873d
Add required README.source file when using a patching system
2014-12-13 17:30:21 +01:00
Isaac Connor
Andrew Bauer
Andrew Bauer
Isaac Connor
Isaac Connor
Isaac Connor
Bill McGonigle
Sebastian Kaminski
clipo1979
Emmanuel Papin
Andrew Cook