The merged version - lacks the lsb log messages in the init script - lacks debian/patches/sample_ubuntu.diff
apart from that it looks ok to me.
The merged version patches/ sample_ ubuntu. diff
- lacks the lsb log messages in the init script
- lacks debian/
apart from that it looks ok to me.