[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

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

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove INSTALL from Darcs, autogen.sh will make one for us

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Prefer to use automake-1.8, to check that our build will still work in Scratchbox

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Don't AC_DEFINE, AC_SUBST or AS_AC_EXPAND the D-Bus services directory - there's no point, and AS_AC_EXPAND is Bad And Wrong

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Turn off tar-ustar in configure.ac - it's not supported by automake 1.8, as used on Maemo

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Simplify data/Makefile.am and rename .service.in filename to be shorter.

Shortening the filename should mean we no longer need to use tar-ustar,
since we're much less likely to hit the old 99-character tarball filename
limit, even if we do a datestamped prerelease like
`make dist distdir=telepathy-gabble-0.7.3.1-prerelease-20080416` (prereleases
for laptop.org were the original motivation for using tar-ustar).

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Don't ship as-ac-expand.m4, we no longer need it

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    tests/twisted/tools/: also rename .service.in file here