Fix debian control file
Merge branch 'master' into kaji