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