Commit Graph

63 Commits

Author SHA1 Message Date
Dmitry Katsubo 7bf0bcf4ef Updated package version (otherwise build process stops). 2013-12-30 15:31:50 +01:00
nkwood 922385d761 Update init.d 2013-12-23 14:55:56 -06:00
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 6d6503c006 suggest mysql-server 2013-11-08 12:07:45 -05:00
Isaac Connor 2cd0d0b405 repeat the dbh package lines for debian as well 2013-11-08 11:25:06 -05:00
Isaac Connor 80d97c7bdf Merge branch 'master' of https://github.com/FoundationUniversity/ZoneMinder into FoundationUniversity-master
Conflicts:
	distros/debian/changelog
2013-10-03 11:36:26 -04:00
Jan Dennis Bungart b428272f42 fixing debian docs file (README -> README.md) 2013-09-22 10:34:11 +08:00
Jan Dennis Bungart 7172930994 Fixing debian control file (libjpeg-turbo8 -> libjpeg8) 2013-09-22 10:21:20 +08:00
Jan Dennis Bungart a3519feffc Fixing postinst script and changelog needed for successful debian build 2013-09-22 10:01:30 +08:00
Isaac Connor b08a8252c4 Merge branch 'dukess-master' into v1.26.4-beta
Conflicts:
	scripts/zmupdate.pl.in
2013-09-18 13:03:54 -04:00
Isaac Connor eba8b0dde0 move this into the distros dir 2013-09-18 12:51:10 -04:00