commit e1da1db6af2930e9ed5045d3abb0c73c4f74d26e
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Sun Jun 16 20:23:17 2013 +0100

    core: Keep leading ‘+’s when normalising phone numbers

    These are needed to indicate country codes for international numbers.

    See: https://bugzilla.gnome.org/show_bug.cgi?id=685992
    Closes: https://bugzilla.gnome.org/show_bug.cgi?id=701850

 NEWS                                 |  2 ++
 folks/phone-details.vala             |  5 +--
 tests/folks/Makefile.am              |  5 +++
 tests/folks/phone-field-details.vala | 66
 ++++++++++++++++++++++++++++++++++++
 4 files changed, 76 insertions(+), 2 deletions(-)

commit 57621de89d49b06a1db7436de346afdd866b1637
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Wed Jul 31 14:24:58 2013 +0200

    build: Bump EDS dependency to 3.9.1

    This EDS version fixes a Vala binding which was causing folks to
    not build.

    Closes: https://bugzilla.gnome.org/show_bug.cgi?id=703516

 NEWS         | 4 ++++
 configure.ac | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

commit ba71ffbfc6b3c3f5e006e2d6e164bdd07b5c9b8a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Jul 31 12:55:38 2013 +0200

    consider an individual as favorite if one of its persona is a favorite

    We used to consider all the personas as having the "is-favourite"
    property
    defined. So _update_single_valued_property was giving the priority
    to the
    primary store (usually EDS) leading to the individual being
    considered as
    unfavourite even if it has a Telepathy persona as favourite.

    We now consider the "is-favourite" property being defined if it's
    set to TRUE
    so any favourite persona will take presedence.

    https://bugzilla.gnome.org/show_bug.cgi?id=705196

 NEWS                  | 1 +
 folks/individual.vala | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

commit e43bc1e4b33ba211712fbf0b04e29406d511e983
Author: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Date:   Fri Jul 26 10:48:33 2013 +0100

    key-file: do not use deprecated loop_run_with_non_fatal_timeout()

    Closes: https://bugzilla.gnome.org/show_bug.cgi?id=704922

 NEWS                                     |  1 +
 tests/key-file/individual-retrieval.vala | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

commit d5fe08286a8c04bdba55d20416439b2804b7af0f
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:   Mon Jul 29 10:34:39 2013 +0200

    Fix coding style in previous patch

 backends/telepathy/lib/tpf-persona-store.vala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0771853010037112233c4ff7977cf91de7e7b14a
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:   Wed Jul 17 12:51:49 2013 +0200

    TpfPersona: Manage the TpContact weak ref ourself instead of using
    GWeakRef

    https://bugzilla.gnome.org/show_bug.cgi?id=702165

 backends/telepathy/lib/tpf-persona-store.vala |  2 +
 backends/telepathy/lib/tpf-persona.vala       | 68
 ++++++++++-----------------
 2 files changed, 26 insertions(+), 44 deletions(-)

commit deefe3f9194aca19f1b4f98dc16a736ae7e79e0a
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Mon Jul 8 16:23:30 2013 -0700

    build: distcheck fails trying to remove a srcdir file

    When we referenced $(srcdir)/libfolks_telepathy_la_vala.stamp, we were
    telling automake that it was OK to delete it from the srcdir, which is
    considered bad form. By referring to it from the builddir, we don't
    implicitly suggest it can be deleted (as it is as a part of its
    creation
    process).

    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=703830

 NEWS                               | 2 ++
 backends/telepathy/lib/Makefile.am | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

commit 61600fec79c2a437fb763257456a3e3b4c386388
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Mon Jul 8 10:15:35 2013 -0700

    docs: don't include the img/* content to avoid a build break

    This ignores content in the img/ subdir to avoid build errors if
    it's empty
    (as it currently is). This directory will store custom images,
    so if we add
    any, we will need to re-add those files to the appropriate *_DATA
    definitions.

 docs/Makefile.am | 28 ++++------------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

