From 41a8249ed958319e2867c039c0821ee16e7d805a Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 5 Jan 2016 09:04:04 -0500 Subject: [PATCH 1/4] update my package building script --- utils/do_debian_package.sh | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/utils/do_debian_package.sh b/utils/do_debian_package.sh index b7a97a0a6..3d9332e3c 100755 --- a/utils/do_debian_package.sh +++ b/utils/do_debian_package.sh @@ -2,17 +2,27 @@ 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 + 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; + exit 1; fi; echo "Doing $TYPE release zoneminder_$VERSION-$DISTRO-$SNAPSHOT"; mv zoneminder_release zoneminder_$VERSION-$DISTRO-$SNAPSHOT.orig @@ -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 < debian/changelog @@ -33,15 +43,19 @@ zoneminder ($VERSION-$DISTRO-$SNAPSHOT) $DISTRO; urgency=medium -- Isaac Connor $DATE EOF -rm -rf .git -rm .gitignore -cd ../ -tar zcf zoneminder_$VERSION-$DISTRO.orig.tar.gz zoneminder_$VERSION-$DISTRO-$SNAPSHOT.orig -cd zoneminder_$VERSION-$DISTRO-$SNAPSHOT.orig +#rm -rf .git +#rm .gitignore +#cd ../ +#tar zcf zoneminder_$VERSION-$DISTRO.orig.tar.gz 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 + From 3066f66f259b9b440ded5474d6d06260e14e4ab3 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 5 Jan 2016 13:21:54 -0500 Subject: [PATCH 2/4] add sphinx-rtd-theme --- distros/ubuntu1504_cmake/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distros/ubuntu1504_cmake/control b/distros/ubuntu1504_cmake/control index c2098f179..65e11fac9 100644 --- a/distros/ubuntu1504_cmake/control +++ b/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 From d96757ba131936293ed1cb18d9ef6b0d7fd04b77 Mon Sep 17 00:00:00 2001 From: Andy Bauer Date: Wed, 6 Jan 2016 12:46:01 -0600 Subject: [PATCH 3/4] update changelog --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e3944002..f1b145106 100644 --- a/CHANGELOG.md +++ b/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) From 5ce26ac4df10e90f58c931c69aced6a2fd39a15b Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 8 Jan 2016 09:59:03 -0500 Subject: [PATCH 4/4] Change logrotate defaults to daily/rotate 7, which works better with logcheck --- distros/ubuntu1504_cmake/zoneminder.logrotate | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/distros/ubuntu1504_cmake/zoneminder.logrotate b/distros/ubuntu1504_cmake/zoneminder.logrotate index ac7ce0795..18fc6b0a0 100644 --- a/distros/ubuntu1504_cmake/zoneminder.logrotate +++ b/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 - rotate 3 + daily + rotate 7 }