Adapt Debian patches to git development branch.