commit 8a495d461ba4c61724218c7e5b5be87dace7197f
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Mon Jul 8 09:14:09 2013 -0700

    build: don't depend on tp-zeitgeist.vapi for --disable-zeitgeist

    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=701099

 backends/telepathy/lib/Makefile.am | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

commit d5465ae044d5297102295a2cacd4c0438fefe47f
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Mon Jul 8 15:05:42 2013 +0100

    Revert "docs: fix the path to the backend support library header
    files"

    This reverts commit a945327bcbbab2af0c4871e9cbb70080ec71db8b.

    See commit 311690817f40affee131cbd64870f9f5c4d32196 for details.

 docs/Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 311690817f40affee131cbd64870f9f5c4d32196
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Mon Jul 8 12:49:16 2013 +0100

    Revert "build: Don’t build Vala headers in a subdirectory
    unnecessarily"

    This reverts commit 4c06ecc26bfde7397357ef4ae7ad83a5925db43d
    because it caused build failures when building folks for the
    first time
    without a system-installed copy of the development headers.

 backends/eds/lib/Makefile.am          | 6 +++---
 backends/libsocialweb/lib/Makefile.am | 6 +++---
 backends/telepathy/lib/Makefile.am    | 6 +++---
 backends/tracker/lib/Makefile.am      | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

commit 2ebe3cbddf7c422c3001a8c4127958f5167e9f66
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Mon Jul 8 12:41:16 2013 +0100

    Bug 703709 — can't compile folks. fails at GISCAN TpLowlevel-0.6.gir

    Add a missing GNU Make dependency for the GIR file.

    Closes: https://bugzilla.gnome.org/show_bug.cgi?id=703709

 NEWS                               | 1 +
 backends/telepathy/lib/Makefile.am | 2 ++
 2 files changed, 3 insertions(+)

commit 7825e0a76dcb999c2643898adfb26d421dc042b1
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Fri Jul 5 15:41:39 2013 -0700

    docs: links cannot span multiple lines

 folks/presence-details.vala | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit bd7d1fa5aabeadfeec70387dcb39b4a55dc17ee2
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Fri Jul 5 15:39:19 2013 -0700

    docs: correctly delimit links in the tp-zeitgeist comments

 backends/telepathy/lib/tp-zeitgeist-dummy.vala | 2 +-
 backends/telepathy/lib/tp-zeitgeist.vala       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit b8f430b58ac2836e8b341c9ba324cbf7eca8a136
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Fri Jul 5 15:20:13 2013 -0700

    docs: only use one copy of the tp-zeitgeist interface

    We can't include both tp-zeitgeist and tp-zeitgeist-dummy because
    valadoc
    will complain of re-definitions. Using the dummy version seems to
    work even
    if --enable-zeitgeist is used, so this should cover us in all cases.

 docs/Makefile.am | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

commit a945327bcbbab2af0c4871e9cbb70080ec71db8b
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Fri Jul 5 15:05:41 2013 -0700

    docs: fix the path to the backend support library header files

 docs/Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 5d4005fb91fafa82d9e7e4c721453e8f5ba820ef
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Fri Jul 5 15:02:47 2013 -0700

    docs: Use the correct Vala version string for valadoc

    It was failing to find the expected driver, previously, which
    broke the
    build

 docs/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d603892ebdd8bad978771bcb090d4d2a2cc330f4
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Fri Jul 5 19:22:42 2013 +0100

    build: Remove redundant variable from Makefile.am

 tests/lib/Makefile.am | 1 -
 1 file changed, 1 deletion(-)

