Merge ~bryce/ubuntu/+source/php7.4:fix-lp1850933-focal into ubuntu/+source/php7.4:ubuntu/devel

[Bryce Harrington]

As discussed at https://code.launchpad.net/bugs/1850933 and https://code.launchpad.net/~paelzer/ubuntu/+source/php7.3/+git/php7.3/+merge/375381, this adds a conflicts for the previous php version's mod-php.

A PPA with this fix is available at:

    https://launchpad.net/~bryce/+archive/ubuntu/php7.3-fix-lp1850933/+packages

[Christian Ehrhardt  (paelzer)]

Quote: "Debian differs from Ubuntu here in that they try to support multiple php versions co-installed. So, it's unlikely this fix would be upstreamable."

That would have been the only thing I wanted to see, but I agree to the above.
The change itself LGTM to avoid a serious issues for upgraders to 20.04.

I'm glad that after PHP itself has migrated it is time for such fixes now.

This is based on my suggestion that was for 7.2 in Eoan.
But for Focal the solution has to be slightly different. Here the fix needs to consider two upgrade paths:
- from Eoan
- from Bionic
IMHO we need also to conflict with libapache2-mod-php7.2 (Bionics version) to fix both paths.

Do you agree?

review: Needs Fixing

[Bryce Harrington (bryce)]

Yep, that makes sense. I've updated the branch to also conflict for php7.2.

[Christian Ehrhardt  (paelzer)]

Thanks, LGTM now +1

review: Approve

diff --git a/debian/changelog b/debian/changelog
index b37796e..c82a2a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+php7.4 (7.4.3-4ubuntu1) focal; urgency=medium
+
+  * d/control, d/control.in: Conflict with mod-php from php7.2 and
+    php7.3 to ensure safe upgrade path for apache2.
+    (Fixes LP: #1850933)
+
+ -- Bryce Harrington <[e-mail]>  Thu, 26 Mar 2020 20:24:23 +0000
+
 php7.4 (7.4.3-4build2) focal; urgency=medium
 
   * No-change rebuild for icu soname change.
diff --git a/debian/control b/debian/control
index 9d0db02..8eb38a4 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: php7.4
 Section: php
 Priority: optional
-Maintainer: Debian PHP Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian PHP Maintainers <[e-mail]>
 Uploaders: Ondřej Surý <[e-mail]>,
            Lior Kaplan <[e-mail]>
 Build-Depends: apache2-dev (>= 2.4),
@@ -95,6 +96,8 @@ Depends: libmagic1,
          ${shlibs:Depends}
 Provides: libapache2-mod-php,
           ${php:Provides}
+Conflicts: libapache2-mod-php7.3,
+	   libapache2-mod-php7.2
 Recommends: apache2
 Suggests: php-pear
 Description: server-side, HTML-embedded scripting language (Apache 2 module)
diff --git a/debian/control.in b/debian/control.in
index 2e2339a..360e31d 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,7 +1,8 @@
 Source: php@PHP_VERSION@
 Section: php
 Priority: optional
-Maintainer: Debian PHP Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian PHP Maintainers <[e-mail]>
 Uploaders: Ondřej Surý <[e-mail]>,
            Lior Kaplan <[e-mail]>
 Build-Depends: apache2-dev (>= 2.4),
@@ -95,6 +96,8 @@ Depends: libmagic1,
          ${shlibs:Depends}
 Provides: libapache2-mod-php,
           ${php:Provides}
+Conflicts: libapache2-mod-php7.3,
+	   libapache2-mod-php7.2
 Recommends: apache2
 Suggests: php-pear
 Description: server-side, HTML-embedded scripting language (Apache 2 module)