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.staging.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.

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches