merge updates from SA relating to building debian packages

distros/ubuntu1604/control

@@ -5,6 +5,7 @@ Maintainer: Dmitry Smirnov <onlyjob@debian.org>
 Uploaders: Vagrant Cascadian <vagrant@debian.org>
 Build-Depends: debhelper (>= 9), dh-systemd, python-sphinx | python3-sphinx, apache2-dev, dh-linktree
               ,cmake
+              ,libx264-dev, libmp4v2-dev
               ,libboost-dev
               ,libavdevice-dev (>= 6:10~)
               ,libavcodec-dev (>= 6:10~)
@@ -15,7 +16,7 @@ Build-Depends: debhelper (>= 9), dh-systemd, python-sphinx | python3-sphinx, apa
               ,libgcrypt-dev
               ,libcurl4-gnutls-dev
               ,libgnutls-openssl-dev
-              ,libjpeg-dev
+              ,libjpeg8-dev | libjpeg9-dev | libjpeg62-turbo-dev
               ,libmysqlclient-dev
               ,libpcre3-dev
               ,libpolkit-gobject-1-dev
@@ -27,12 +28,10 @@ Build-Depends: debhelper (>= 9), dh-systemd, python-sphinx | python3-sphinx, apa
               ,libsys-mmap-perl [!hurd-any]
               ,libwww-perl
               ,libdata-uuid-perl
-              ,libx264-dev
-              ,libmp4v2-dev
 # 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
@@ -41,11 +40,10 @@ Package: zoneminder
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,javascript-common
+        ,libmp4v2-2, libx264-142|libx264-148, libswscale-ffmpeg3|libswscale4|libswscale3
         ,ffmpeg | libav-tools
-        ,libdate-manip-perl
+        ,libdate-manip-perl, libmime-lite-perl, libmime-tools-perl
         ,libdbd-mysql-perl
-        ,libmime-lite-perl
-        ,libmime-tools-perl
         ,libphp-serialization-perl
         ,libmodule-load-conditional-perl
         ,libnet-sftp-foreign-perl
@@ -66,10 +64,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,libdata-uuid-perl
         ,mysql-client | virtual-mysql-client
         ,perl-modules
-        ,php5-mysql | php-mysql, php5-gd | php-gd, php-apcu, php-apcu-bc | php-gd
+        ,php5-mysql | php-mysql, php5-gd | php-gd , php5-apcu | php-apcu , php-apc | php-apcu-bc
         ,policykit-1
         ,rsyslog | system-log-daemon
         ,zip
+        ,libpcre3
 Recommends: ${misc:Recommends}
            ,libapache2-mod-php5 | libapache2-mod-php | php5-fpm | php-fpm
            ,mysql-server | virtual-mysql-server

distros/ubuntu1604/patches/series

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

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

distros/ubuntu1604/source/format

@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)

distros/ubuntu1604/zoneminder.install

@@ -3,6 +3,7 @@ usr/bin
 usr/lib/zoneminder
 usr/share/polkit-1
 usr/share/zoneminder/db
+usr/share/zoneminder/icons
 usr/share/zoneminder/www
 
 # libzoneminder-perl files:

distros/ubuntu1604/zoneminder.logrotate

@@ -2,6 +2,8 @@
     missingok
     notifempty
     sharedscripts
+    delaycompress
+    compress
     postrotate
         /usr/bin/zmpkg.pl logrot >>/dev/null 2>&1 || :
     endscript

distros/ubuntu1604/zoneminder.menu

@@ -0,0 +1,2 @@
+?package(zoneminder):needs="x11" section="Applications/Video" title="ZoneMinder" command="/usr/bin/x-www-browser http://localhost/zm" icon="/usr/share/zoneminder/icons/16x16/icon.xpm"
+

distros/ubuntu1604/zoneminder.postinst

@@ -12,6 +12,10 @@ if [ "$1" = "configure" ]; then
     if [ -z "$2" ]; then
         chown www-data:www-data /var/cache/zoneminder /var/cache/zoneminder/*
     fi
+    if [ ! -e "/etc/apache2/mods-enabled/cgi.load" ]; then
+      echo "The cgi module is not enabled in apache2.  I am enabling it using a2enmod cgi."
+      a2enmod cgi
+    fi
 
 	# Do this every time the package is installed or upgraded