Comment 4 for bug 1225149

This package has indeed a very complex set of changes to merge in. Thus I had to redo the merge from scratch to validate that changes are correct. Above is yours and mine debdiffs for comparison. Here is the review:

* clvm.defaults -> note this is a bug, this file has been explicitely renamed to .default such that dh_installinit installs it, see debian/changelog.

* clvm.init -> has spurious whitespace change w.r.t. previous ubuntu.

* dlm >> 2 dependency. Good catch, but we are diverged on Build-Depends anyway.

Also I updated debian/changelog to explicitly list where we are adding divergence from debian packaging & what changes were dropped. Such that next time someone merges, it's easy to see that all changes are accounted for.

Overall it's quite good, but I'll upload my merge of this. Thanks for bringing this up.