Imported Upstream version 1.1
Merge tag 'upstream/1.1'

Upstream version 1.1
libcangjie2-dev and libcangjie2-dev-tools conflict with libcangjie-dev
as they cannot co-exist. See bugs #736191 and #736193.
New version 1.1-1