[packaging] make X11 a build conditional (original patch from foolab)
Merge pull request #35 from mer-packages/nox11

[packaging] make X11 a build conditional (original patch from foolab)