Comment 5 for bug 1522346

Louis, I second Robie's comments. Here is an interdiff between your merge, and what I think the merge should be. This addresses Robie's comments about the changelog having incomplete documentation of the remaining delta; it also includes the following changes relative to your merge diff:

 - nut-{cgi,server}.postinst: the existing delta with Debian is bad form, adduser is designed to be called unconditionally. Not strictly speaking part of the merge, but something I spotted along the way that I think it's important to fix. Along the way, I fixed up the changelog explanation for why this is still needed (since we no longer do upgrades from hardy, if that were the only reason we could drop the delta).
 - debian/patches/backport-fix-lp753661.patch has been a pointless diff for several upstream releases. The patch still applies, but upstream fixed the issue differently (using rtrim() ).
 - as Robie noted, you say the udev delta is dropped, but the delta to debian/rules still exists. I've dropped the delta, with more explanation in the changelog to why it can be dropped.
 - the changes from 2.7.7-1ubuntu5 are restored, as still required.

Please have a look at my delta, and let me know if you agree with these changes. If you see anything you disagree with, let's discuss. If you do agree with these changes, please make sure you understand the source of these differences on your side. Then I can sponsor the upload if we're in agreement.

BTW, one thing I notice in the Ubuntu delta that I didn't yet address in the merge is that the apport hooks are installed in wrong paths. There is no source package named nut-client or nut-server, installing those files is a no-op. Also not a question of the merge, but I would gladly take a patch fixing this as part of sponsoring the upload.