Merge ~ahasenack/ubuntu/+source/squid:squid-apparmor-1792728 into ubuntu/+source/squid:ubuntu/devel
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Christian Ehrhardt | ||||
Approved revision: | bd9acc31cd2aebafee0d356aa8bac26fdec94185 | ||||
Merged at revision: | bd9acc31cd2aebafee0d356aa8bac26fdec94185 | ||||
Proposed branch: | ~ahasenack/ubuntu/+source/squid:squid-apparmor-1792728 | ||||
Merge into: | ubuntu/+source/squid:ubuntu/devel | ||||
Diff against target: |
28 lines (+8/-1) 2 files modified
debian/changelog (+7/-0) debian/usr.sbin.squid (+1/-1) |
||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Christian Ehrhardt (community) | Approve | ||
Review via email: mp+355455@code.launchpad.net |
Description of the change
This is re-applying the apparmor fix from Simon Deziel <email address hidden> that was sponsored by @paelzer in https:/
I slightly changed the d/changelog entry to match our custom of specifying which file is being changed. I figured it's not a big deal since it's a new source package anyway, new major version, and I will have to test this again anyway. But if you think I should preserve the original d/changelog as proposed by him, please let me know. I did a cherry-pick of the fix, though, so the git commit is as he made it.
Bileto ticket, currently still running: https:/
The changes are correctly rebased onto squid4 and I agree to the changelog being kept as-is but bumped to the new version.
+1