commit 5867cda8e899a873e65796b9aa0492bfc32b95f0
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Fri Jul 5 15:26:51 2013 +0100

    telepathy: Fix build with --disable-zeitgeist

    Vala doesn’t pass #if conditionals through to generated C code,
    so when
    building folks from a tarball, the --[enable|disable]-zeitgeist
    option was
    having no effect, and Zeitgeist was always being pulled into the
    build.

    Fix this by separating the Zeitgeist code out into a small noinst shim
    library and always generating C code for two versions of it: one with
    Zeitgeist enabled, and one with it disabled. The correct one’s C
    code is
    then compiled and linked into libfolks-telepathy.la when building
    from the
    tarball.

    This is a horrible, ugly fix, but the only better fix is to disable
    distribution of generated C code. This was attempted, but thwarted by
    automake’s Vala support.

    Closes: https://bugzilla.gnome.org/show_bug.cgi?id=701099

 backends/telepathy/lib/Makefile.am             | 142 ++++++++++++++-
 backends/telepathy/lib/tp-zeitgeist-dummy.vala |  50 ++++++
 backends/telepathy/lib/tp-zeitgeist.vala       | 231
 +++++++++++++++++++++++++
 backends/telepathy/lib/tpf-persona-store.vala  | 166 ++----------------
 backends/telepathy/lib/tpf-persona.vala        |  18 +-
 configure.ac                                   |   1 +
 6 files changed, 437 insertions(+), 171 deletions(-)

commit 6afd8a4f4d2a8f799aee98ba72d3b5e4ea4d3bb4
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Fri Jul 5 11:09:51 2013 +0100

    telepathy: Move Zeitgeist code entirely into Tpf.PersonaStore

    Ready to split it out into a shim library.

    Helps: https://bugzilla.gnome.org/show_bug.cgi?id=701099

 backends/telepathy/lib/tpf-persona-store.vala | 20 +++++++-
 backends/telepathy/lib/tpf-persona.vala       | 66
 ++++++++++++---------------
 2 files changed, 48 insertions(+), 38 deletions(-)

commit 6b47d66df3f3079880b4b51656886a7cb5fdbec8
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Thu Jun 20 17:28:35 2013 +0100

    build: Makefile whitespace fixes

 backends/libsocialweb/lib/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 04537355224ae5615b2eb3c40c2236702e7473e1
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Thu Jun 20 17:27:50 2013 +0100

    build: Reorder DIST_SUBDIRS to match SUBDIRS

    So we don’t encounter problems during `make dist` due to recursing
    in
    a different order from normal.

 Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 4c06ecc26bfde7397357ef4ae7ad83a5925db43d
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Thu Jun 20 17:27:24 2013 +0100

    build: Don’t build Vala headers in a subdirectory unnecessarily

 backends/eds/lib/Makefile.am          | 6 +++---
 backends/libsocialweb/lib/Makefile.am | 6 +++---
 backends/telepathy/lib/Makefile.am    | 6 +++---
 backends/tracker/lib/Makefile.am      | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

commit 9423e5e214110e3d4d3b77482db87a0ec310599b
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Thu Jun 20 17:26:02 2013 +0100

    build: Remove generated C/H/vapi/stamp files from MAINTAINERCLEANFILES

    As long as --vapi and -H/-h options are correctly passed to a
    target-specific
    VALAFLAGS, automake will automatically add these generated files
    to the
    maintainer-clean target.

    Helps: https://bugzilla.gnome.org/show_bug.cgi?id=701099

 backends/eds/lib/Makefile.am          | 14 +------
 backends/libsocialweb/lib/Makefile.am | 15 +-------
 backends/telepathy/lib/Makefile.am    | 15 +-------
 backends/tracker/lib/Makefile.am      | 15 +-------
 tests/eds/Makefile.am                 | 10 +----
 tests/folks/Makefile.am               | 23 ------------
 tests/key-file/Makefile.am            | 15 --------
 tests/lib/Makefile.am                 |  9 +----
 tests/lib/eds/Makefile.am             |  5 ---
 tests/lib/key-file/Makefile.am        |  5 ---
 tests/lib/libsocialweb/Makefile.am    |  5 ---
 tests/lib/telepathy/Makefile.am       | 11 ------
 tests/lib/tracker/Makefile.am         |  5 ---
 tests/libsocialweb/Makefile.am        | 16 --------
 tests/telepathy/Makefile.am           | 11 ------
 tests/tracker/Makefile.am             | 69
 ++---------------------------------
 16 files changed, 14 insertions(+), 229 deletions(-)

