Ubuntu
chrony package

Merge ~bryce/ubuntu/+source/chrony:merge-v4.3-2-mantic into ubuntu/+source/chrony:debian/sid

  1. Git
  2. lp:~bryce/ubuntu/+source/chrony
  3. merge-v4.3-2-mantic
  4. Merge into debian/sid
Proposed by Bryce Harrington
Status: Merged
Approved by: git-ubuntu bot
Approved revision: not available
Merge reported by: git-ubuntu bot
Merged at revision: cb07eb72ff2be63489f2f8a0e1d6b440875f1399
Proposed branch: ~bryce/ubuntu/+source/chrony:merge-v4.3-2-mantic
Merge into: ubuntu/+source/chrony:debian/sid
Diff against target: 1239 lines (+999/-6) (has conflicts)
10 files modified
debian/README.container (+60/-0)
debian/changelog (+842/-0)
debian/chrony.conf (+17/-2)
debian/chrony.default (+4/-0)
debian/chrony.service (+1/-2)
debian/chronyd-starter.sh (+68/-0)
debian/control (+4/-1)
debian/docs (+1/-0)
debian/install (+1/-0)
debian/tests/control (+1/-1)
Conflict in debian/changelog
Reviewer Review Type Date Requested Status
git-ubuntu bot Approve
Lucas Kanashiro (community) Approve
Canonical Server Reporter Pending
Canonical Server Core Reviewers Pending
Canonical Server packageset reviewers Pending
Review via email: mp+442583@code.staging.launchpad.net

Description of the change

Merge with Debian's package.

PPA: https://launchpad.net/~bryce/+archive/ubuntu/chrony-merge-v4.3-2

$ ppa tests ppa:bryce/chrony-merge-v4.3-2 --release mantic
* Results:
  - chrony/4.3-2ubuntu1~mantic2
    + ✅ chrony on mantic for amd64 @ 09.05.23 08:23:12 Log️ 🗒️
    + ✅ chrony on mantic for arm64 @ 09.05.23 08:35:22 Log️ 🗒️
    + ✅ chrony on mantic for armhf @ 09.05.23 08:18:20 Log️ 🗒️
    + ✅ chrony on mantic for i386 @ 09.05.23 08:03:37 Log️ 🗒️
    + ✅ chrony on mantic for ppc64el @ 09.05.23 08:21:08 Log️ 🗒️
    + ✅ chrony on mantic for s390x @ 09.05.23 08:23:43 Log️ 🗒️

Usual tags pushed for review:
  - tags/old/debian 6439750
  - tags/new/debian d41c6c4
  - tags/old/ubuntu 0f58477
  - tags/logical/4.3-1ubuntu4 322a766
  - tags/reconstruct/4.3-1ubuntu4 4c7e38b
  - tags/split/4.3-1ubuntu4 a7edbcb

You'll notice the commits for this branch are a bit weird with these '--CL--' markers. Christian had helpfully included 'UBUNTU-only' strings in the commit message as metadata about the commits, however unfortunately when using git-ubuntu's reconstruct-changelog feature those strings end up in the changelog, invalidating it. In the past I just fixed up the changelog manually to remove them, but that kind of defeats the purpose. I discovered that git-ubuntu has a feature to separate the changelog entry from other text if there is a line with '--CL--' present in the commit message. The changelog entry is taken as the text after this marker.

I went one further and for bdrung's addition I included a snippet of his email message to retain extra context on the commit, including (notably) his plans to introduce this in Debian.

You'll also note there's a conflict marker in the diff, which is because Debian introduced a new version, 4.3-2+deb12u1, just in the last day, after I'd finished the merge work. This adds an apparmor bugfix that sounds worthwhile, but it isn't reported against ubuntu and sounds more of a corner case than something crucial. We can pick it up in a re-merge.

To post a comment you must log in.
Revision history for this message
Lucas Kanashiro (lucaskanashiro) wrote :

Thanks for this MP Bryce! I also did not know about this '--CL--' git-ubuntu feature, interesting! I believe this is a good way to let us describe the change in a "git commit way" and also have the content going to the changelog in the same place. I think I might adopt that as well in some merges.

All changes LGTM, thanks for explaining the details in the description, that helped a lot.

review: Approve
Revision history for this message
git-ubuntu bot (git-ubuntu-bot) wrote :

Approvers: bryce, lucaskanashiro
Uploaders: bryce, lucaskanashiro
MP auto-approved

review: Approve
Revision history for this message
Bryce Harrington (bryce) wrote :

Thanks Lucas, uploaded:

 fixup_changes dsc ../chrony_4.3-2ubuntu1.dsc ../chrony_4.3-2ubuntu1_source.changes
 fixup_changes buildinfo ../chrony_4.3-2ubuntu1_source.buildinfo ../chrony_4.3-2ubuntu1_source.changes
 signfile changes ../chrony_4.3-2ubuntu1_source.changes A661100B3DAC1D4F2CAD8A54E603B2578FB8F0FB

Successfully signed dsc, buildinfo, changes files
Vcs-Git: https://git.launchpad.net/~bryce/ubuntu/+source/chrony
Vcs-Git-Commit: cb07eb72ff2be63489f2f8a0e1d6b440875f1399
Vcs-Git-Ref: refs/heads/merge-v4.3-2-mantic
$ dput ubuntu ../chrony_4.3-2ubuntu1_source.changes
gpg: ../chrony_4.3-2ubuntu1_source.changes: Valid signature from E603B2578FB8F0FB
gpg: ../chrony_4.3-2ubuntu1.dsc: Valid signature from E603B2578FB8F0FB
D: Setting host argument.
Checking signature on .changes
Checking signature on .dsc
Package includes an .orig.tar.gz file although the debian revision suggests
that it might not be required. Multiple uploads of the .orig.tar.gz may be
rejected by the upload queue management software.
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading chrony_4.3-2ubuntu1.dsc: done.
  Uploading chrony_4.3.orig.tar.gz: done.
  Uploading chrony_4.3-2ubuntu1.debian.tar.xz: done.
  Uploading chrony_4.3-2ubuntu1_source.buildinfo: done.
  Uploading chrony_4.3-2ubuntu1_source.changes: done.
Successfully uploaded packages.

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