merged upstream copyright
Updated generated copyright file and headers
Merged remote debian/control
This should not break anything and merge fine >_<