the control files were merged as appropriate, the rest are plain renames.
copied from Ubuntu's packaging