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