php7.0: re-add binary packages with universe dependencies

Steve,

With php7.0:7.0.3-9ubuntu2 in main and php-universe-source7.0:7.0.3-9ubuntu2 in universe, all the Debian php7.0 binary packages are now buildable in Ubuntu. I am not sure if the naming is great and I tried to minimize the Makefile-fu used, but it does make the creation of the php-universe-source packages trivial (really just a twiddle of a flag, plus the added deps and renames).

Note also that the orig.tar.xz is identical between the two sources, just the Debian naming rules require it to be copied.

Sorry for the churn, I had forgotten to fold up a changelog entry properly.

Also, I'm not sure if the new package will need a FFe, as while it's adding new features, it's doing so in order to replace features that were lost in the previous php7.0 builds, with the understanding we would add them back. I can file a FFe, though, with that reasoning, if desired.

The attachment "php7.0_7.0.3-9ubuntu1.7.0.3-9ubuntu2.debdiff" seems to be a debdiff. The ubuntu-sponsors team has been subscribed to the bug report so that they can review and hopefully sponsor the debdiff. If the attachment isn't a patch, please remove the "patch" flag from the attachment, remove the "patch" tag, and if you are member of the ~ubuntu-sponsors, unsubscribe the team.

[This is an automated message performed by a Launchpad user owned by ~brian-murray, for any issue please contact him.]

And once php7.0 + php-universe-source7.0 are present at these versions, we can sync php-defaults (the delta therein is due to dropping the 4 binary packages that are now present in universe)

+ifeq ($(WITH_UNIVERSE),yes)
+DH_OPTIONS+=$(addprefix -N,$(shell dh_listpackages | grep -v $(addprefix -e ,$(UNIVERSE_PACKAGES))))
+else
+DH_OPTIONS+=$(addprefix -N,$(shell dh_listpackages | grep $(addprefix -e ,$(UNIVERSE_PACKAGES))))
+endif

debhelper also supports -p options to specify which packages it works on, as opposed to -N to specify packages to exclude. Couldn't this be written more succinctly as:

 ifeq ($(WITH_UNIVERSE),yes)
 DH_OPTIONS+=$(addprefix -p,$(UNIVERSE_PACKAGES))
 else
 DH_OPTIONS+=$(addprefix -N,$(UNIVERSE_PACKAGES))
 endif

?

On 11.03.2016 [18:06:10 -0000], Steve Langasek wrote:
> +ifeq ($(WITH_UNIVERSE),yes)
> +DH_OPTIONS+=$(addprefix -N,$(shell dh_listpackages | grep -v $(addprefix -e ,$(UNIVERSE_PACKAGES))))
> +else
> +DH_OPTIONS+=$(addprefix -N,$(shell dh_listpackages | grep $(addprefix -e ,$(UNIVERSE_PACKAGES))))
> +endif
>
> debhelper also supports -p options to specify which packages it works
> on, as opposed to -N to specify packages to exclude. Couldn't this be
> written more succinctly as:
>
> ifeq ($(WITH_UNIVERSE),yes)
> DH_OPTIONS+=$(addprefix -p,$(UNIVERSE_PACKAGES))
> else
> DH_OPTIONS+=$(addprefix -N,$(UNIVERSE_PACKAGES))
> endif
>
> ?

Yes, probably! Sorry, I was basing my changes off the Trusty
boost/boost-mpi split. I'll try to update to the above and provide a
debdiff.

Thanks, this looks good. I've made just a few small adjustments:
 - smash the version to 7.0.3-9ubuntu2. This hasn't been uploaded to the archive, so no reason to use 9ubuntu3.
 - drop some extra variables in debian/rules (nullstring, space) that were added but are no longer needed.
 - consolidate some of the references to $(WITH_UNIVERSE) in debian/rules to shrink the diff.
 - make sure to install the changelog file in the universe packages.
 - use rm -f on debian/tests/control, so that this doesn't fail if the file is already removed.
 - (php-universe-source only) delete the Testsuite field, since there are no tests for this package.

Attached my delta between your 7.0.3-9ubuntu3 and the 7.0.3-9ubuntu2 that I'll be uploading. delta for php-universe-source to follow shortly.

This bug was fixed in the package php-defaults - 35
Sponsored for Nish Aravamudan (nacc)

---------------
php-defaults (35) unstable; urgency=medium

  * Simplify the package versions to use only SUPPORTED_VERSION for common
    packages and DEB_VERSION for php-common and php-all-dev to be able to
    update mixed versions

 -- Ondřej Surý <email address hidden> Tue, 01 Mar 2016 16:28:34 +0100

