Merge ~ahasenack/ubuntu/+source/base-files:bionic-motd-news-config-split into ubuntu/+source/base-files:ubuntu/bionic-devel

Proposed by Andreas Hasenack
Status: Merged
Approved by: Andreas Hasenack
Approved revision: 08744d99f2c353f8db78e777d5f79044c1a1a8c2
Merged at revision: 08744d99f2c353f8db78e777d5f79044c1a1a8c2
Proposed branch: ~ahasenack/ubuntu/+source/base-files:bionic-motd-news-config-split
Merge into: ubuntu/+source/base-files:ubuntu/bionic-devel
Diff against target: 254 lines (+137/-11)
8 files modified
debian/base-files.maintscript (+2/-0)
debian/changelog (+33/-0)
debian/control (+13/-1)
debian/motd-news-config.install (+1/-0)
debian/motd-news-config.postinst (+55/-0)
debian/postinst.in (+13/-0)
debian/rules (+0/-1)
update-motd.d/50-motd-news (+20/-9)
Reviewer Review Type Date Requested Status
Christian Ehrhardt  (community) Approve
Canonical Server Pending
Review via email: mp+388922@code.qastaging.launchpad.net

Description of the change

Same as https://code.launchpad.net/~ahasenack/ubuntu/+source/base-files/+git/base-files/+merge/388835, but for bionic, with the following extra details:

- backport the switch to wget, and follow-up fixes that landed in groovy
- versions for breaks/replaces are the bionic ones:

ubuntu-server 1.417.5:
  Depends: motd-news-config

base-files 10.1ubuntu2.10:
  Breaks: ubuntu-server (<< 1.417.5)
  rm_conffile /etc/default/motd-news 10.1ubuntu2.10~ base-files

motd-news-config 10.1ubuntu2.10:
  Breaks/Replaces: base-files (<< 10.1ubuntu2.10)

PPA: https://launchpad.net/~ahasenack/+archive/ubuntu/zomg-5/

The linked bugs have the SRU template filled out.

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

This is ready for review

Revision history for this message
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.

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Change matches what we had in Groovy and soon Focal.
Additional change for priority is good as well.
Versions are good as well for an SRU and the bug LGTM as well.

The breaks and rm_conffile versions are adapted correctly and the maintscript lines LGTM, but we really need to land the meta change at the same time to avoid some updaters to remove packages or even ubuntu-server.

+1 to this in general, but I found one triviality to fix.
The changelog entries got carried over without line-wrap. So you violate the 80 chars in two lines and tools like lintian will hate it.

Fix is trivial enough, you don't need a re-review for the CL changes - therefore approving now.

review: Approve
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

I'm sorry, the longest d/changelog lines I see are at 75 chars:

  * motd/50-motd-news: use wget instead of curl, since wget is standard but

and

    - This changes the timeout behavior slightly because wget does not have

I ran lintian -I --pedantic and the only changelog issues it raiesd were on older entries:

P: base-files source: file-contains-trailing-whitespace debian/changelog (line 1678)
P: base-files source: file-contains-trailing-whitespace debian/changelog (line 915)

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Ah, it's in the xenial MP that the lines passed 80 columns.

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Tagging and uploading 08744d99f2c353f8db78e777d5f79044c1a1a8c2

$ git push pkg upload/10.1ubuntu2.10
Enumerating objects: 51, done.
Counting objects: 100% (51/51), done.
Delta compression using up to 4 threads
Compressing objects: 100% (38/38), done.
Writing objects: 100% (42/42), 6.63 KiB | 3.32 MiB/s, done.
Total 42 (delta 29), reused 5 (delta 3)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/base-files
 * [new tag] upload/10.1ubuntu2.10 -> upload/10.1ubuntu2.10

$ dput ubuntu ../base-files_10.1ubuntu2.10_source.changes
Checking signature on .changes
gpg: ../base-files_10.1ubuntu2.10_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../base-files_10.1ubuntu2.10.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading base-files_10.1ubuntu2.10.dsc: done.
  Uploading base-files_10.1ubuntu2.10.tar.xz: done.
  Uploading base-files_10.1ubuntu2.10_source.buildinfo: done.
  Uploading base-files_10.1ubuntu2.10_source.changes: done.
Successfully uploaded packages.

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Also uploading https://code.launchpad.net/~ahasenack/ubuntu/+source/ubuntu-meta/+git/ubuntu-meta/+ref/bionic-ubuntu-server-motd-news

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 28444d68eb81af94ee88e771755991866fddf638 of that branch:
$ git push pkg upload/1.417.5
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.13 KiB | 41.00 KiB/s, done.
Total 9 (delta 5), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/ubuntu-meta
 * [new tag] upload/1.417.5 -> upload/1.417.5

$ dput ubuntu ../ubuntu-meta_1.417.5_source.changes
Checking signature on .changes
gpg: ../ubuntu-meta_1.417.5_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../ubuntu-meta_1.417.5.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ubuntu-meta_1.417.5.dsc: done.
  Uploading ubuntu-meta_1.417.5.tar.xz: done.
  Uploading ubuntu-meta_1.417.5_source.buildinfo: done.
  Uploading ubuntu-meta_1.417.5_source.changes: done.
Successfully uploaded packages.

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Seeds changed for focal in 8b812c668c9cf4a6de14cbe9b38cc6c33a172735 after ok from steve.

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