[Telepathy-commits] merge: telepathy-glib

[Merge Monkey]

Merge to:

  telepathy-glib

From:

  /home/smcv/public_html/darcs/tp-glib-smcv-trivia

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Don't use --xinclude when running xsltproc on files that have already been xinclude'd

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    _boring: ignore example executables in examples/client/

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add with-session-bus.sh to dist

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Bump libdbus dependency to 0.95 so we can stop defining DBUS_API_SUBJECT_TO_CHANGE

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove duplicate -I$(top_srcdir) -I$(top_builddir) from examples

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Rename svc-properties-interface.h to svc-generic.h, with compatibility stub (if we get any more generic stuff like properties, it can go there too)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Drop telepathy-glib-unstable.pc, move telepathy-glib.pc into telepathy-glib/ (partly because it's conceptually part of the library, and partly to make tab completion work better)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Bump GLib build-dependency to 2.10

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove inspector directory - on further consideration, it's too big a project to just merge in to telepathy-glib like that

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove DBUS_API_SUBJECT_TO_CHANGE from docs too

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add 'manager' and 'channel' debug flags

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add TP_UNKNOWN_HANDLE_TYPE

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Give subdirectories -I${top_builddir} -I${top_srcdir}

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add defs.h to docs

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Conditionally recurse into inspector/

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Recurse into examples before docs - the examples build quicker

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Require dbus-glib 0.73 for _with_timeout variants of DBusGProxy method calling

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add the beginnings of a Makefile for telepathy-inspector (currently if FALSE'd out).

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Use builddir in TP_GLIB_LIBS substitution

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add tools/with-session-bus.sh

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Change no-protocols example CM to have an all-permissive license

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add examples/client/

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add 'proxy' debug flag

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Revert addition of conditional build for inspector/ too

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add defs.h containing e.g. TP_CM_BUS_NAME_BASE

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add svc-generic.h to autofoo