diff -Nru php7.0-7.0.4/debian/changelog php7.0-7.0.4/debian/changelog --- php7.0-7.0.4/debian/changelog 2016-03-03 02:42:05.000000000 -0800 +++ php7.0-7.0.4/debian/changelog 2016-03-04 16:21:42.000000000 -0800 @@ -1,3 +1,19 @@ +php7.0 (7.0.4-1ubuntu1) xenial; urgency=medium + + * Merge with Debian unstable (LP: #1553419). Remaining changes: + - Drop support for firebird, c-client, mcrypt, onig, qdbm and zip as + they are in universe: + + d/control: drop Build-Depends on firebird-dev, libc-client-dev, + libmcrypt-dev, libonig-dev, libqdbm-dev and libzip-dev. + + d/control: drop binary packages php7.0-imap, php7.0-interbase, + php7.0-mcrypt and php7.0-zip and their reverse dependencies. + + d/rules.d: drop makefile snippets for imap, interbase, mcrypt + and zip extensions. + - d/control: switch Build-Depends of netcat-traditional to + netcat-openbsd as only the latter is in main. + + -- Nishanth Aravamudan Fri, 04 Mar 2016 16:20:17 -0800 + php7.0 (7.0.4-1) unstable; urgency=medium * php7.0 7.0.3-14 @@ -57,6 +73,34 @@ -- Ondřej Surý Tue, 23 Feb 2016 17:45:41 +0100 +php7.0 (7.0.3-7ubuntu1) xenial; urgency=medium + + * Merge with Debian unstable. Remaining changes: + - Drop support for firebird, c-client, mcrypt, onig, qdbm and zip as + they are in universe (LP #1547245): + + d/control: drop Build-Depends on firebird-dev, libc-client-dev, + libmcrypt-dev, libonig-dev, libqdbm-dev, libxmlrpc-epi and + libzip-dev. + + d/control: drop binary packages php7.0-imap, php7.0-interbase, + php7.0-mcrypt and php7.0-xmlrpc and their reverse dependencies. + + d/rules.d: drop makefile snippets for imap, interbase, mcrypt + and xmlrpc extensions. + - d/control: switch Build-Depends of netcat-traditional to + netcat-openbsd as only the latter is in main. + * Dropped changes: + - Drop support for xmlrpc as it is in universe (LP #1547700): + + d/control: drop Build-Depends on libxmlrpc-epi + + d/control: drop binary package php7.0-xmlrpc and its reverse + dependencies. + + d/rules.d: drop makefile snippet for xmlrpc extension. + - d/rules: drop configuration of qdgm and zip. + + dropped in Debian. + * Drop support for zip as it is in universe (LP: #1547245). + - d/control: drop binary package php7.0-zip. + - d/rules.d: drop makefile snippet for zip extension. + + -- Nishanth Aravamudan Tue, 23 Feb 2016 15:02:28 -0800 + php7.0 (7.0.3-7) unstable; urgency=medium * bz2 extension pulls libbz2-1.0, so it's better to have it in separate @@ -94,6 +138,23 @@ -- Ondřej Surý Tue, 23 Feb 2016 07:49:00 +0100 +php7.0 (7.0.3-5ubuntu1) xenial; urgency=medium + + * Drop support for firebird, c-client, mcrypt, onig, qdbm, xmlrpc and + zip as they are in universe (LP: #1547245): + - d/control: drop Build-Depends on firebird-dev, libc-client-dev, + libmcrypt-dev, libonig-dev, libqdbm-dev, libxmlrpc-epi and + libzip-dev. + - d/control: drop binary packages php7.0-imap, php7.0-interbase, + php7.0-mcrypt and php7.0-xmlrpc and their reverse dependencies. + - d/rules: drop configuration of qdgm and zip. + - d/rules.d: drop makefile snippets for imap, interbase, mcrypt and + xmlrpc extensions. + * d/control: switch Build-Depends of netcat-traditional to + netcat-openbsd as only the latter is in main. + + -- Nishanth Aravamudan Thu, 18 Feb 2016 16:11:00 -0800 + php7.0 (7.0.3-5) unstable; urgency=medium [ Neal Gompa ] diff -Nru php7.0-7.0.4/debian/control php7.0-7.0.4/debian/control --- php7.0-7.0.4/debian/control 2016-03-03 02:42:05.000000000 -0800 +++ php7.0-7.0.4/debian/control 2016-03-04 16:23:30.000000000 -0800 @@ -1,7 +1,8 @@ Source: php7.0 Section: php Priority: optional -Maintainer: Debian PHP Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian PHP Maintainers Uploaders: Ondřej Surý , Thijs Kinkhorst , Lior Kaplan @@ -14,13 +15,11 @@ dh-apache2, dh-systemd (>= 1.3), dpkg-dev (>= 1.16.1~), - firebird-dev [!hurd-any !m68k !hppa !ppc64] | firebird2.5-dev [!hurd-any !m68k !hppa !ppc64] | firebird2.1-dev [!hurd-any !m68k !hppa !ppc64], flex, freetds-dev, libapparmor-dev, libapr1-dev (>= 1.2.7-8), libbz2-dev, - libc-client-dev, libcurl4-openssl-dev | libcurl-dev, libdb-dev, libedit-dev (>= 2.11-20080614-4), @@ -37,16 +36,13 @@ libkrb5-dev, libldap2-dev, libmagic-dev, - libmcrypt-dev, libmhash-dev (>= 0.8.8), libmysqlclient-dev | libmysqlclient15-dev, - libonig-dev, libpam0g-dev, libpcre3-dev (>= 6.6), libpng-dev, libpq-dev, libpspell-dev, - libqdbm-dev, librecode-dev, libsasl2-dev, libsnmp-dev, @@ -61,11 +57,10 @@ libxmlrpc-epi-dev, libxmltok1-dev, libxslt1-dev (>= 1.0.18), - libzip-dev, locales-all | language-pack-de, mysql-server | virtual-mysql-server, netbase, - netcat-traditional, + netcat-openbsd | netcat, re2c, systemtap-sdt-dev [amd64 i386 powerpc armel armhf ia64], tzdata, @@ -425,28 +420,6 @@ open source general-purpose scripting language that is especially suited for web development and can be embedded into HTML. -Package: php7.0-zip -Architecture: any -Depends: php-common (>= 1:33), - ucf, - ${misc:Depends}, - ${php:Depends}, - ${php-zip:Depends}, - ${shlibs:Depends} -Pre-Depends: ${misc:Pre-Depends}, - ${php-zip:Pre-Depends} -Built-Using: ${php:Built-Using} -Replaces: ${php-zip:Replaces} -Breaks: ${php-zip:Breaks} -Conflicts: ${php-zip:Conflicts} -Provides: ${php-zip:Provides} -Description: Zip module for PHP - This package provides the Zip module(s) for PHP. - . - PHP (recursive acronym for PHP: Hypertext Preprocessor) is a widely-used - open source general-purpose scripting language that is especially suited - for web development and can be embedded into HTML. - Package: php7.0-sybase Architecture: any Depends: php-common (>= 1:33), @@ -535,28 +508,6 @@ open source general-purpose scripting language that is especially suited for web development and can be embedded into HTML. -Package: php7.0-interbase -Architecture: any -Depends: php-common (>= 1:33), - ucf, - ${misc:Depends}, - ${php:Depends}, - ${php-interbase:Depends}, - ${shlibs:Depends} -Pre-Depends: ${misc:Pre-Depends}, - ${php-interbase:Pre-Depends} -Built-Using: ${php:Built-Using} -Replaces: ${php-interbase:Replaces} -Breaks: ${php-interbase:Breaks} -Conflicts: ${php-interbase:Conflicts} -Provides: ${php-interbase:Provides} -Description: Interbase module for PHP - This package provides the Interbase module(s) for PHP. - . - PHP (recursive acronym for PHP: Hypertext Preprocessor) is a widely-used - open source general-purpose scripting language that is especially suited - for web development and can be embedded into HTML. - Package: php7.0-intl Architecture: any Depends: php-common (>= 1:33), @@ -601,28 +552,6 @@ open source general-purpose scripting language that is especially suited for web development and can be embedded into HTML. -Package: php7.0-mcrypt -Architecture: any -Depends: php-common (>= 1:33), - ucf, - ${misc:Depends}, - ${php:Depends}, - ${php-mcrypt:Depends}, - ${shlibs:Depends} -Pre-Depends: ${misc:Pre-Depends}, - ${php-mcrypt:Pre-Depends} -Built-Using: ${php:Built-Using} -Replaces: ${php-mcrypt:Replaces} -Breaks: ${php-mcrypt:Breaks} -Conflicts: ${php-mcrypt:Conflicts} -Provides: ${php-mcrypt:Provides} -Description: libmcrypt module for PHP - This package provides the libmcrypt module(s) for PHP. - . - PHP (recursive acronym for PHP: Hypertext Preprocessor) is a widely-used - open source general-purpose scripting language that is especially suited - for web development and can be embedded into HTML. - Package: php7.0-snmp Architecture: any Depends: php-common (>= 1:33), @@ -753,28 +682,6 @@ . PHP (recursive acronym for PHP: Hypertext Preprocessor) is a widely-used open source general-purpose scripting language that is especially suited - for web development and can be embedded into HTML. - -Package: php7.0-imap -Architecture: any -Depends: php-common (>= 1:33), - ucf, - ${misc:Depends}, - ${php:Depends}, - ${php-imap:Depends}, - ${shlibs:Depends} -Pre-Depends: ${misc:Pre-Depends}, - ${php-imap:Pre-Depends} -Built-Using: ${php:Built-Using} -Replaces: ${php-imap:Replaces} -Breaks: ${php-imap:Breaks} -Conflicts: ${php-imap:Conflicts} -Provides: ${php-imap:Provides} -Description: IMAP module for PHP - This package provides the IMAP module(s) for PHP. - . - PHP (recursive acronym for PHP: Hypertext Preprocessor) is a widely-used - open source general-purpose scripting language that is especially suited for web development and can be embedded into HTML. Package: php7.0-bz2 diff -Nru php7.0-7.0.4/debian/control.in php7.0-7.0.4/debian/control.in --- php7.0-7.0.4/debian/control.in 2016-03-03 02:42:05.000000000 -0800 +++ php7.0-7.0.4/debian/control.in 2016-03-04 16:23:30.000000000 -0800 @@ -1,7 +1,8 @@ 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ý , Thijs Kinkhorst , Lior Kaplan diff -Nru php7.0-7.0.4/debian/rules.d/ext-imap.mk php7.0-7.0.4/debian/rules.d/ext-imap.mk --- php7.0-7.0.4/debian/rules.d/ext-imap.mk 2016-03-03 02:42:05.000000000 -0800 +++ php7.0-7.0.4/debian/rules.d/ext-imap.mk 1969-12-31 16:00:00.000000000 -0800 @@ -1,8 +0,0 @@ -ext_PACKAGES += imap -imap_DESCRIPTION := IMAP -imap_EXTENSIONS := imap -imap_config := --with-imap=shared,/usr \ - --with-kerberos \ - --with-imap-ssl=yes -export imap_EXTENSIONS -export imap_DESCRIPTION diff -Nru php7.0-7.0.4/debian/rules.d/ext-interbase.mk php7.0-7.0.4/debian/rules.d/ext-interbase.mk --- php7.0-7.0.4/debian/rules.d/ext-interbase.mk 2016-03-03 02:42:05.000000000 -0800 +++ php7.0-7.0.4/debian/rules.d/ext-interbase.mk 1969-12-31 16:00:00.000000000 -0800 @@ -1,9 +0,0 @@ -ifneq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),hurd-i386 m68k hppa ppc64)) - ext_PACKAGES += interbase - interbase_DESCRIPTION := Interbase - interbase_EXTENSIONS := interbase pdo_firebird - interbase_config := --with-interbase=shared,/usr - pdo_firebird_config := --with-pdo-firebird=shared,/usr - export interbase_EXTENSIONS - export interbase_DESCRIPTION -endif diff -Nru php7.0-7.0.4/debian/rules.d/ext-mcrypt.mk php7.0-7.0.4/debian/rules.d/ext-mcrypt.mk --- php7.0-7.0.4/debian/rules.d/ext-mcrypt.mk 2016-03-03 02:42:05.000000000 -0800 +++ php7.0-7.0.4/debian/rules.d/ext-mcrypt.mk 1969-12-31 16:00:00.000000000 -0800 @@ -1,7 +0,0 @@ -ext_PACKAGES += mcrypt -mcrypt_DESCRIPTION := libmcrypt -mcrypt_EXTENSIONS := mcrypt -mcrypt_config := --with-mcrypt=shared,/usr -export mcrypt_EXTENSIONS -export mcrypt_DESCRIPTION - diff -Nru php7.0-7.0.4/debian/rules.d/ext-zip.mk php7.0-7.0.4/debian/rules.d/ext-zip.mk --- php7.0-7.0.4/debian/rules.d/ext-zip.mk 2016-03-03 02:42:05.000000000 -0800 +++ php7.0-7.0.4/debian/rules.d/ext-zip.mk 1969-12-31 16:00:00.000000000 -0800 @@ -1,9 +0,0 @@ -ext_PACKAGES += zip -zip_DESCRIPTION := Zip -zip_EXTENSIONS := zip -zip_config = \ - --enable-zip=shared \ - --with-zlib-dir=/usr \ - --with-libzip=/usr -export zip_EXTENSIONS -export zip_DESCRIPTION