[Telepathy-commits] merge: stream-engine

[Merge Monkey]

Merge to:

  stream-engine

From:

  /home/smcv/public_html/darcs/stream-engine-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    doc/Makefile.am: ship sequence.pic in tarballs, and use a more conventional way to ship make-call.pic

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Put --enable-seq-dias in ./configure help rather than --enable-sequence-diagrams, because that's what the option actually is

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    _boring: ignore tarballs, dist/distcheck directories

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    doc/log.sh and doc/test are cruft generated by pic2plot, behave accordingly

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Copy sequence.pic to builddir when doing plots, to fix distcheck and other out-of-tree builds

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    _boring: ignore doc/*.png

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Don't copy around sequence.pic if srcdir == builddir.
For the record, this batch of doc/ changes are to fix fd.o #11818.