Please merge patches from debian package

Hello,

This MR contains several patches coming from Guido that are included in the debian package.

One of the patch (4ae3acb1) included here is replacing one of Guido's patch

This MR fixes bug #4

Note that this makes cups-pk-helper fail to build due to bug #7, I'm not really sure how to securely fix that