Merge ~ahasenack/ubuntu/+source/ocfs2-tools:cosmic-ocfs2-tools-merge-1.8.5-5 into ubuntu/+source/ocfs2-tools:debian/sid
Status: | Merged |
---|---|
Approved by: | Christian Ehrhardt |
Approved revision: | e229b69425a068e06dd0e20fac31fed59035acbf |
Merge reported by: | Andreas Hasenack |
Merged at revision: | e229b69425a068e06dd0e20fac31fed59035acbf |
Proposed branch: | ~ahasenack/ubuntu/+source/ocfs2-tools:cosmic-ocfs2-tools-merge-1.8.5-5 |
Merge into: | ubuntu/+source/ocfs2-tools:debian/sid |
Diff against target: |
63 lines (+24/-2) 3 files modified
debian/changelog (+21/-0) debian/control (+2/-1) debian/tests/basic (+1/-1) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Christian Ehrhardt (community) | Approve | ||
Canonical Server | Pending | ||
Review via email: mp+351821@code.launchpad.net |
Description of the change
Simple merge with debian.
This drops half our delta (1 out of 2). The other delta is a simple dep8 test fix, but one that was only needed in Ubuntu for some reason. In debian, the test are passing (https:/
DEP8 tests: http://
PPA with test packages: https:/
I haven't used ocfs2-tools, and I was the previous uploader only because I fixed the FTBFS (that we can drop now), so my only confidence in this upload is that the dep8 tests passed, and that our delta is super simple.
Minimal delta is simple and as you explained Ubuntu (test env) specific.
I think you could still submit it to Debian, maybe they are willing to pick it still - better try than giving up prematurely.
If you are concerned about their reaction, put it in a an if based on lsb_release or so.
And add a comment what we have seen on the broken pipe.
The Debian changes since the last version are not huge but fine to be picked up.
Anyway, for the merge build and tests LGTM, also the Delta is fine IMHO - +1