Merging debian/patches