53159ed12c
restore changelog to keep PR clean
2015-08-27 11:10:05 -04:00
75919c9cd5
Merge branch 'master' into multi-server
...
Conflicts:
docs/installationguide/ubuntu.rst
misc/apache.conf.in
src/zm_monitor.cpp
2015-08-27 10:34:47 -04: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
12da43afe7
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 14:01:28 -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
880e77b096
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 13:30:48 -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
c0517b11ae
Merge branch 'master' into multi-server
2015-08-16 10:52:51 -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
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
5a363273a2
Merge branch 'master' into multi-server
...
Conflicts:
distros/ubuntu1504/changelog
2015-07-16 16:37:44 -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
7fa2d51277
snapshot releases
2015-07-15 09:42:29 -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
Isaac Connor
Isaac Connor
Andrew Bauer
Isaac Connor
Andrew Bauer
Isaac Connor
Bill McGonigle
Sebastian Kaminski