Merge ~ahasenack/ubuntu/+source/base-files:focal-motd-news-config-split into ubuntu/+source/base-files:ubuntu/focal-devel
Status: | Merged | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Approved by: | Andreas Hasenack on 2020-08-17 | ||||||||||||
Approved revision: | 6f3fbdb8ed9b84ed92aee611b03ae0bb96f4b7c4 | ||||||||||||
Merged at revision: | 6f3fbdb8ed9b84ed92aee611b03ae0bb96f4b7c4 | ||||||||||||
Proposed branch: | ~ahasenack/ubuntu/+source/base-files:focal-motd-news-config-split | ||||||||||||
Merge into: | ubuntu/+source/base-files:ubuntu/focal-devel | ||||||||||||
Diff against target: |
252 lines (+137/-11) 8 files modified
debian/base-files.maintscript (+1/-0) debian/changelog (+33/-0) debian/control (+14/-1) debian/motd-news-config.install (+1/-0) debian/motd-news-config.postinst (+55/-0) debian/postinst.in (+13/-0) debian/rules (+0/-1) motd/50-motd-news (+20/-9) |
||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Christian Ehrhardt | 2020-08-06 | Approve on 2020-08-17 | |
Canonical Server Team | 2020-08-06 | Pending | |
Review via email:
|
Description of the change
Same as https:/
- backport the switch to wget, and follow-up fixes that landed in groovy
- versions for breaks/replaces are the focal ones:
ubuntu-server 1.450.2:
Depends: motd-news-config
base-files 11ubuntu5.2:
Breaks: ubuntu-server (<< 1.450.2)
rm_conffile /etc/default/
motd-news-config 11ubuntu5.2:
Breaks/Replaces: base-files (<< 11ubuntu5.2)
PPA: https:/
Linked bugs have the SRU template filled out.
Andreas Hasenack (ahasenack) wrote : | # |
Christian Ehrhardt (paelzer) wrote : | # |
I just realized that we will hit the base-files rm_conffile again and again - as the one in groovy has the groovy version listed. But that should be no problem - it will find the file already removed and be ok with it.
I re-read the changes and agree that they match what we got into Bionic and they LGTM.
+1
Andreas Hasenack (ahasenack) wrote : | # |
Now that groovy has these packages, let me try a release upgrade just to be sure
Andreas Hasenack (ahasenack) wrote : | # |
I pushed a change I found out while testing the groovy package: motd-news-config has to have priority set to optional, otherwise it will inherit base-files' which is "required" and do-release-upgrade will install it regardless of dependencies.
Christian Ehrhardt (paelzer) wrote : | # |
So many details, I'm glad for your thorough testing on this.
The additional change LGTM as well - re-approve.
I guess this needs to be added in Groovy as well then?
Andreas Hasenack (ahasenack) wrote : | # |
It's uploaded to groovy already
On Mon, Aug 17, 2020, 03:34 Christian Ehrhardt <
<email address hidden>> wrote:
> Review: Approve
>
> So many details, I'm glad for your thorough testing on this.
> The additional change LGTM as well - re-approve.
>
> I guess this needs to be added in Groovy as well then?
> --
>
> https:/
> You are the owner of
> ~ahasenack/
>
> Launchpad-
> Launchpad-
> Launchpad-
> Launchpad-Branch:
> ~ahasenack/
>
Andreas Hasenack (ahasenack) wrote : | # |
I had to rebase to fix the commit message of commit 93ca11572a83a9c
commit 93ca11572a83a9c
Author: Andreas Hasenack <email address hidden>
Date: Tue Jul 28 15:36:04 2020 -0300
- d/control: break on ubuntu-server << 1.453 to force an upgrade if
it is installed, which will pull motd-news-config and the conffile
back in
Became:
commit aea9fbc7ccacfe5
Author: Andreas Hasenack <email address hidden>
Date: Tue Jul 28 15:36:04 2020 -0300
- d/control: break on ubuntu-server << 1.450.2 to force an upgrade if
it is installed, which will pull motd-news-config and the conffile
back in
Andreas Hasenack (ahasenack) wrote : | # |
Tagging and uploading 6f3fbdb8ed9b84e
$ git push pkg upload/11ubuntu5.2
Enumerating objects: 50, done.
Counting objects: 100% (50/50), done.
Delta compression using up to 4 threads
Compressing objects: 100% (31/31), done.
Writing objects: 100% (42/42), 6.75 KiB | 3.38 MiB/s, done.
Total 42 (delta 28), reused 12 (delta 10)
remote: Checking connectivity: 42, done.
To ssh://git.
* [new tag] upload/11ubuntu5.2 -> upload/11ubuntu5.2
$ dput ubuntu ../base-
Checking signature on .changes
gpg: ../base-
Checking signature on .dsc
gpg: ../base-
Uploading to ubuntu (via ftp to upload.ubuntu.com):
Uploading base-files_
Uploading base-files_
Uploading base-files_
Uploading base-files_
Successfully uploaded packages.
Andreas Hasenack (ahasenack) wrote : | # |
Also uploading https:/
The seed change will also happen, but since it involves a new package, the update script from ubuntu-meta won't pick it up, so I have to add the dep manually.
Tagging and uploading 53462aae9d19ec2
$ git push pkg upload/1.450.2
Enumerating objects: 13, done.
Counting objects: 100% (13/13), done.
Delta compression using up to 4 threads
Compressing objects: 100% (9/9), done.
Writing objects: 100% (9/9), 1.19 KiB | 41.00 KiB/s, done.
Total 9 (delta 5), reused 0 (delta 0)
remote: Checking connectivity: 9, done.
To ssh://git.
* [new tag] upload/1.450.2 -> upload/1.450.2
$ dput ubuntu ../ubuntu-
Checking signature on .changes
gpg: ../ubuntu-
Checking signature on .dsc
gpg: ../ubuntu-
Uploading to ubuntu (via ftp to upload.ubuntu.com):
Uploading ubuntu-
Uploading ubuntu-
Uploading ubuntu-
Uploading ubuntu-
Successfully uploaded packages.
Andreas Hasenack (ahasenack) wrote : | # |
Seeds changed for focal in 113992ddf60c557
This is ready for review