verify that DESCRIPTION has type Package
Merge remote-tracking branch: upstream/master