[Telepathy-commits] merge: telepathy-salut
Merge Monkey
monkey at collabora.co.uk
Mon Apr 21 10:11:34 PDT 2008
Merge to:
telepathy-salut
From:
/home/smcv/public_html/darcs/salut-smcv
Changes:
Simon McVittie <simon.mcvittie at collabora.co.uk>
Remove the fragile spec-gen.am stuff (no longer used)
Simon McVittie <simon.mcvittie at collabora.co.uk>
Remove now-useless AC_DEFINE/AC_SUBST/AS_AC_EXPAND of DBUS_SERVICES_DIR
Simon McVittie <simon.mcvittie at collabora.co.uk>
Pass -f to autoreconf to update config.guess and friends
Simon McVittie <simon.mcvittie at collabora.co.uk>
Add tools/ to SUBDIRS
Simon McVittie <simon.mcvittie at collabora.co.uk>
Update existing codegen tools from telepathy-glib
Simon McVittie <simon.mcvittie at collabora.co.uk>
Prefer to run under automake-1.8 if available, to avoid automake 1.9 dependencies creeping in while we claim to support 1.8
Simon McVittie <simon.mcvittie at collabora.co.uk>
Add more codegen tools from telepathy-glib
Simon McVittie <simon.mcvittie at collabora.co.uk>
Add comment explaining why the .service.in file has a shorter name than you might expect
Simon McVittie <simon.mcvittie at collabora.co.uk>
Remove as-ac-expand.m4
Simon McVittie <simon.mcvittie at collabora.co.uk>
Update code generation machinery
Simon McVittie <simon.mcvittie at collabora.co.uk>
Don't use tar-ustar now that we've removed the long filename that caused problems (it turns out to be an automake 1.9 feature anyway)
Simon McVittie <simon.mcvittie at collabora.co.uk>
configure.ac: check for mkdir -p (needed for updated code-gen)
Simon McVittie <simon.mcvittie at collabora.co.uk>
Fix data/Makefile.am
Simon McVittie <simon.mcvittie at collabora.co.uk>
Require telepathy-glib 0.7.3 (path of least resistance for updating code-gen)
Simon McVittie <simon.mcvittie at collabora.co.uk>
Don't distribute .service.in file with insanely long name (patch from my Gabble branch)
Simon McVittie <simon.mcvittie at collabora.co.uk>
Add a hard dependency on telepathy-glib 0.6.1 and avoid using #ifdef for tp_debug_set_flags
Simon McVittie <simon.mcvittie at collabora.co.uk>
Move extensions/tools to tools (consistent with Gabble, telepathy-glib, etc.)
More information about the Telepathy-commits
mailing list