diff -Nru pkg-php-tools-1.32ubuntu1/debian/changelog pkg-php-tools-1.32ubuntu2/debian/changelog --- pkg-php-tools-1.32ubuntu1/debian/changelog 2016-02-28 19:35:11.000000000 -0800 +++ pkg-php-tools-1.32ubuntu2/debian/changelog 2016-03-15 14:29:19.000000000 -0700 @@ -1,3 +1,15 @@ +pkg-php-tools (1.32ubuntu2) xenial; urgency=medium + + * Properly merge with 1.32 release from Debian unstable + (LP: #1557599). Remaining changes: + - tests/PhpcomposerSourceTest.php: update php-json error message + (Debian Bug #814858). + * Drop: + - Add php-xml as Build-dep and test dep. + [ Fixed in Debian.] + + -- Nishanth Aravamudan Tue, 15 Mar 2016 14:19:31 -0700 + pkg-php-tools (1.32ubuntu1) xenial; urgency=medium * tests/PhpcomposerSourceTest.php: update php-json error message @@ -10,14 +22,21 @@ pkg-php-tools (1.32) unstable; urgency=medium [ Ondřej Surý ] - * Convert package to PHP 7.0 naming + * Convert package to PHP 7.0 naming (Closes: #814858) * Make php-common always unversioned (for now) * Use preg_replace instead of ereg_replace [ Mathieu Parent ] * Fix test on unversioned php-common + * extensions DOM, SimpleXML, WDDX, XML, and XSL are now in php-xml: + - fix Build-Depends and Depends (Closes: #816288) + - fix overrides + * Extensions bcmath, bz2, mbstring, soap and zip are no longer builtin + (Closes: #815988) + * Standards-Version: 3.9.7: no change + * Use secure Vcs-* fields - -- Mathieu Parent Sun, 21 Feb 2016 22:14:18 +0100 + -- Mathieu Parent Wed, 02 Mar 2016 22:46:31 +0100 pkg-php-tools (1.31) unstable; urgency=medium diff -Nru pkg-php-tools-1.32ubuntu1/debian/control pkg-php-tools-1.32ubuntu2/debian/control --- pkg-php-tools-1.32ubuntu1/debian/control 2016-02-28 19:36:19.000000000 -0800 +++ pkg-php-tools-1.32ubuntu2/debian/control 2016-03-15 14:24:00.000000000 -0700 @@ -10,13 +10,13 @@ php-cli, php-json, php-xml -Vcs-Git: git://anonscm.debian.org/pkg-php/pkg-php-tools.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-php/pkg-php-tools.git;a=summary -Standards-Version: 3.9.6 +Vcs-Git: https://anonscm.debian.org/git/pkg-php/pkg-php-tools.git +Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-php/pkg-php-tools.git;a=summary +Standards-Version: 3.9.7 Package: pkg-php-tools Architecture: all -Depends: debhelper, php-pear, php-cli, php-json, ${misc:Depends} +Depends: debhelper, php-pear, php-cli, php-json, php-xml, ${misc:Depends} Suggests: dh-make Description: various packaging tools and scripts for PHP packages Provide an easy way to package PHP PEAR, PECL and Composer packages: Run diff -Nru pkg-php-tools-1.32ubuntu1/debian/tests/control pkg-php-tools-1.32ubuntu2/debian/tests/control --- pkg-php-tools-1.32ubuntu1/debian/tests/control 2016-02-28 19:35:11.000000000 -0800 +++ pkg-php-tools-1.32ubuntu2/debian/tests/control 2016-03-15 14:23:44.000000000 -0700 @@ -1,3 +1,3 @@ Test-Command: phpunit --no-configuration --bootstrap tests/autoload-installed.php ./tests Restrictions: allow-stderr -Depends: @, php-xml, phpunit +Depends: @, phpunit diff -Nru pkg-php-tools-1.32ubuntu1/share/php/pkgtools/base/overrides.php pkg-php-tools-1.32ubuntu2/share/php/pkgtools/base/overrides.php --- pkg-php-tools-1.32ubuntu1/share/php/pkgtools/base/overrides.php 2016-02-28 19:31:50.000000000 -0800 +++ pkg-php-tools-1.32ubuntu2/share/php/pkgtools/base/overrides.php 2016-03-15 14:18:44.000000000 -0700 @@ -68,12 +68,12 @@ // Builtin extensions $builtin_extensions = Array( // Statically compiled extensions - 'bcmath', 'bz2', 'calendar', 'core', 'ctype', 'date', 'dba', 'dom', + 'calendar', 'core', 'ctype', 'date', 'dba', 'ereg', 'exif', 'fileinfo', 'filter', 'ftp', 'gettext', 'hash', - 'iconv', 'libxml', 'mbstring', 'openssl', 'pcntl', 'pcre', 'phar', 'posix', - 'reflection', 'session', 'shmop', 'simplexml', 'soap', 'sockets', + 'iconv', 'libxml', 'openssl', 'pcntl', 'pcre', 'phar', 'posix', + 'reflection', 'session', 'shmop', 'sockets', 'spl', 'standard', 'sysvmsg', 'sysvsem', 'sysvshm', 'tokenizer', - 'wddx', 'xml', 'xmlreader', 'xmlwriter', 'zip', 'zlib', + 'xmlreader', 'xmlwriter', 'zlib', // Dynamically compiled extensions 'pdo', // Extensions provided or no longer builtin diff -Nru pkg-php-tools-1.32ubuntu1/share/pkg-php-tools/overrides/common pkg-php-tools-1.32ubuntu2/share/pkg-php-tools/overrides/common --- pkg-php-tools-1.32ubuntu1/share/pkg-php-tools/overrides/common 2016-02-28 19:31:50.000000000 -0800 +++ pkg-php-tools-1.32ubuntu2/share/pkg-php-tools/overrides/common 2016-03-15 14:18:44.000000000 -0700 @@ -1,4 +1,8 @@ extension mysqli php-mysql +extension dom php-xml +extension simplexml php-xml +extension wddx php-xml +extension xsl php-xml extension com none pecl.php.net APC php-apcu pear.phpunit.de PHPUnit phpunit