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

Proposed by Bryce Harrington
Status: Superseded
Proposed branch: ~bryce/ubuntu/+source/php-defaults:7.4-transition
Merge into: ubuntu/+source/php-defaults:debian/sid
Diff against target: 102 lines (+35/-6)
4 files modified
debian/changelog (+29/-0)
debian/control (+3/-4)
debian/control.in (+2/-1)
debian/rules (+1/-1)
Reviewer Review Type Date Requested Status
Andreas Hasenack (community) Needs Information
Review via email: mp+379596@code.launchpad.net

This proposal has been superseded by a proposal from 2020-02-24.

Description of the change

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

To post a comment you must log in.
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

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
Revision history for this message
Bryce Harrington (bryce) wrote :

Ok, I'll try again with another merge.

216fc46... by Bryce Harrington

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

359c958... by Bryce Harrington

merge-changelogs

3dbe9ca... by Bryce Harrington

reconstruct-changelog

5ee29fe... by Bryce Harrington

update-maintainer

0904994... by Bryce Harrington

changelog

Unmerged commits

0904994... by Bryce Harrington

changelog

5ee29fe... by Bryce Harrington

update-maintainer

3dbe9ca... by Bryce Harrington

reconstruct-changelog

359c958... by Bryce Harrington

merge-changelogs

216fc46... by Bryce Harrington

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index 85a9df3..6355f90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
1php-defaults (73ubuntu1) focal; urgency=medium
2
3 * Merge with Debian unstable.
4 - Drop previous transitions to earlier PHP versions 7.2 and 7.3.
5 * d/control, d/rules: Change support for 7.3+7.4, to 7.4 only.
6
7 -- Bryce Harrington <bryce@canonical.com> Mon, 24 Feb 2020 13:09:22 -0800
8
1php-defaults (73) unstable; urgency=medium9php-defaults (73) unstable; urgency=medium
210
3 * Add a small shell helper to update the default PHP-FPM socket location11 * Add a small shell helper to update the default PHP-FPM socket location
@@ -22,12 +30,33 @@ php-defaults (70) unstable; urgency=medium
2230
23 -- Ondřej Surý <ondrej@sury.org> Wed, 14 Aug 2019 08:50:10 +020031 -- Ondřej Surý <ondrej@sury.org> Wed, 14 Aug 2019 08:50:10 +0200
2432
33php-defaults (69ubuntu2) eoan; urgency=medium
34
35 [ Bryce Harrington ]
36 * Transition supported PHP version to 7.3
37
38 -- Robie Basak <robie.basak@ubuntu.com> Fri, 23 Aug 2019 00:05:29 +0000
39
40php-defaults (69ubuntu1) disco; urgency=low
41
42 * Merge from Debian unstable. Remaining changes:
43 - Revert default and supported PHP version to 7.2
44
45 -- Gianfranco Costamagna <locutusofborg@debian.org> Tue, 08 Jan 2019 09:19:27 +0100
46
25php-defaults (69) unstable; urgency=medium47php-defaults (69) unstable; urgency=medium
2648
27 * Add support for calling dismod in preinst scripts49 * Add support for calling dismod in preinst scripts
2850
29 -- Ondřej Surý <ondrej@debian.org> Mon, 17 Dec 2018 10:14:00 +000051 -- Ondřej Surý <ondrej@debian.org> Mon, 17 Dec 2018 10:14:00 +0000
3052
53php-defaults (68ubuntu1) disco; urgency=medium
54
55 * Revert default and supported PHP version to 7.2
56 since 7.3 requires pcre2. See bug 1636666
57
58 -- Jeremy Bicha <jbicha@ubuntu.com> Fri, 09 Nov 2018 12:34:51 -0500
59
31php-defaults (68) unstable; urgency=medium60php-defaults (68) unstable; urgency=medium
3261
33 * Make enabling/disabling modules silent (debug level)62 * 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 @@
1Source: php-defaults1Source: php-defaults
2Section: php2Section: php
3Priority: optional3Priority: optional
4Maintainer: Debian PHP Maintainers <team+pkg-php@tracker.debian.org>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Debian PHP Maintainers <team+pkg-php@tracker.debian.org>
5Uploaders: Ondřej Surý <ondrej@debian.org>,6Uploaders: Ondřej Surý <ondrej@debian.org>,
6 Lior Kaplan <kaplan@debian.org>7 Lior Kaplan <kaplan@debian.org>
7Standards-Version: 4.58Standards-Version: 4.5
@@ -52,9 +53,7 @@ Description: server-side, HTML-embedded scripting language (default)
5253
53Package: php-all-dev54Package: php-all-dev
54Architecture: all55Architecture: all
55Depends: php7.3-dev,56Depends: php7.4-dev,
56 php7.3-json,
57 php7.4-dev,
58 php7.4-json,57 php7.4-json,
59 ${misc:Depends}58 ${misc:Depends}
60Description: package depending on all supported PHP development packages59Description: 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 @@
1Source: php-defaults1Source: php-defaults
2Section: php2Section: php
3Priority: optional3Priority: optional
4Maintainer: Debian PHP Maintainers <team+pkg-php@tracker.debian.org>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Debian PHP Maintainers <team+pkg-php@tracker.debian.org>
5Uploaders: Ondřej Surý <ondrej@debian.org>,6Uploaders: Ondřej Surý <ondrej@debian.org>,
6 Lior Kaplan <kaplan@debian.org>7 Lior Kaplan <kaplan@debian.org>
7Standards-Version: 4.58Standards-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 @@
10include /usr/share/dpkg/default.mk10include /usr/share/dpkg/default.mk
1111
12PHP_DEFAULT_VERSION := 7.412PHP_DEFAULT_VERSION := 7.4
13PHP_SUPPORTED_VERSIONS := 7.3 7.413PHP_SUPPORTED_VERSIONS := 7.4
1414
15, := ,15, := ,
16PHP_DEV_PACKAGES := $(addprefix php,$(addsuffix -dev$(,),$(PHP_SUPPORTED_VERSIONS))), $(addprefix php,$(addsuffix -json$(,),$(PHP_SUPPORTED_VERSIONS)))16PHP_DEV_PACKAGES := $(addprefix php,$(addsuffix -dev$(,),$(PHP_SUPPORTED_VERSIONS))), $(addprefix php,$(addsuffix -json$(,),$(PHP_SUPPORTED_VERSIONS)))

Subscribers

People subscribed via source and target branches