From jelmer to master: debian fixes

Mirroring lp:~jelmer/bitlbee/debian-fixes

Symbolic pull request, should be handled by wilmer at some point soon.

Squash this one to develop.