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