php-defaults (34) unstable; urgency=medium

  * Just little fix here and there

 -- Ondřej Surý <email address hidden> Tue, 01 Mar 2016 12:08:28 +0100

php-defaults (33) unstable; urgency=medium

  * Create independent mods-available directory for each PHP version
  * php-common needs to have different version then the rest of the
    packages, so it's just $(DEB_EPOCH):$(DEB_VERSION) and it doesn't
    include supported PHP versions

 -- Ondřej Surý <email address hidden> Mon, 29 Feb 2016 09:45:39 +0100

php-defaults (32) unstable; urgency=medium

  * Bump epoch to 1, so the new version number is higher than the old one

 -- Ondřej Surý <email address hidden> Tue, 23 Feb 2016 20:47:04 +0100

php-defaults (31) unstable; urgency=medium

  * Generate package version numbers from PHP supported versions and
    changelog version
  * Remove php-dbg package
  * Bump standards version to 3.9.7 (no change)

 -- Ondřej Surý <email address hidden> Tue, 23 Feb 2016 20:25:43 +0100

php-defaults (30) unstable; urgency=medium

  * Regenerate d/control

 -- Ondřej Surý <email address hidden> Tue, 23 Feb 2016 18:41:09 +0100

php-defaults (29) unstable; urgency=medium

  * Update modulelist to match the new extension packages

 -- Ondřej Surý <email address hidden> Tue, 23 Feb 2016 10:12:44 +0100

This bug was fixed in the package php7.0 - 7.0.4-5ubuntu1

---------------
php7.0 (7.0.4-5ubuntu1) xenial; urgency=medium

  * Merge with Debian unstable (LP: #1553419). Remaining changes:
    - Add support for independent source packages php7.0 and
      php7.0-universe-source (LP #1555843):
      + d/control{,.in}: 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/control{,.in}: add Build-Depends on dctrl-tools.
      + d/rules.d/ext-interbase.mk: add pdo config to interbase's
        config, as php7.0-universe-common will not use ext-common.mk.
    - d/control{,.in}: switch Build-Depends of netcat-traditional to
      netcat-openbsd as only the latter is in main.
    - d/rules: do not generate debian/tests/control when building for
      universe.
    - d/rules: use grep-dctrl to remove binary packages not generated by
      this source package during the build (dpkg-genchanges complains
      otherwise).
  * Drop:
    - d/rules: use grep{,-dctrl} to filter out makefile snippets and
      binary packages that require universe.
      [ Not present ]
    - Undocumented changes to debian/control.
      [ Prior merge churn]
  * php7.0-interbase: Do not install pdo.so, as it is provided
    by php7.0-common (LP: #1556486).

php7.0 (7.0.4-5) unstable; urgency=medium

  * Apply patch to make opcache lockfile path configurable
    (Courtesy of Gandi)

php7.0 (7.0.4-4) unstable; urgency=medium

  * Also kill old /etc/php/mods-available/zlib.ini
    (Closes: #817205, #817202)

php7.0 (7.0.4-3) unstable; urgency=medium

  * We need php_enable() in prerm script (Closes: #816763)
  * Force ucf and ucfr de-registration of old config files
  * ZLIB needs to be builtin module to support IMAGETYPE_SWC
  * Remove zlib extension from the list of extensions
  * php-common.preinst.extra was missing from d/prepare-files
  * Remove debian/ prefix from @package@ in prepared-files

php7.0 (7.0.4-2) unstable; urgency=medium

  * Replace libvpx-dev with libwebp-dev in ext-gd.mk
  * zlib extension needs to be enable as a module for all SAPIs to support
    IMAGETYPE_SWC

php7.0 (7.0.4-1) unstable; urgency=medium

  * Imported Upstream version 7.0.4
  * Remove two patches already present in upstream
  * Rebase patches on top of 7.0.4 release
  * Remove ucfq part from prerm and postrm script that's not needed
    anymore (it was needed for dual mysql and mysqlnd modules)
  * Move php module deactivation back to postrm remove block
    (Closes: #816465)
  * Reorder SAPI cleanup scripts to properly disable PHP extensions

php7.0 (7.0.3-13) unstable; urgency=medium

  * Check for old inidir existence before removing it (Closes: #816429)

php7.0 (7.0.3-12) unstable; urgency=medium

  * Turn comma into pipe to make fpm alternative to other web SAPIs

php7.0 (7.0.3-11) unstable; urgency=medium

  * Move mods-available directories to /etc/php/X.Y/mods-available
  * Install missing php-module.preinst scripts

php7.0 (7.0.3-10) unstable; urgency=medium

  * Don't e...