commit 037caf3a4d1d1b8de5fb6c4d78887793f36700a8
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Thu Jun 20 17:21:41 2013 +0100

    build: Use target-specific VALAFLAGS rather than AM_VALAFLAGS

    This allows automake to parse the flags for each target and generate
    appropriate rules. For example, by explicitly specifying “--vapi
    foo.vapi” in
    foo_VALAFLAGS (not just specifying “--library foo”), dependency
    and clean-up
    rules for foo.vapi will be generated by automake. Accordingly,
    this commit
    also adds missing --vapi flags.

    Helps: https://bugzilla.gnome.org/show_bug.cgi?id=701099

 backends/eds/Makefile.am              | 32
 +++++++++++++++----------------
 backends/eds/lib/Makefile.am          |  6 ------
 backends/libsocialweb/Makefile.am     | 21 +++++++++-----------
 backends/libsocialweb/lib/Makefile.am | 36
 ++++++++++++++---------------------
 backends/telepathy/Makefile.am        | 21 +++++++++-----------
 backends/telepathy/lib/Makefile.am    |  1 +
 backends/tracker/Makefile.am          | 27 ++++++++++++--------------
 backends/tracker/lib/Makefile.am      | 11 +----------
 folks/Makefile.am                     | 11 -----------
 tests/lib/Makefile.am                 |  7 ++++++-
 tests/lib/eds/Makefile.am             | 12 +++++++-----
 tests/lib/key-file/Makefile.am        | 12 +++++++-----
 tests/lib/libsocialweb/Makefile.am    | 12 +++++++-----
 tests/lib/telepathy/Makefile.am       | 16 +++++++++-------
 tests/lib/tracker/Makefile.am         | 16 +++++++---------
 tests/telepathy/Makefile.am           |  9 ---------
 16 files changed, 104 insertions(+), 146 deletions(-)

commit 8ebe13c457660de380521874a006425083151741
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Thu Jul 4 21:57:04 2013 +0100

    build: Disable fatal warnings when making distcheck

    It’s just too painful. They’re normally turned on during
    development
    anyway.

    Closes: https://bugzilla.gnome.org/show_bug.cgi?id=703514

 Makefile.am | 1 +
 NEWS        | 2 ++
 2 files changed, 3 insertions(+)

commit 268ee7a387eb505f8a4f5c6c0ab6dc036e65e5e1
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Thu Jun 20 16:35:00 2013 +0100

    build: Remove redundant entries from GITIGNOREFILES

    Now that git.mk has been modified to add better Vala support, these
    are unnecessary.

 backends/eds/Makefile.am           | 6 ------
 backends/key-file/Makefile.am      | 6 ------
 backends/libsocialweb/Makefile.am  | 6 ------
 backends/ofono/Makefile.am         | 5 -----
 backends/telepathy/Makefile.am     | 6 ------
 backends/tracker/Makefile.am       | 6 ------
 folks/Makefile.am                  | 9 +--------
 tests/lib/Makefile.am              | 5 +++++
 tests/lib/eds/Makefile.am          | 5 -----
 tests/lib/key-file/Makefile.am     | 5 -----
 tests/lib/libsocialweb/Makefile.am | 5 -----
 tests/lib/telepathy/Makefile.am    | 4 ----
 tests/lib/tracker/Makefile.am      | 5 -----
 tools/Makefile.am                  | 5 -----
 tools/inspect/Makefile.am          | 5 -----
 15 files changed, 6 insertions(+), 77 deletions(-)

commit e0052149c672f41a5d367d83bc1ef229a937abda
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Thu Jun 20 16:09:36 2013 +0100

    build: Modify git.mk to ignore generated C/H files and Vala .stamp
    files

    These modifications are being submitted upstream.

 git.mk | 4 ++++
 1 file changed, 4 insertions(+)

