Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas

distros/ubuntu1204/patches/default_cgi-path.patch

@@ -1,16 +0,0 @@
-Last-Update: 2015-08-16
-Forwarded: no
-Author: Dmitry Smirnov <onlyjob@member.fsf.org>
-Description: correct path to CGI app according to default web server configuration.
-
---- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
-+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
-@@ -428,7 +428,7 @@ our @options =
-     },
-     {
-         name        => "ZM_PATH_ZMS",
--        default     => "/cgi-bin/nph-zms",
-+        default     => "/zm/cgi-bin/nph-zms",
-         description => "Web path to zms streaming server",
-         help        => qqq("
-             The ZoneMinder streaming server is required to send streamed

distros/ubuntu1204/patches/series

@@ -1,2 +0,0 @@
-default_cgi-path.patch
-use_libjs-mootools.patch

distros/ubuntu1204/patches/use_libjs-mootools.patch

@@ -1,18 +0,0 @@
-Last-Update: 2015-03-29
-Forwarded: no
-Bug-Debian: http://bugs.debian.org/585590
-Reviewed-By: Dmitry Smirnov <onlyjob@member.fsf.org>
-Description: use mootools shipped by debian, rather than the zoneminder included mootools.
-
---- a/web/skins/classic/includes/functions.php
-+++ b/web/skins/classic/includes/functions.php
-@@ -63,9 +63,8 @@
-     }
- ?>
-   <script type="text/javascript" src="tools/mootools/mootools-core.js"></script>
-   <script type="text/javascript" src="tools/mootools/mootools-more.js"></script>
--  <script type="text/javascript" src="js/mootools.ext.js"></script>
-   <script type="text/javascript" src="js/logger.js"></script>
-   <script type="text/javascript" src="js/overlay.js"></script>
- <?php
-     if ( $skinJsPhpFile )

distros/ubuntu1204/rules.orig

@@ -1,89 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_LDFLAGS_MAINT_APPEND += -Wl,--as-needed
-
-ifeq ($(DEB_BUILD_ARCH_OS),hurd)
-ARGS:= -DZM_NO_MMAP=ON
-endif
-
-%:
-	dh $@ --parallel --buildsystem=cmake --builddirectory=dbuild \
-            --with sphinxdoc,apache2,linktree
-
-override_dh_auto_configure:
-	dh_auto_configure -- $(ARGS)                  \
-            -DCMAKE_VERBOSE_MAKEFILE=ON                \
-            -DCMAKE_BUILD_TYPE=Release                 \
-            -DZM_CONFIG_DIR="/etc/zm"                  \
-            -DZM_RUNDIR="/var/run/zm"                  \
-            -DZM_SOCKDIR="/var/run/zm"                 \
-            -DZM_TMPDIR="/tmp/zm"                      \
-            -DZM_CGIDIR="/usr/lib/zoneminder/cgi-bin"  \
-            -DZM_CONTENTDIR="/var/cache/zoneminder"
-
-override_dh_clean:
-	dh_clean $(MANPAGES1)
-	$(RM) -r docs/_build docs/installationguide
-
-build-indep:
-	#$(MAKE) -C docs text
-	$(MAKE) -C docs html
-
-MANPAGES1 = dbuild/scripts/zmupdate.pl.1
-$(MANPAGES1):
-	# generate man page(s):
-	pod2man -s1 --stderr --utf8 $(patsubst %.1, %, $@) $@
-
-## reproducible build:
-LAST_CHANGE=$(shell dpkg-parsechangelog -S Date)
-BUILD_DATE=$(shell LC_ALL=C date -u "+%B %d, %Y" -d "$(LAST_CHANGE)")
-override_dh_installman: $(MANPAGES1)
-	$(MAKE) -C docs man SPHINXOPTS="-D today=\"$(BUILD_DATE)\""
-	dh_installman --language=C $(MANPAGES1)
-
-override_dh_auto_install:
-	dh_auto_install --destdir=$(CURDIR)/debian/tmp
-	# remove worthless files:
-	$(RM) -v $(CURDIR)/debian/tmp/usr/share/perl5/*/*/*/.packlist
-	$(RM) -v $(CURDIR)/debian/tmp/usr/share/perl5/*/*.in
-	# remove empty directories:
-	find $(CURDIR)/debian/tmp/usr -type d -empty -delete -printf 'removed %p\n'
-	# remove extra-license-file:
-	$(RM) -v $(CURDIR)/debian/tmp/usr/share/zoneminder/www/api/lib/Cake/LICENSE.txt
-
-override_dh_fixperms:
-	dh_fixperms
-	#
-	# As requested by the Debian Webapps Policy Manual §3.2.1
-	chown root:www-data $(CURDIR)/debian/zoneminder/etc/zm/zm.conf
-	chmod 640 $(CURDIR)/debian/zoneminder/etc/zm/zm.conf
-
-override_dh_installinit:
-	dh_installinit --no-start
-
-override_dh_apache2:
-	dh_apache2 --noenable
-
-override_dh_strip:
-	[ -d "$(CURDIR)/debian/zoneminder-dbg" ] \
-        && dh_strip --dbg-package=zoneminder-dbg \
-        || dh_strip
-
-#%:
-#	dh $@ --parallel --buildsystem=autoconf --with autoreconf
-#
-#override_dh_auto_configure:
-#	dh_auto_configure -- \
-#            --sysconfdir=/etc/zm \
-#            --with-mysql=/usr \
-#            --with-webdir=/usr/share/zoneminder \
-#            --with-ffmpeg=/usr \
-#            --with-cgidir=/usr/lib/cgi-bin \
-#            --with-webuser=www-data \
-#            --with-webgroup=www-data \
-#            --enable-mmap=yes

distros/ubuntu1204/rules.rej

@@ -1,28 +0,0 @@
---- distros/ubuntu1204/rules
-+++ distros/ubuntu1204/rules
-@@ -58,8 +58,10 @@ override_dh_auto_install:
- 
- override_dh_fixperms:
- 	dh_fixperms
--	## 637685
--	chmod -c o-r $(CURDIR)/debian/zoneminder/etc/zm/zm.conf
-+	#
-+	# As requested by the Debian Webapps Policy Manual §3.2.1
-+	chown root:www-data debian/zoneminder-core/etc/zm/zm.conf
-+	chmod 640 debian/zoneminder-core/etc/zm/zm.conf
- 
- override_dh_installinit:
- 	dh_installinit --no-start
---- distros/ubuntu1204/rules
-+++ distros/ubuntu1204/rules
-@@ -60,8 +60,8 @@ override_dh_fixperms:
- 	dh_fixperms
- 	#
- 	# As requested by the Debian Webapps Policy Manual §3.2.1
--	chown root:www-data debian/zoneminder-core/etc/zm/zm.conf
--	chmod 640 debian/zoneminder-core/etc/zm/zm.conf
-+	chown root:www-data $(CURDIR)/debian/zoneminder/etc/zm/zm.conf
-+	chmod 640 $(CURDIR)/debian/zoneminder/etc/zm/zm.conf
- 
- override_dh_installinit:
- 	dh_installinit --no-start

distros/ubuntu1604/control

@@ -28,7 +28,7 @@ Build-Depends: debhelper (>= 9), dh-systemd, python-sphinx | python3-sphinx, apa
 # Unbundled (dh_linktree):
         ,libjs-jquery
         ,libjs-mootools
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: http://www.zoneminder.com/
 Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/zoneminder.git
 Vcs-Git: git://anonscm.debian.org/collab-maint/zoneminder.git

distros/ubuntu1604/patches/default_cgi-path.patch

@@ -1,16 +0,0 @@
-Last-Update: 2015-08-16
-Forwarded: no
-Author: Dmitry Smirnov <onlyjob@member.fsf.org>
-Description: correct path to CGI app according to default web server configuration.
-
---- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
-+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
-@@ -428,7 +428,7 @@ our @options =
-     },
-     {
-         name        => "ZM_PATH_ZMS",
--        default     => "/cgi-bin/nph-zms",
-+        default     => "/zm/cgi-bin/nph-zms",
-         description => "Web path to zms streaming server",
-         help        => qqq("
-             The ZoneMinder streaming server is required to send streamed

distros/ubuntu1604/patches/series

@@ -1,2 +0,0 @@
-default_cgi-path.patch
-use_libjs-mootools.patch

distros/ubuntu1604/patches/use_libjs-mootools.patch

@@ -1,18 +0,0 @@
-Last-Update: 2015-03-29
-Forwarded: no
-Bug-Debian: http://bugs.debian.org/585590
-Reviewed-By: Dmitry Smirnov <onlyjob@member.fsf.org>
-Description: use mootools shipped by debian, rather than the zoneminder included mootools.
-
---- a/web/skins/classic/includes/functions.php
-+++ b/web/skins/classic/includes/functions.php
-@@ -63,9 +63,8 @@
-     }
- ?>
-   <script type="text/javascript" src="tools/mootools/mootools-core.js"></script>
-   <script type="text/javascript" src="tools/mootools/mootools-more.js"></script>
--  <script type="text/javascript" src="js/mootools.ext.js"></script>
-   <script type="text/javascript" src="js/logger.js"></script>
-   <script type="text/javascript" src="js/overlay.js"></script>
- <?php
-     if ( $skinJsPhpFile )

distros/ubuntu1604/rules

@@ -28,7 +28,7 @@ override_dh_auto_configure:
 
 override_dh_clean:
 	dh_clean $(MANPAGES1)
-	$(RM) -r docs/_build docs/installationguide
+	$(RM) -r docs/_build
 
 build-indep:
 	#$(MAKE) -C docs text

utils/do_debian_package.sh

@@ -143,7 +143,7 @@ if [ "$SNAPSHOT" != "stable" ] && [ "$SNAPSHOT" != "" ]; then
   VERSION="$VERSION~$SNAPSHOT";
 fi;
 
-DIRECTORY="zoneminder_$VERSION-$DISTRO${PACKAGE_VERSION}";
+DIRECTORY="zoneminder_$VERSION";
 echo "Doing $TYPE release $DIRECTORY";
 mv "${GITHUB_FORK}_zoneminder_release" "$DIRECTORY.orig";
 cd "$DIRECTORY.orig";
@@ -151,12 +151,12 @@ cd "$DIRECTORY.orig";
 git submodule init
 git submodule update --init --recursive
 if [ "$DISTRO" == "trusty" ] || [ "$DISTRO" == "precise" ]; then 
-	ln -sf distros/ubuntu1204 debian
+	mv distros/ubuntu1204 debian
 else 
   if [ "$DISTRO" == "wheezy" ]; then 
-    ln -sf distros/debian debian
+    mv distros/debian debian
   else 
-    ln -sf distros/ubuntu1604 debian
+    mv distros/ubuntu1604 debian
   fi;
 fi;
 
@@ -194,20 +194,24 @@ zoneminder ($VERSION-$DISTRO${PACKAGE_VERSION}) $DISTRO; urgency=$URGENCY
 EOF
 fi;
 
+rm -rf .git
+rm .gitignore
+cd ../
+tar zcf $DIRECTORY.orig.tar.gz $DIRECTORY.orig
+cd $DIRECTORY.orig
+
+if [ $TYPE == "binary" ]; then
   # Auto-install all ZoneMinder's depedencies using the Debian control file
   sudo apt-get install devscripts equivs
   sudo mk-build-deps -ir ./debian/control
   echo "Status: $?"
-
-#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=debuild
 else
   if [ $TYPE == "local" ]; then
+    # Auto-install all ZoneMinder's depedencies using the Debian control file
+    sudo apt-get install devscripts equivs
+    sudo mk-build-deps -ir ./debian/control
+    echo "Status: $?"
     DEBUILD="debuild -i -us -uc -b"
   else 
     DEBUILD="debuild -S -sa"
@@ -217,7 +221,7 @@ if [ "$DEBSIGN_KEYID" != "" ]; then
   DEBUILD="$DEBUILD -k$DEBSIGN_KEYID"
 fi
 $DEBUILD
-if [ "$?" != "0" ]; then
+if [ $? -ne 0 ]; then
 echo "Error status code is: $?"
   echo "Build failed.";
   exit $?;