Bug#866888: Cleaner patch set

[Osamu Aoki]

Hi,

FYI: The patch provided in https://bugs.debian.org/866888#15 applies
cleanly to the stable package and builds fine.

So far, setting image and color are working.  Please consider to apply
this patch.

Regards,

Osamu