[Pkg-utopia-maintainers] Bug#845126: firewalld: Please merge configuration during upgrade

[James Valleroy]

I'm attaching a patch that implements this change.

With this change, firewalld.conf is installed into /usr/share/firewalld.
Then in postinst, ucf will merge the file into /etc/firewalld.

During an interactive upgrade (assuming default settings), if both files
are changed, there will be a ucf prompt that allows three-way diff and
merge. It also won't block unattended-upgrade of this package.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Use-ucf-to-handle-config-file.patch
Type: text/x-patch
Size: 2196 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-utopia-maintainers/attachments/20161212/b29ef848/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 866 bytes
Desc: OpenPGP digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-utopia-maintainers/attachments/20161212/b29ef848/attachment.sig>