Patches from Debian

This pull requests contains all the patches from the Debian packaging of merkaartor. Please apply them!