Merge branch 'master' into multi-server

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+## [v1.29.0-rc2](https://github.com/ZoneMinder/ZoneMinder/tree/v1.29.0-rc2) (2016-01-05)
+[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.29.0-rc1...v1.29.0-rc2)
+
+**Merged pull requests:**
+
+- Multi server [\#1223](https://github.com/ZoneMinder/ZoneMinder/pull/1223) ([connortechnology](https://github.com/connortechnology))
+- Multi server [\#1222](https://github.com/ZoneMinder/ZoneMinder/pull/1222) ([connortechnology](https://github.com/connortechnology))
+- Multi server [\#1217](https://github.com/ZoneMinder/ZoneMinder/pull/1217) ([connortechnology](https://github.com/connortechnology))
+- Multi server [\#1215](https://github.com/ZoneMinder/ZoneMinder/pull/1215) ([connortechnology](https://github.com/connortechnology))
+- Change log updates [\#1172](https://github.com/ZoneMinder/ZoneMinder/pull/1172) ([SteveGilvarry](https://github.com/SteveGilvarry))
+
 ## [v1.29.0-rc1](https://github.com/ZoneMinder/ZoneMinder/tree/v1.29.0-rc1) (2016-01-01)
 [Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.28.1...v1.29.0-rc1)
 

distros/ubuntu1504_cmake/control

@@ -104,7 +104,7 @@ Package: zoneminder-doc
 Section: doc
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}, python-sphinx-rtd-theme | python3-sphinx-rtd-theme
 Suggests: www-browser
 Description: ZoneMinder documentation
  ZoneMinder is intended for use in single or multi-camera video security

distros/ubuntu1504_cmake/zoneminder.logrotate

@@ -1,10 +1,10 @@
-/var/log/zm/*log {
+/var/log/zm/*.log {
     missingok
     notifempty
     sharedscripts
     postrotate
         /usr/bin/zmpkg.pl logrot >>/dev/null 2>&1 || :
     endscript
-    weekly
+    daily
-    rotate 3
+    rotate 7
 }

utils/do_debian_package.sh

@@ -2,14 +2,24 @@
 DATE=`date -R`
 DISTRO=$1
 SNAPSHOT=$2
+if [ "$SNAPSHOT" == "stable" ]; then
+SNAPSHOT="";
+fi;
+
 TYPE=$3
 if [ "$TYPE" == "" ]; then
 TYPE="source";
 fi;
+BRANCH=$4
 
 if [ ! -d 'zoneminder_release' ]; then 
 	git clone https://github.com/ZoneMinder/ZoneMinder.git zoneminder_release
 fi;
+if [ "$BRANCH" != "" ]; then
+	cd zoneminder_release
+	git checkout $BRANCH
+	cd ../
+fi;
 VERSION=`cat zoneminder_release/version`
 if [ $VERSION == "" ]; then
 	exit 1;
@@ -20,9 +30,9 @@ cd zoneminder_$VERSION-$DISTRO-$SNAPSHOT.orig
 git submodule init
 git submodule update --init --recursive
 if [ $DISTRO == "trusty" ]; then 
-cp -r distros/ubuntu1204_cmake debian
+ln -sf distros/ubuntu1204_cmake debian
 else
-cp -r distros/ubuntu1504_cmake debian
+ln -sf distros/ubuntu1504_cmake debian
 fi;
 
 cat <<EOF > debian/changelog
@@ -33,15 +43,19 @@ zoneminder ($VERSION-$DISTRO-$SNAPSHOT) $DISTRO; urgency=medium
  -- Isaac Connor <iconnor@connortechnology.com>  $DATE
 
 EOF
-rm -rf .git
+#rm -rf .git
-rm .gitignore
+#rm .gitignore
-cd ../
+#cd ../
-tar zcf zoneminder_$VERSION-$DISTRO.orig.tar.gz zoneminder_$VERSION-$DISTRO-$SNAPSHOT.orig
+#tar zcf zoneminder_$VERSION-$DISTRO.orig.tar.gz zoneminder_$VERSION-$DISTRO-$SNAPSHOT.orig
-cd zoneminder_$VERSION-$DISTRO-$SNAPSHOT.orig
+#cd zoneminder_$VERSION-$DISTRO-$SNAPSHOT.orig
 if [ $TYPE == "binary" ]; then
-debuild -k52C7377E
+	debuild
 else
-debuild -S -sa -k52C7377E
+	debuild -S -sa
 fi;
+
 cd ../
+echo "about to delete zoneminder_$VERSION-$DISTRO-$SNAPSHOT.orig. Hit enter to continue."
+read delete
 rm -fr zoneminder_$VERSION-$DISTRO-$SNAPSHOT.orig
+