Merge ~paelzer/ubuntu/+source/php7.3:bug-1850933-mod-php-ordering-on-install into ~usd-import-team/ubuntu/+source/php7.3:ubuntu/eoan-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

This isn't yet intended for an upload, it just accompanies the bug 1850933 to discuss the changes.

Unmerged commits

f9d3a61... by Christian Ehrhardt  on 2019-11-11

changelog: conflict mod-php with former php versions for better upgrade ordering (LP: #1850933)

Signed-off-by: Christian Ehrhardt <email address hidden>

325803d... by Christian Ehrhardt  on 2019-11-11

d/control: conflict mod-php with former php versions for better upgrade ordering (LP: #1850933)

Signed-off-by: Christian Ehrhardt <email address hidden>

diff --git a/debian/changelog b/debian/changelog
index 34701e3..f4a4026 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+php7.3 (7.3.11-0ubuntu0.19.10.2) eoan; urgency=medium
+
+  * d/control, d/control.in: conflict mod-php with former php versions
+    for better upgrade ordering (LP: #1850933)
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 11 Nov 2019 10:57:12 +0100
+
 php7.3 (7.3.11-0ubuntu0.19.10.1) eoan-security; urgency=medium
 
   * SECURITY UPDATE: updated to 7.3.11 to fix security issue
diff --git a/debian/control b/debian/control
index 16184c9..6f6afe6 100644
--- a/debian/control
+++ b/debian/control
@@ -96,6 +96,7 @@ Depends: libmagic1,
          ${shlibs:Depends}
 Provides: libapache2-mod-php,
           ${php:Provides}
+Conflicts: 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 169da0b..6bf5f45 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -97,6 +97,7 @@ Depends: libmagic1,
 Provides: libapache2-mod-php,
           ${php:Provides}
 Recommends: apache2
+Conflicts: libapache2-mod-php7.2
 Suggests: php-pear
 Description: server-side, HTML-embedded scripting language (Apache 2 module)
  This package provides the PHP module for the Apache 2 webserver (as