some gbp.conf updates
Merge branch 'debian'