[Telepathy-commits] merge: telepathy-gabble

Merge Monkey monkey at collabora.co.uk
Tue Dec 4 04:19:21 PST 2007


Merge to:

  telepathy-gabble

From:

  /home/smcv/public_html/darcs/gabble-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Simplify extensions/Makefile.am with new tools

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    darcs mv check-* tools/ ; adjust src/Makefile.am, tests/Makefile.am, tools/Makefile.am, Makefile.am accordingly

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    _boring: Ignore all test executables

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Stop checking for dbus-binding-tool, we no longer run it (much rejoicing)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Sync check-coding-style.mk etc. from telepathy-glib (add check-misc.sh, adjust for being in tools/ dir)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Also add glib-signals-marshal-gen.py from telepathy-glib

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Sync XSLT from telepathy-glib (use new FSF address, Lesser rather than Library GPL, irrelevant XSLT tweaks to make c-*-generator cope with different document structures)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove tools that are no longer needed

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add a rule to tools/Makefile.am to update the tools from ../telepathy-glib when run manually

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    darcs mv extensions/tools tools ; adjust Makefile.am, cnfigure.ac, autogen.sh, extensions/Makefile.am, tools/update-spec-gen-am.sh appropriately

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add missing identity.xsl

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add libglibcodegen.py and glib-ginterfaces-generator.py (from telepathy-glib)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove genginterface (no longer needed)


More information about the Telepathy-commits mailing list