Rebase from 'debian/hydro/geometry'
Generated debian files for quantal