diff -Nru mythtv-0.28.0+fixes.20160321.39e409d/debian/changelog mythtv-0.28.0+fixes.20160321.39e409d/debian/changelog --- mythtv-0.28.0+fixes.20160321.39e409d/debian/changelog 2016-03-24 07:00:53.000000000 -0700 +++ mythtv-0.28.0+fixes.20160321.39e409d/debian/changelog 2016-03-25 15:30:55.000000000 -0700 @@ -1,3 +1,11 @@ +mythtv (2:0.28.0+fixes.20160321.39e409d-0ubuntu3) xenial; urgency=medium + + * Update to PHP7.0 dependencies (LP: #1562184). + * debian/patches/update_mythweb_for_php7.patch: Update documentation + and nginx configuration for php7.0. + + -- Nishanth Aravamudan Fri, 25 Mar 2016 15:29:35 -0700 + mythtv (2:0.28.0+fixes.20160321.39e409d-0ubuntu2) xenial; urgency=medium * Fix apache2 dependency to prevent aolserver4 coming into ISO. diff -Nru mythtv-0.28.0+fixes.20160321.39e409d/debian/control mythtv-0.28.0+fixes.20160321.39e409d/debian/control --- mythtv-0.28.0+fixes.20160321.39e409d/debian/control 2016-03-24 07:00:34.000000000 -0700 +++ mythtv-0.28.0+fixes.20160321.39e409d/debian/control 2016-03-25 15:27:43.000000000 -0700 @@ -462,8 +462,8 @@ Package: mythweb Architecture: all Depends: mythtv-common (>= ${binary:Version}), - apache2 | httpd, php5 | libapache2-mod-php5, - php5-mysql, + apache2 | httpd, php | libapache2-mod-php, + php-mysql, php-mythtv, libhttp-date-perl, libjs-prototype, diff -Nru mythtv-0.28.0+fixes.20160321.39e409d/debian/control.in mythtv-0.28.0+fixes.20160321.39e409d/debian/control.in --- mythtv-0.28.0+fixes.20160321.39e409d/debian/control.in 2016-03-24 07:00:26.000000000 -0700 +++ mythtv-0.28.0+fixes.20160321.39e409d/debian/control.in 2016-03-25 15:27:47.000000000 -0700 @@ -462,8 +462,8 @@ Package: mythweb Architecture: all Depends: mythtv-common (>= ${binary:Version}), - apache2 | httpd, php5 | libapache2-mod-php5, - php5-mysql, + apache2 | httpd, php | libapache2-mod-php, + php-mysql, php-mythtv, libhttp-date-perl, libjs-prototype, diff -Nru mythtv-0.28.0+fixes.20160321.39e409d/debian/mythweb.install mythtv-0.28.0+fixes.20160321.39e409d/debian/mythweb.install --- mythtv-0.28.0+fixes.20160321.39e409d/debian/mythweb.install 2016-03-21 08:02:01.000000000 -0700 +++ mythtv-0.28.0+fixes.20160321.39e409d/debian/mythweb.install 2016-03-25 15:24:21.000000000 -0700 @@ -1,4 +1,4 @@ mythplugins/mythweb usr/share/mythtv #These are added in from debian/ -debian/20-mythweb.ini etc/php5/apache2/conf.d +debian/20-mythweb.ini etc/php/7.0/apache2/conf.d diff -Nru mythtv-0.28.0+fixes.20160321.39e409d/debian/patches/series mythtv-0.28.0+fixes.20160321.39e409d/debian/patches/series --- mythtv-0.28.0+fixes.20160321.39e409d/debian/patches/series 2016-03-21 08:02:01.000000000 -0700 +++ mythtv-0.28.0+fixes.20160321.39e409d/debian/patches/series 2016-03-25 15:26:43.000000000 -0700 @@ -10,3 +10,4 @@ ##mythplugins## configure_mythplugins_without_mythtv_installed.patch pass_ldflags_qmake.patch +update_mythweb_for_php7.patch diff -Nru mythtv-0.28.0+fixes.20160321.39e409d/debian/patches/update_mythweb_for_php7.patch mythtv-0.28.0+fixes.20160321.39e409d/debian/patches/update_mythweb_for_php7.patch --- mythtv-0.28.0+fixes.20160321.39e409d/debian/patches/update_mythweb_for_php7.patch 1969-12-31 16:00:00.000000000 -0800 +++ mythtv-0.28.0+fixes.20160321.39e409d/debian/patches/update_mythweb_for_php7.patch 2016-03-25 15:27:27.000000000 -0700 @@ -0,0 +1,26 @@ +Description: Update documentation and nginx configuration for php7.0 +Author: Nishanth Aravamudan +Bug-Ubuntu: https://launchpad.net/bugs/1562184 + +--- mythtv-0.28.0+fixes.20160321.39e409d.orig/mythplugins/mythweb/INSTALL ++++ mythtv-0.28.0+fixes.20160321.39e409d/mythplugins/mythweb/INSTALL +@@ -447,7 +447,7 @@ create the credentials with htpasswd. + + 3. Make sure php-fpm is installed and running. + +-# apt-get install php5-fpm ++# apt-get install php-fpm + + 4. Restart nginx + +--- mythtv-0.28.0+fixes.20160321.39e409d.orig/mythplugins/mythweb/mythweb.conf.nginx ++++ mythtv-0.28.0+fixes.20160321.39e409d/mythplugins/mythweb/mythweb.conf.nginx +@@ -39,7 +39,7 @@ server { + fastcgi_param db_name mythconverg; + fastcgi_param db_login mythtv; + fastcgi_param db_password mythtv; +- fastcgi_pass unix:/var/run/php5-fpm.sock; ++ fastcgi_pass unix:/var/run/php-fpm.sock; + } + + # Required rewrite rules