Updated changelog
Updated control file with the new dependencies
Renamed dir files
Updated copyright file
Fixed patches
Updated changelog
Imported Upstream version 2.1
Merge tag 'upstream/2.1'

Upstream version 2.1
Updated changelog