diff -Nru civicrm-4.7.19+dfsg/debian/changelog civicrm-4.7.19+dfsg/debian/changelog --- civicrm-4.7.19+dfsg/debian/changelog 2017-05-21 17:31:51.000000000 -0500 +++ civicrm-4.7.19+dfsg/debian/changelog 2017-06-21 18:27:12.000000000 -0500 @@ -1,3 +1,10 @@ +civicrm (4.7.19+dfsg-1ubuntu1) artful; urgency=medium + + * Merge from Debian Sid (LP: #1699623). Remaining changes: + - Update to PHP 7.0 dependencies. + + -- Simon Quigley Wed, 21 Jun 2017 18:27:12 -0500 + civicrm (4.7.19+dfsg-1) unstable; urgency=medium * New upstream release [May 2017]. @@ -11,6 +18,13 @@ -- Dmitry Smirnov Mon, 20 Mar 2017 00:08:39 +1100 +civicrm (4.7.14+dfsg-1ubuntu1) zesty; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Update to PHP7.0 dependencies + + -- Bhavani Shankar Mon, 02 Jan 2017 10:39:42 +0530 + civicrm (4.7.14+dfsg-1) unstable; urgency=medium * New upstream release [December 2016]. @@ -23,6 +37,13 @@ -- Dmitry Smirnov Thu, 29 Dec 2016 07:31:51 +1100 +civicrm (4.7.8+dfsg-1ubuntu1) yakkety; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Update to PHP7.0 dependencies + + -- Steve Langasek Thu, 07 Jul 2016 17:23:16 -0700 + civicrm (4.7.8+dfsg-1) unstable; urgency=medium * New upstream release [June 2016]. @@ -68,6 +89,12 @@ -- Dmitry Smirnov Thu, 18 Feb 2016 14:29:59 +1100 +civicrm (4.7.1+dfsg-2ubuntu1) xenial; urgency=medium + + * Update to PHP7.0 dependencies (LP: #1544352). + + -- Nishanth Aravamudan Tue, 22 Mar 2016 16:00:29 -0700 + civicrm (4.7.1+dfsg-2) unstable; urgency=medium * Removed packages from Build-Depends: diff -Nru civicrm-4.7.19+dfsg/debian/control civicrm-4.7.19+dfsg/debian/control --- civicrm-4.7.19+dfsg/debian/control 2017-05-21 17:31:51.000000000 -0500 +++ civicrm-4.7.19+dfsg/debian/control 2017-06-21 18:19:26.000000000 -0500 @@ -1,7 +1,8 @@ Source: civicrm Section: web Priority: optional -Maintainer: Dmitry Smirnov +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Dmitry Smirnov Build-Depends: debhelper (>= 9), pkg-php-tools (>= 1.14~), dh-linktree # unbundled: ,fonts-font-awesome @@ -75,7 +76,7 @@ # ,libjs-jquery (>= 1.11.3~) ,libjs-jquery-ui (>= 1.10.1~) ,php-seclib -Recommends: xvfb, wkhtmltopdf (>= 0.12.1), civicrm-l10n, php5-curl +Recommends: xvfb, wkhtmltopdf (>= 0.12.1), civicrm-l10n, php-curl Suggests: ${phpcomposer:Debian-suggest} ,drupal7-mod-civicrm | wordpress-civicrm Description: CiviCRM common files --- civicrm-4.7.19+dfsg/debian/patches/series 2017-05-21 17:31:51.000000000 -0500 +++ civicrm-4.7.19+dfsg/debian/patches/series 2017-06-21 18:16:18.000000000 -0500 @@ -6,3 +6,4 @@ seclib-system.patch #symfony-bundled.patch symfony-system.patch +update-for-php7.0.patch diff -Nru civicrm-4.7.19+dfsg/debian/patches/update-for-php7.0.patch civicrm-4.7.19+dfsg/debian/patches/update-for-php7.0.patch --- civicrm-4.7.19+dfsg/debian/patches/update-for-php7.0.patch 1969-12-31 18:00:00.000000000 -0600 +++ civicrm-4.7.19+dfsg/debian/patches/update-for-php7.0.patch 2017-06-21 18:27:12.000000000 -0500 @@ -0,0 +1,27 @@ +Description: Update to PHP7.0 package names +Author: Nishanth Aravamudan +Bug-Debian: https://bugs.debian.org/1544352 + +--- a/CRM/Utils/Array.php ++++ b/CRM/Utils/Array.php +@@ -518,7 +518,7 @@ class CRM_Utils_Array { + * Uses Collate from the PECL "intl" package, if available, for UTF-8 + * sorting (e.g. list of countries). Otherwise calls PHP's asort(). + * +- * On Debian/Ubuntu: apt-get install php5-intl ++ * On Debian/Ubuntu: apt-get install php-intl + * + * @param array $array + * (optional) Array to be sorted. +--- a/packages/kcfinder/conf/upload.htaccess ++++ b/packages/kcfinder/conf/upload.htaccess +@@ -7,6 +7,9 @@ + + php_flag engine Off + ++ ++ php_flag engine Off ++ + + Options -ExecCGI +