ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into storageareas

This commit is contained in:
Isaac Connor 2016-08-12 10:04:52 -04:00
parent 62a2ce56fb 1058796374
commit b36694ad8b
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
distros/debian/postinst
View File

@ -38,6 +38,7 @@ if [ "$1" = "configure" ]; then
invoke-rc.d zoneminder stop || true
zmupdate.pl --nointeractive
zmupdate.pl --nointeractive -f
echo "Done Updating, starting ZoneMinder"
invoke-rc.d zoneminder start || true
else
echo 'NOTE: mysql not running, please start mysql and run dpkg-reconfigure zoneminder when it is running.'

6
distros/debian/rules
View File

@ -27,9 +27,9 @@ override_dh_auto_configure:
override_dh_auto_install:
dh_auto_install --buildsystem=cmake
install -D -m 0644 debian/apache.conf $(INSTDIR)/etc/zm/apache.conf
rm $(INSTDIR)/usr/share/zoneminder/api/lib/Cake/LICENSE.txt
rm $(INSTDIR)/usr/share/zoneminder/api/.gitignore
rm -r $(INSTDIR)/usr/share/zoneminder/api/lib/Cake/Test
rm $(INSTDIR)/usr/share/zoneminder/www/api/lib/Cake/LICENSE.txt
rm $(INSTDIR)/usr/share/zoneminder/www/api/.gitignore
rm -r $(INSTDIR)/usr/share/zoneminder/www/api/lib/Cake/Test
override_dh_auto_test:
# do not run tests...

1
distros/ubuntu1204/zoneminder.postinst
View File

@ -38,6 +38,7 @@ if [ "$1" = "configure" ]; then
invoke-rc.d zoneminder stop || true
zmupdate.pl --nointeractive
zmupdate.pl --nointeractive -f
echo "Done Updating, starting ZoneMinder"
invoke-rc.d zoneminder start || true
else
echo 'NOTE: mysql not running, please start mysql and run dpkg-reconfigure zoneminder when it is running.'

1
distros/ubuntu1604/zoneminder.postinst
View File

@ -41,6 +41,7 @@ if [ "$1" = "configure" ]; then
deb-systemd-invoke stop zoneminder.service || exit $?
zmupdate.pl --nointeractive
zmupdate.pl --nointeractive -f
echo "Done Updating, starting ZoneMinder"
deb-systemd-invoke start zoneminder.service || exit $?
else