Merge ~paride/ubuntu/+source/strongswan:lp1940079-tss2-focal into ubuntu/+source/strongswan:ubuntu/devel
Proposed by
Paride Legovini
Status: | Superseded | ||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Proposed branch: | ~paride/ubuntu/+source/strongswan:lp1940079-tss2-focal | ||||||||||||||||
Merge into: | ubuntu/+source/strongswan:ubuntu/devel | ||||||||||||||||
Diff against target: |
529 lines (+411/-2) (has conflicts) 9 files modified
debian/changelog (+19/-0) debian/control (+61/-2) debian/libcharon-extra-plugins.maintscript (+11/-0) debian/patches/lp-1879692-1.patch (+75/-0) debian/patches/lp-1879692-2.patch (+50/-0) debian/patches/lp-1879692-3.patch (+37/-0) debian/patches/lp-1879692-4.patch (+42/-0) debian/patches/lp-1879692-5.patch (+111/-0) debian/patches/series (+5/-0) Conflict in debian/changelog Conflict in debian/control Conflict in debian/libcharon-extra-plugins.maintscript |
||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Christian Ehrhardt | Pending | ||
Canonical Server | Pending | ||
Review via email: mp+408927@code.launchpad.net |
This proposal has been superseded by a proposal from 2021-09-21.
Commit message
Focal SRU fix for LP #1940079. This is the same change that landed in the Debian packaging (git) and in Impish, applied to Focal.
Test Plan: see the SRU template.
Test PPA: https:/
Fix verified by the bug submitter using the PPA package.
Please review; no sponsorship needed.
To post a comment you must log in.
Unmerged commits
- 58edb43... by Paride Legovini
- aaaf3bd... by Paride Legovini
- c50c2d7... by Lucas Kanashiro
- 546ba27... by Lucas Kanashiro
- 06156b5... by Lucas Kanashiro
- 1a29456... by Lucas Kanashiro
- 174d2fa... by Christian Ehrhardt
- e718509... by Christian Ehrhardt
- a224d03... by Christian Ehrhardt
- 26d1d13... by Christian Ehrhardt
This one was abandoned (wrong merge target)