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