Merge ~bryce/ubuntu/+source/php-defaults:7.4-transition into ubuntu/+source/php-defaults:debian/sid

[Bryce Harrington]

This shows the changes for the php-defaults update for initiating the transition to php7.4.

This merge is created using git ubuntu, however it's merging against Debian's unreleased git repository rather than debian/sid, so I'm not sure if the diff is going to generate properly.

Before this can land, php7.4 will need to finish migration, and be seeded into main. A spreadsheet with status of php dependencies is at:

https://docs.google.com/spreadsheets/d/11E6f6MTs0eTN-Nskap6iYT3l8QxTEuhYPlhy_z8Hd5s/edit#gid=1663657511

PPA for testing:

https://launchpad.net/~bryce/+archive/ubuntu/php7.4-transition

Bug report for tracking purposes is at:

https://bugs.launchpad.net/ubuntu/+source/php-defaults/+bug/1855020

[Andreas Hasenack (ahasenack)]

Ok, so you branched off salsa at:
commit 5f1073c4b528b3715378248352ea21a41ad853ce
Author: Ondřej Surý <email address hidden>
Date: Wed Jan 22 13:25:59 2020 +0100

    Update changelog for 72 release

You have some empty commits that I don't quite understand:
commit 5640be417e03cb44a4132480326e921354db6f49
Author: Bryce Harrington <email address hidden>
Date: Wed Feb 19 19:33:57 2020 +0000

      * Transition supported PHP version to php7.3

commit 93611a1f7be8f56cb618454aa5a0c58a02668aa0
Author: Bryce Harrington <email address hidden>
Date: Wed Feb 19 19:35:19 2020 +0000

      * Revert default and supported PHP version to 7.2

Given debian released v73 of this package, would a normal git-ubuntu merge work now? And as a suggestion, you can always cherry-pick unreleased changes from salsa as added delta, no need to fuss around with branches to try to get git-ubuntu to work (if that's what happened).

review: Needs Information

[Bryce Harrington (bryce)]

Ok, I'll try again with another merge.

216fc46... by Bryce Harrington on 2020-02-24

  * d/control, d/rules: Change support for 7.3+7.4, to 7.4 only.

359c958... by Bryce Harrington on 2020-02-24

merge-changelogs

3dbe9ca... by Bryce Harrington on 2020-02-24

reconstruct-changelog

5ee29fe... by Bryce Harrington on 2020-02-24

update-maintainer

0904994... by Bryce Harrington on 2020-02-24

changelog

Unmerged commits

0904994... by Bryce Harrington on 2020-02-24

changelog

5ee29fe... by Bryce Harrington on 2020-02-24

update-maintainer

3dbe9ca... by Bryce Harrington on 2020-02-24

reconstruct-changelog

359c958... by Bryce Harrington on 2020-02-24

merge-changelogs

216fc46... by Bryce Harrington on 2020-02-24

  * d/control, d/rules: Change support for 7.3+7.4, to 7.4 only.

diff --git a/debian/changelog b/debian/changelog
index 85a9df3..6355f90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+php-defaults (73ubuntu1) focal; urgency=medium
+
+  * Merge with Debian unstable.
+    - Drop previous transitions to earlier PHP versions 7.2 and 7.3.
+  * d/control, d/rules: Change support for 7.3+7.4, to 7.4 only.
+
+ -- Bryce Harrington <[e-mail]>  Mon, 24 Feb 2020 13:09:22 -0800
+
 php-defaults (73) unstable; urgency=medium
 
   * Add a small shell helper to update the default PHP-FPM socket location
@@ -22,12 +30,33 @@ php-defaults (70) unstable; urgency=medium
 
  -- Ondřej Surý <[e-mail]>  Wed, 14 Aug 2019 08:50:10 +0200
 
+php-defaults (69ubuntu2) eoan; urgency=medium
+
+  [ Bryce Harrington ]
+  * Transition supported PHP version to 7.3
+
+ -- Robie Basak <[e-mail]>  Fri, 23 Aug 2019 00:05:29 +0000
+
+php-defaults (69ubuntu1) disco; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Revert default and supported PHP version to 7.2
+
+ -- Gianfranco Costamagna <[e-mail]>  Tue, 08 Jan 2019 09:19:27 +0100
+
 php-defaults (69) unstable; urgency=medium
 
   * Add support for calling dismod in preinst scripts
 
  -- Ondřej Surý <[e-mail]>  Mon, 17 Dec 2018 10:14:00 +0000
 
+php-defaults (68ubuntu1) disco; urgency=medium
+
+  * Revert default and supported PHP version to 7.2
+    since 7.3 requires pcre2. See bug 1636666
+
+ -- Jeremy Bicha <[e-mail]>  Fri, 09 Nov 2018 12:34:51 -0500
+
 php-defaults (68) unstable; urgency=medium
 
   * Make enabling/disabling modules silent (debug level)
diff --git a/debian/control b/debian/control
index bbb3646..6b18a51 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: php-defaults
 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]>
 Standards-Version: 4.5
@@ -52,9 +53,7 @@ Description: server-side, HTML-embedded scripting language (default)
 
 Package: php-all-dev
 Architecture: all
-Depends: php7.3-dev,
-         php7.3-json,
-         php7.4-dev,
+Depends: php7.4-dev,
          php7.4-json,
          ${misc:Depends}
 Description: package depending on all supported PHP development packages
diff --git a/debian/control.in b/debian/control.in
index 337cee0..d2ee048 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,7 +1,8 @@
 Source: php-defaults
 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]>
 Standards-Version: 4.5
diff --git a/debian/rules b/debian/rules
index 156294e..743aa4b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@
 include /usr/share/dpkg/default.mk
 
 PHP_DEFAULT_VERSION    := 7.4
-PHP_SUPPORTED_VERSIONS := 7.3 7.4
+PHP_SUPPORTED_VERSIONS := 7.4
 
 , := ,
 PHP_DEV_PACKAGES       := $(addprefix php,$(addsuffix -dev$(,),$(PHP_SUPPORTED_VERSIONS))), $(addprefix php,$(addsuffix -json$(,),$(PHP_SUPPORTED_VERSIONS)))