FYI, I just refreshed debian/copyright in xubuntu-default-settings/trunk to use dep5 so you shouldn't have to convert it each time you merge in the future.
FYI, I just refreshed debian/copyright in xubuntu- default- settings/ trunk to use dep5 so you shouldn't have to convert it each time you merge in the future.