commit a5ca31d956d9461fd9d399f18921e39a1f3052ff
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Thu Jun 20 16:08:54 2013 +0100

    build: Update git.mk from upstream

    Upstream is now located at https://github.com/behdad/git.mk. The
    file hasn’t
    been modified from upstream.

 git.mk | 175
 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 140 insertions(+), 35 deletions(-)

commit 3a4c15da4a23a0a8d12af11de8c6732de97c69a0
Author: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Date:   Fri Jun 28 10:47:59 2013 +0300

    Do not install the TpLowlevel.{gir,typelib}

    Adapted from a patch by Markus Lehtonen
    <markus.lehtonen@linux.intel.com>

 backends/telepathy/lib/Makefile.am | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

commit 3a643d48655bdebe48cfbc69f6598c2e922eeca4
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Tue Jul 2 09:35:17 2013 -0700

    Make the last commit change use the same formatting for Tp backend

 backends/telepathy/lib/Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 754c4c17d10d6b5dc07412f6f6749fb3b44944fc
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Tue Jul 2 11:50:41 2013 +0200

    Link the support library GIRs against libfolks

    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=703450

 NEWS                                  | 1 +
 backends/eds/lib/Makefile.am          | 5 ++++-
 backends/libsocialweb/lib/Makefile.am | 5 ++++-
 backends/telepathy/lib/Makefile.am    | 4 +++-
 backends/tracker/lib/Makefile.am      | 5 ++++-
 5 files changed, 16 insertions(+), 4 deletions(-)

commit bfec44aba7d7ad3dae9acb5dc811186880984e38
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Thu Jun 27 15:57:33 2013 -0700

    Add namespace and version to libfolks-tracker GIR

    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=703402

 NEWS                                    |  1 +
 backends/tracker/lib/Makefile.am        |  1 +
 backends/tracker/lib/trf-namespace.vala | 30
 ++++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)

commit 2e68ed13a6155af34ff5a76b03b0fd1f5f17d796
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Thu Jun 27 15:31:03 2013 -0700

    Add namespace and version to libfolks-libsocialweb GIR

    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=703402

 backends/libsocialweb/lib/Makefile.am        |  1 +
 backends/libsocialweb/lib/swf-namespace.vala | 30
 ++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

commit 2579f677bdc28a319589f24960abe6f53cfb9564
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Thu Jun 27 15:26:55 2013 -0700

    Add namespace and version to libfolks-eds GIR

    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=703402

 backends/eds/lib/Makefile.am         |  1 +
 backends/eds/lib/edsf-namespace.vala | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

commit abf23432c4c7dc289e10f338a4b323e7ccd3cd43
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Thu Jun 27 11:50:53 2013 -0700

    Add namespace and version to libfolks-telepathy GIR

    Without this in place, JavaScript (and probably other introspected)
    code
    calling Vala client code can end up mysteriously hitting this error:

    CRITICAL **: g_irepository_find_by_name: assertion 'typelib !=
    NULL' failed

    because it fails to locate the proper typelib.

    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=703402

 backends/telepathy/lib/Makefile.am        |  1 +
 backends/telepathy/lib/tpf-namespace.vala | 30
 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

commit 0659f8b044d7d2845502c07ef775ecf1b854e68a
Author: Serhat Demircan <demircan.serhat@gmail.com>
Date:   Tue May 7 22:27:53 2013 +0300

    core: Add PresenceDetails::client-types and implement on Individual
    and Tpf.Persona

    Closes: https://bugzilla.gnome.org/show_bug.cgi?id=699865

 NEWS                                    |  6 ++++++
 backends/telepathy/lib/tpf-persona.vala | 23 +++++++++++++++++++++++
 folks/individual.vala                   | 15 ++++++++++++++-
 folks/presence-details.vala             | 13 +++++++++++++
 4 files changed, 56 insertions(+), 1 deletion(-)

commit c4063335d4b2d0438c5a6d543cfea145c2402d56
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Mon Jun 24 17:54:43 2013 -0700

    Post-release version bump

 NEWS         | 11 +++++++++++
 configure.ac |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)