Log Message:
#define CUPS API compatibility options so we can build against newer
CUPS versions, and switch dependency away from cups15.

Update conflicts list.