This is the only patch in the series that isn't ready for merging as far as I'm concerned. Are there sufficient users of libx11-trim on non-debian-renaming systems that use package feeds to add conflicts/replaces for this? Ross