Commit Graph

9 Commits

Author SHA1 Message Date
Isaac Connor 433370c9e3 Merge branch 'master' into storageareas
Conflicts:
	distros/ubuntu1204/changelog
	src/zm_monitor.h
2013-12-15 15:16:14 -05:00
Isaac Connor 73dbe81064 update to 1.26.5 2013-12-13 13:45:55 -05:00
Isaac Connor 969eed5ce7 add libapache2-mod-fcgid as an option instead of libapache2-mod-php5
add config to use it instead of modphp5
2013-12-10 13:57:22 -05:00
Isaac Connor 4555a8bf92 Merge pull request #240 from ZoneMinder/postinstcleanup
remove extra stuff that I don't think we need because we are the source.
2013-11-19 08:29:51 -08:00
Isaac Connor c840f1b622 suggest mysql-server 2013-11-08 12:08:06 -05:00
Isaac Connor e9c0509399 add rules for a dbg package 2013-11-08 11:09:23 -05:00
Isaac Connor a1cb1e6de2 bump version # for snapshot 2013-11-04 09:56:20 -05:00
Isaac Connor 7b585d182a remove extra stuff that I don't think we need because we are the source.
Also unconditionally call zmupdate.pl since it should do all the checking of versions to see if anything needs doing.
We don't need to be doing that work in a postinst bash script.
2013-11-03 15:49:37 -05:00
Isaac Connor 21caddf97b This is a copy of the debian dir, the main change is to the Changelog so that the package gets built for precise 2013-10-03 13:53:37 -04:00