diff -pruN 7.1.11-1/debian/changelog 7.1.11-0ubuntu2/debian/changelog --- 7.1.11-1/debian/changelog 2017-10-27 13:47:15.000000000 +0000 +++ 7.1.11-0ubuntu2/debian/changelog 2017-11-07 09:01:09.000000000 +0000 @@ -1,32 +1,37 @@ -php7.1 (7.1.11-1) unstable; urgency=medium +php7.1 (7.1.11-0ubuntu2) bionic; urgency=medium - * New upstream version 7.1.11 - * Rebase patches for new upstream release. + * No-change rebuild for icu soname change. - -- Ondřej Surý Fri, 27 Oct 2017 13:47:15 +0000 + -- Matthias Klose Tue, 07 Nov 2017 09:01:09 +0000 -php7.1 (7.1.10-1) unstable; urgency=medium +php7.1 (7.1.11-0ubuntu1) bionic; urgency=medium - * New upstream version 7.1.10 - * Refresh patches for PHP 7.1.10 + * New upstream release (7.1.11) + - LP: #1729036 - -- Ondřej Surý Fri, 29 Sep 2017 19:02:49 +0200 + -- Nishanth Aravamudan Tue, 31 Oct 2017 15:39:09 -0700 -php7.1 (7.1.9-1) unstable; urgency=medium +php7.1 (7.1.10-0ubuntu1) bionic; urgency=medium - * Allow libgcrypt11-dev when it's not a transitional package - * New upstream version 7.1.9 - * Rebase patches on top of PHP 7.1.9 + * New upstream release (7.1.0) + - LP: #1724902 - -- Ondřej Surý Sat, 02 Sep 2017 07:53:00 +0200 + -- Nishanth Aravamudan Fri, 27 Oct 2017 14:17:28 -0700 -php7.1 (7.1.8-2) unstable; urgency=medium +php7.1 (7.1.8-1ubuntu2) bionic; urgency=medium - * Update Vcs-* links to https://gitlab.com/deb.sury.org/... - * Stop depending on obsolete automake1.11 (Closes: #865136) - * Switch build-depends to libgcrypt20-dev (Closes: #864129) + * No-change rebuild for libicu soname change. - -- Ondřej Surý Fri, 04 Aug 2017 11:56:45 +0200 + -- Matthias Klose Wed, 25 Oct 2017 15:45:53 +0000 + +php7.1 (7.1.8-1ubuntu1) artful; urgency=medium + + * Merge with Debian unstable (LP: #1709363). Remaining changes: + - Drop dh-php from Recommends to Suggests so it can be demoted to + universe (LP #1590623). + + dh-php has gained a dependency on xml2 which is in universe. + + -- Nishanth Aravamudan Tue, 08 Aug 2017 08:57:37 -0700 php7.1 (7.1.8-1) unstable; urgency=medium @@ -48,6 +53,15 @@ php7.1 (7.1.7-1) unstable; urgency=mediu -- Ondřej Surý Thu, 06 Jul 2017 11:11:57 +0200 +php7.1 (7.1.6-2ubuntu1) artful; urgency=medium + + * Merge with Debian unstable. Remaining changes: + - Drop dh-php from Recommends to Suggests so it can be demoted to + universe (LP #1590623). + + dh-php has gained a dependency on xml2 which is in universe. + + -- Nishanth Aravamudan Fri, 16 Jun 2017 15:33:57 -0700 + php7.1 (7.1.6-2) unstable; urgency=medium * Add upstream patch to fix broken support for HOST/PATH ini sections @@ -65,6 +79,15 @@ php7.1 (7.1.6-1) unstable; urgency=mediu -- Ondřej Surý Fri, 09 Jun 2017 10:23:49 +0200 +php7.1 (7.1.5-1ubuntu1) artful; urgency=medium + + * Merge with Debian unstable. Remaining changes: + - Drop dh-php from Recommends to Suggests so it can be demoted to + universe (LP #1590623). + + dh-php has gained a dependency on xml2 which is in universe. + + -- Nishanth Aravamudan Wed, 17 May 2017 11:49:51 -0700 + php7.1 (7.1.5-1) unstable; urgency=medium * The default file extension configuration has been changed to add .phar @@ -75,6 +98,14 @@ php7.1 (7.1.5-1) unstable; urgency=mediu -- Ondřej Surý Thu, 11 May 2017 16:06:08 +0200 +php7.1 (7.1.4-2ubuntu1) artful; urgency=medium + + * Drop dh-php from Recommends to Suggests so it can be demoted to + universe (LP #1590623). + + dh-php has gained a dependency on xml2 which is in universe. + + -- Nishanth Aravamudan Thu, 27 Apr 2017 12:44:27 -0700 + php7.1 (7.1.4-2) unstable; urgency=medium * Change Vcs-* URLs to gitlab.sury.org @@ -304,3 +335,5 @@ php7.1 (7.1.0~alpha1-1) experimental; ur * Rebase patches on top of 7.1.0~alpha1 -- Ondřej Surý Fri, 10 Jun 2016 10:56:53 +0200 + + diff -pruN 7.1.11-1/debian/control 7.1.11-0ubuntu2/debian/control --- 7.1.11-1/debian/control 2017-10-27 13:47:15.000000000 +0000 +++ 7.1.11-0ubuntu2/debian/control 2017-10-31 22:39:09.000000000 +0000 @@ -1,12 +1,13 @@ Source: php7.1 Section: php Priority: optional -Maintainer: Debian PHP Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian PHP Maintainers Uploaders: Ondřej Surý , Lior Kaplan Build-Depends: apache2-dev (>= 2.4), autoconf (>= 2.63), - automake, + automake (>= 1.11) | automake1.11, bison, chrpath, debhelper (>= 9), @@ -29,7 +30,7 @@ Build-Depends: apache2-dev (>= 2.4), libevent-dev (>= 1.4.11), libexpat1-dev (>= 1.95.2-2.1), libfreetype6-dev, - libgcrypt20-dev (>> 1.6.3) | libgcrypt11-dev (<< 1.5.4), + libgcrypt11-dev, libgd-dev (>= 2.1.0) | libgd2-dev, libglib2.0-dev, libgmp3-dev, @@ -221,8 +222,8 @@ Depends: autoconf (>= 2.63), ${perl:Depends} Conflicts: ${libtool:Conflicts} Architecture: any -Recommends: dh-php, - pkg-php-tools +Recommends: pkg-php-tools +Suggests: dh-php Description: Files for PHP7.1 module development This package provides the files from the PHP7.1 source needed for compiling additional modules. diff -pruN 7.1.11-1/debian/control.in 7.1.11-0ubuntu2/debian/control.in --- 7.1.11-1/debian/control.in 2017-10-27 13:47:15.000000000 +0000 +++ 7.1.11-0ubuntu2/debian/control.in 2017-10-31 22:39:09.000000000 +0000 @@ -1,12 +1,13 @@ Source: php@PHP_VERSION@ Section: php Priority: optional -Maintainer: Debian PHP Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian PHP Maintainers Uploaders: Ondřej Surý , Lior Kaplan Build-Depends: apache2-dev (>= 2.4), autoconf (>= 2.63), - automake, + automake (>= 1.11) | automake1.11, bison, chrpath, debhelper (>= 9), @@ -29,7 +30,7 @@ Build-Depends: apache2-dev (>= 2.4), libevent-dev (>= 1.4.11), libexpat1-dev (>= 1.95.2-2.1), libfreetype6-dev, - libgcrypt20-dev (>> 1.6.3) | libgcrypt11-dev (<< 1.5.4), + libgcrypt11-dev, libgd-dev (>= 2.1.0) | libgd2-dev, libglib2.0-dev, libgmp3-dev, @@ -221,8 +222,8 @@ Depends: autoconf (>= 2.63), ${perl:Depends} Conflicts: ${libtool:Conflicts} Architecture: any -Recommends: dh-php, - pkg-php-tools +Recommends: pkg-php-tools +Suggests: dh-php Description: Files for PHP@PHP_VERSION@ module development This package provides the files from the PHP@PHP_VERSION@ source needed for compiling additional modules. diff -pruN 7.1.11-1/debian/patches/0001-libtool_fixes.patch 7.1.11-0ubuntu2/debian/patches/0001-libtool_fixes.patch --- 7.1.11-1/debian/patches/0001-libtool_fixes.patch 2017-10-27 13:47:15.000000000 +0000 +++ 7.1.11-0ubuntu2/debian/patches/0001-libtool_fixes.patch 2017-10-31 22:39:09.000000000 +0000 @@ -22,7 +22,7 @@ index 6f10f5a..2bcff8d 100644 dnl TSRM_PTHREAD diff --git a/configure.in b/configure.in -index b702563..3faee8a 100644 +index a48d7da..651c828 100644 --- a/configure.in +++ b/configure.in @@ -1427,8 +1427,6 @@ AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [], [ diff -pruN 7.1.11-1/debian/patches/0003-debian_quirks.patch 7.1.11-0ubuntu2/debian/patches/0003-debian_quirks.patch --- 7.1.11-1/debian/patches/0003-debian_quirks.patch 2017-10-27 13:47:15.000000000 +0000 +++ 7.1.11-0ubuntu2/debian/patches/0003-debian_quirks.patch 2017-10-31 22:39:09.000000000 +0000 @@ -14,7 +14,7 @@ Subject: debian_quirks 8 files changed, 22 insertions(+), 17 deletions(-) diff --git a/configure.in b/configure.in -index 3faee8a..96321da 100644 +index 651c828..0978259 100644 --- a/configure.in +++ b/configure.in @@ -1095,7 +1095,7 @@ if test "$PHP_CLI" = "no"; then @@ -91,7 +91,7 @@ index 0a28d3b..b24f91b 100644 ; Windows: "\path1;\path2" ;include_path = ".;c:\php\includes" diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in -index f5fccfc..bda13c3 100644 +index 7b5863a..4d27709 100644 --- a/sapi/cli/php.1.in +++ b/sapi/cli/php.1.in @@ -365,13 +365,14 @@ Shows configuration for extension diff -pruN 7.1.11-1/debian/patches/0007-extension_api.patch 7.1.11-0ubuntu2/debian/patches/0007-extension_api.patch --- 7.1.11-1/debian/patches/0007-extension_api.patch 2017-10-27 13:47:15.000000000 +0000 +++ 7.1.11-0ubuntu2/debian/patches/0007-extension_api.patch 2017-10-31 22:39:09.000000000 +0000 @@ -8,7 +8,7 @@ Subject: extension_api 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in -index 96321da..bbb118b 100644 +index 0978259..6a7f415 100644 --- a/configure.in +++ b/configure.in @@ -1207,8 +1207,10 @@ ZEND_MODULE_API_NO=`$EGREP '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modul diff -pruN 7.1.11-1/debian/patches/0018-session_save_path.patch 7.1.11-0ubuntu2/debian/patches/0018-session_save_path.patch --- 7.1.11-1/debian/patches/0018-session_save_path.patch 2017-10-27 13:47:15.000000000 +0000 +++ 7.1.11-0ubuntu2/debian/patches/0018-session_save_path.patch 2017-10-31 22:39:09.000000000 +0000 @@ -9,10 +9,10 @@ Subject: session_save_path 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/session/session.c b/ext/session/session.c -index fa392dd..fd33e41 100644 +index d702d1b..27af537 100644 --- a/ext/session/session.c +++ b/ext/session/session.c -@@ -706,7 +706,7 @@ static PHP_INI_MH(OnUpdateRfc1867Freq) /* {{{ */ +@@ -702,7 +702,7 @@ static PHP_INI_MH(OnUpdateRfc1867Freq) /* {{{ */ /* {{{ PHP_INI */ PHP_INI_BEGIN() diff -pruN 7.1.11-1/debian/patches/0019-php-fpm-man-section-and-cleanup.patch 7.1.11-0ubuntu2/debian/patches/0019-php-fpm-man-section-and-cleanup.patch --- 7.1.11-1/debian/patches/0019-php-fpm-man-section-and-cleanup.patch 2017-10-27 13:47:15.000000000 +0000 +++ 7.1.11-0ubuntu2/debian/patches/0019-php-fpm-man-section-and-cleanup.patch 2017-10-31 22:39:09.000000000 +0000 @@ -7,7 +7,7 @@ Subject: php-fpm-man-section-and-cleanup 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/sapi/fpm/php-fpm.8.in b/sapi/fpm/php-fpm.8.in -index cdee4c6..ed733c5 100644 +index cb1224e..794f508 100644 --- a/sapi/fpm/php-fpm.8.in +++ b/sapi/fpm/php-fpm.8.in @@ -139,22 +139,8 @@ The configuration file for the php-fpm daemon. diff -pruN 7.1.11-1/debian/patches/0026-php-5.3.9-gnusrc.patch 7.1.11-0ubuntu2/debian/patches/0026-php-5.3.9-gnusrc.patch --- 7.1.11-1/debian/patches/0026-php-5.3.9-gnusrc.patch 2017-10-27 13:47:15.000000000 +0000 +++ 7.1.11-0ubuntu2/debian/patches/0026-php-5.3.9-gnusrc.patch 2017-10-31 22:39:09.000000000 +0000 @@ -29,7 +29,7 @@ index b816670..61b12a1 100644 /* +----------------------------------------------------------------------+ diff --git a/configure.in b/configure.in -index bbb118b..f3d3045 100644 +index 6a7f415..0ed22a9 100644 --- a/configure.in +++ b/configure.in @@ -136,6 +136,8 @@ AC_DEFUN([PHP_EXT_DIR],[$config_m4_dir])dnl diff -pruN 7.1.11-1/debian/patches/0031-expose_all_built_and_installed_apis.patch 7.1.11-0ubuntu2/debian/patches/0031-expose_all_built_and_installed_apis.patch --- 7.1.11-1/debian/patches/0031-expose_all_built_and_installed_apis.patch 2017-10-27 13:47:15.000000000 +0000 +++ 7.1.11-0ubuntu2/debian/patches/0031-expose_all_built_and_installed_apis.patch 2017-10-31 22:39:09.000000000 +0000 @@ -8,7 +8,7 @@ Subject: expose_all_built_and_installed_ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/man1/php-config.1.in b/scripts/man1/php-config.1.in -index add4959..1bad896 100644 +index d9fa4b0..6ee4982 100644 --- a/scripts/man1/php-config.1.in +++ b/scripts/man1/php-config.1.in @@ -44,7 +44,7 @@ Full path to php CLI or CGI binary diff -pruN 7.1.11-1/debian/patches/0032-Use-system-timezone.patch 7.1.11-0ubuntu2/debian/patches/0032-Use-system-timezone.patch --- 7.1.11-1/debian/patches/0032-Use-system-timezone.patch 2017-10-27 13:47:15.000000000 +0000 +++ 7.1.11-0ubuntu2/debian/patches/0032-Use-system-timezone.patch 2017-10-31 22:39:09.000000000 +0000 @@ -14,10 +14,10 @@ To be used in tandem with use_embedded_t 1 file changed, 17 insertions(+) diff --git a/ext/date/php_date.c b/ext/date/php_date.c -index 933ef3b..e3914e3 100644 +index dcc71a4..d7b53e1 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c -@@ -1011,6 +1011,23 @@ static char* guess_timezone(const timelib_tzdb *tzdb) +@@ -1009,6 +1009,23 @@ static char* guess_timezone(const timelib_tzdb *tzdb) DATEG(timezone_valid) = 1; return DATEG(default_timezone); } diff -pruN 7.1.11-1/debian/patches/0034-php-fpm-do-reload-on-SIGHUP.patch 7.1.11-0ubuntu2/debian/patches/0034-php-fpm-do-reload-on-SIGHUP.patch --- 7.1.11-1/debian/patches/0034-php-fpm-do-reload-on-SIGHUP.patch 2017-10-27 13:47:15.000000000 +0000 +++ 7.1.11-0ubuntu2/debian/patches/0034-php-fpm-do-reload-on-SIGHUP.patch 2017-10-31 22:39:09.000000000 +0000 @@ -53,7 +53,7 @@ index 68cb153..9e0b642 100644 0 > sigaction(SIGQUIT, &act, 0)) { diff --git a/sapi/fpm/php-fpm.8.in b/sapi/fpm/php-fpm.8.in -index ed733c5..59a0c61 100644 +index 794f508..b1bcf08 100644 --- a/sapi/fpm/php-fpm.8.in +++ b/sapi/fpm/php-fpm.8.in @@ -150,7 +150,7 @@ Once started, php-fpm then responds to several POSIX signals: diff -pruN 7.1.11-1/debian/patches/0036-php-5.4.9-fixheader.patch 7.1.11-0ubuntu2/debian/patches/0036-php-5.4.9-fixheader.patch --- 7.1.11-1/debian/patches/0036-php-5.4.9-fixheader.patch 2017-10-27 13:47:15.000000000 +0000 +++ 7.1.11-0ubuntu2/debian/patches/0036-php-5.4.9-fixheader.patch 2017-10-31 22:39:09.000000000 +0000 @@ -8,7 +8,7 @@ Make generated php_config.h constant acr 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in -index f3d3045..763482c 100644 +index 0ed22a9..248b27c 100644 --- a/configure.in +++ b/configure.in @@ -1292,7 +1292,7 @@ fi diff -pruN 7.1.11-1/debian/patches/0042-Remove-W3C-validation-icon-to-not-expose-the-reader-.patch 7.1.11-0ubuntu2/debian/patches/0042-Remove-W3C-validation-icon-to-not-expose-the-reader-.patch --- 7.1.11-1/debian/patches/0042-Remove-W3C-validation-icon-to-not-expose-the-reader-.patch 2017-10-27 13:47:15.000000000 +0000 +++ 7.1.11-0ubuntu2/debian/patches/0042-Remove-W3C-validation-icon-to-not-expose-the-reader-.patch 2017-10-31 22:39:09.000000000 +0000 @@ -8,7 +8,7 @@ Subject: Remove W3C validation icon to n 1 file changed, 5 deletions(-) diff --git a/sapi/fpm/status.html.in b/sapi/fpm/status.html.in -index 77914a6..f7d8588 100644 +index 86492d7..31c31ff 100644 --- a/sapi/fpm/status.html.in +++ b/sapi/fpm/status.html.in @@ -71,11 +71,6 @@ diff -pruN 7.1.11-1/debian/patches/0045-Really-expand-libdir-datadir-into-EXPANDED_LIBDIR-DA.patch 7.1.11-0ubuntu2/debian/patches/0045-Really-expand-libdir-datadir-into-EXPANDED_LIBDIR-DA.patch --- 7.1.11-1/debian/patches/0045-Really-expand-libdir-datadir-into-EXPANDED_LIBDIR-DA.patch 2017-10-27 13:47:15.000000000 +0000 +++ 7.1.11-0ubuntu2/debian/patches/0045-Really-expand-libdir-datadir-into-EXPANDED_LIBDIR-DA.patch 2017-10-31 22:39:09.000000000 +0000 @@ -7,7 +7,7 @@ Subject: Really expand $libdir/$datadir 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in -index 763482c..5c1a556 100644 +index 248b27c..5fae1dc 100644 --- a/configure.in +++ b/configure.in @@ -1254,9 +1254,9 @@ EXPANDED_LOCALSTATEDIR=`eval echo $localstatedir` diff -pruN 7.1.11-1/debian/patches/0049-Fix-check-for-CURL-include-in-M-A-directory.patch 7.1.11-0ubuntu2/debian/patches/0049-Fix-check-for-CURL-include-in-M-A-directory.patch --- 7.1.11-1/debian/patches/0049-Fix-check-for-CURL-include-in-M-A-directory.patch 2017-10-27 13:47:15.000000000 +0000 +++ 7.1.11-0ubuntu2/debian/patches/0049-Fix-check-for-CURL-include-in-M-A-directory.patch 2017-10-31 22:39:09.000000000 +0000 @@ -7,7 +7,7 @@ Subject: Fix check for CURL include in M 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/curl/config.m4 b/ext/curl/config.m4 -index d99c433..6a4369a 100644 +index 2f82c34..f785770 100644 --- a/ext/curl/config.m4 +++ b/ext/curl/config.m4 @@ -6,12 +6,12 @@ PHP_ARG_WITH(curl, for cURL support,