Merge ~lucaskanashiro/ubuntu/+source/clamav:focal-merge into ubuntu/+source/clamav:debian/sid
Status: | Merged |
---|---|
Approved by: | Christian Ehrhardt |
Approved revision: | 57085200da0d41f91fe18143c23d89c62746256f |
Merge reported by: | Andreas Hasenack |
Merged at revision: | 57085200da0d41f91fe18143c23d89c62746256f |
Proposed branch: | ~lucaskanashiro/ubuntu/+source/clamav:focal-merge |
Merge into: | ubuntu/+source/clamav:debian/sid |
Diff against target: |
175 lines (+113/-1) 4 files modified
debian/changelog (+56/-0) debian/control (+2/-1) debian/patches/Deprecate-unused-options-instead-of-removing-it.patch (+54/-0) debian/patches/series (+1/-0) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Christian Ehrhardt (community) | Approve | ||
Andreas Hasenack | Pending | ||
Canonical Server | Pending | ||
Review via email: mp+376437@code.launchpad.net |
Description of the change
Merge version 0.102.1+dfsg-1 from Debian. We carry a small delta and I kept it to avoid possible issues when users upgrade their system from old Ubuntu releases (we might want to drop it after LTS release). Following is the delta:
- clamav-daemon may fail to start due to options removed in new version
and manually edited configuration file. (LP #1783632)
+ debian/
add patch from Debian stretch to simply warn about removed options.
The existent patch didn't apply in the new upstream release, so I refreshed it but the content is still the same.
It built fine in all architectures: https:/
And the DEP-8 tests are also passing successfully in a local setup (amd64):
autopkgtest [18:41:05]: @@@@@@@
clamd PASS
client PASS
milter PASS
Changelog: dfsg-1ubuntu1 didn't have that :-/
- [√] old content and logical tag match as expected
You had none but it was easy enought to check still.
- [√] changelog entry correct version and targeted codename
- [√] changelog entries correct
- [√] update-maintainer has been run
Interesting here is that 0.101.4+
Actual changes:
- [√] no major upstream changes to consider
- [√] no further upstream version to consider
- [√] debian changes look safe
Old Delta:
- [√] nothing to drop yet
- [√] changes forwarded upstream/debian (n/a in this case)
New Delta:
- [√] refreshed patch LGTM (thanks for keeping patch and refresh separate commits and adding headers)
Build/Test:
- [√] build is ok
- [√] sanity checks test fine
Once this is complete you might ping security as they usually push the new versions to all active releases.