and merge their patch collections. These two packages are built from the same source tree, and updates to the main distfile should be shared by both packages.