Fixes for lintian tag upstream-metadata-in-native-source

Lintian Info page: upstream-metadata-in-native-source