[Pkg-telepathy-commits] [folks] 02/10: Merge tag 'upstream/0.9.6' into debian-experimental

Laurent Bigonville bigon at moszumanska.debian.org
Fri Dec 27 16:16:06 UTC 2013


This is an automated email from the git hooks/post-receive script.

bigon pushed a commit to branch debian-experimental
in repository folks.

commit 8c3a423804a6c217889e300b26867ff799bd2d35
Merge: 71cea56 3ca77a0
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Fri Dec 27 03:05:34 2013 +0100

    Merge tag 'upstream/0.9.6' into debian-experimental
    
    Upstream version 0.9.6

 ChangeLog                                          | 5151 ++++++++++-------
 INSTALL                                            |    8 +-
 Makefile.am                                        |   26 +-
 Makefile.in                                        |  346 +-
 NEWS                                               |   36 +
 aclocal.m4                                         | 1880 +++---
 backends/Makefile.am                               |    7 +
 backends/Makefile.in                               |  284 +-
 backends/backend.mk                                |   81 +
 backends/bluez/Makefile.am                         |   41 +
 backends/{key-file => bluez}/Makefile.in           |  425 +-
 backends/bluez/bluez-backend-factory.c             |  169 +
 .../bluez-backend-factory.vala}                    |   20 +-
 backends/bluez/bluez-backend.c                     | 2161 +++++++
 backends/bluez/bluez-backend.vala                  |  634 +++
 backends/bluez/bluez-persona-store.c               | 3526 ++++++++++++
 backends/bluez/bluez-persona-store.vala            |  843 +++
 backends/bluez/bluez-persona.c                     | 1205 ++++
 .../bluez-persona.vala}                            |  162 +-
 backends/bluez/bluez_la_vala.stamp                 |    1 +
 backends/bluez/org-bluez-obex-client.c             | 1747 ++++++
 backends/bluez/org-bluez-obex-client.vala          |   99 +
 backends/bluez/org-bluez.c                         | 1407 +++++
 backends/bluez/org-bluez.vala                      |  116 +
 backends/eds/Makefile.am                           |   42 +-
 backends/eds/Makefile.in                           |  353 +-
 backends/eds/eds-backend-factory.c                 |   99 +-
 backends/eds/eds-backend-factory.vala              |   27 +-
 backends/eds/eds-backend.c                         |    2 +-
 backends/eds/lib/FolksEds-0.6.gir                  |  790 +--
 backends/eds/lib/Makefile.am                       |   71 +-
 backends/eds/lib/Makefile.in                       |  408 +-
 backends/eds/lib/edsf-namespace.c                  |    2 +-
 backends/eds/lib/edsf-persona-store.c              |  412 +-
 backends/eds/lib/edsf-persona-store.vala           |  113 +-
 backends/eds/lib/edsf-persona.c                    |   51 +-
 backends/eds/lib/edsf-persona.vala                 |   15 +-
 backends/eds/lib/folks-eds-uninstalled.pc.in       |    2 +-
 backends/eds/lib/folks-eds.vapi                    |    4 +-
 backends/eds/lib/folks/folks-eds.h                 |    2 +-
 backends/eds/lib/memory-icon.c                     |  498 --
 backends/eds/lib/memory-icon.vala                  |  135 -
 backends/key-file/Makefile.am                      |   48 +-
 backends/key-file/Makefile.in                      |  264 +-
 backends/key-file/kf-backend-factory.c             |   95 +-
 backends/key-file/kf-backend-factory.vala          |   25 +-
 backends/key-file/kf-backend.c                     |    2 +-
 backends/key-file/kf-persona-store.c               |   14 +-
 backends/key-file/kf-persona-store.vala            |    3 +-
 backends/key-file/kf-persona.c                     |   16 +-
 backends/key-file/kf-persona.vala                  |    6 +-
 backends/libsocialweb/Makefile.am                  |   48 +-
 backends/libsocialweb/Makefile.in                  |  361 +-
 .../libsocialweb/lib/FolksLibsocialweb-0.6.gir     |  346 +-
 backends/libsocialweb/lib/Makefile.am              |   65 +-
 backends/libsocialweb/lib/Makefile.in              |  370 +-
 .../lib/folks-libsocialweb-uninstalled.pc.in       |    2 +-
 backends/libsocialweb/lib/folks-libsocialweb.vapi  |    2 +-
 .../libsocialweb/lib/folks/folks-libsocialweb.h    |    2 +-
 backends/libsocialweb/lib/swf-namespace.c          |    2 +-
 backends/libsocialweb/lib/swf-persona-store.c      |    6 +-
 backends/libsocialweb/lib/swf-persona.c            |   10 +-
 backends/libsocialweb/lib/swf-persona.vala         |    3 +-
 backends/libsocialweb/sw-backend-factory.c         |   95 +-
 backends/libsocialweb/sw-backend-factory.vala      |   25 +-
 backends/libsocialweb/sw-backend.c                 |    2 +-
 backends/ofono/Makefile.am                         |   59 +-
 backends/ofono/Makefile.in                         |  278 +-
 backends/ofono/ofono-backend-factory.c             |   97 +-
 backends/ofono/ofono-backend-factory.vala          |   23 +-
 backends/ofono/ofono-backend.c                     |  310 +-
 backends/ofono/ofono-backend.vala                  |   67 +-
 backends/ofono/ofono-persona-store.c               |  127 +-
 backends/ofono/ofono-persona-store.vala            |    4 +
 backends/ofono/ofono-persona.c                     |    8 +-
 backends/ofono/ofono-persona.vala                  |    3 +-
 backends/ofono/org-ofono.c                         |    2 +-
 backends/telepathy/Makefile.am                     |   54 +-
 backends/telepathy/Makefile.in                     |  368 +-
 backends/telepathy/lib/FolksTelepathy-0.6.gir      |  458 +-
 backends/telepathy/lib/Makefile.am                 |   94 +-
 backends/telepathy/lib/Makefile.in                 |  442 +-
 backends/telepathy/lib/TpLowlevel-0.6.gir          |   37 -
 backends/telepathy/lib/TpLowlevel-0.6.typelib      |  Bin 1224 -> 824 bytes
 backends/telepathy/lib/folks-telepathy.vapi        |    2 +-
 backends/telepathy/lib/folks/folks-telepathy.h     |    2 +-
 .../telepathy/lib/libtp_lowlevel_la_vala.stamp     |    1 +
 backends/telepathy/lib/tp-lowlevel.c               |   71 -
 backends/telepathy/lib/tp-lowlevel.h               |   11 -
 backends/telepathy/lib/tp-lowlevel.vapi            |    2 -
 backends/telepathy/lib/tp-zeitgeist-dummy.c        |   89 +-
 backends/telepathy/lib/tp-zeitgeist-dummy.h        |    9 +-
 backends/telepathy/lib/tp-zeitgeist-dummy.vala     |    3 +-
 backends/telepathy/lib/tp-zeitgeist-dummy.vapi     |    4 +-
 backends/telepathy/lib/tp-zeitgeist.c              | 1410 ++---
 backends/telepathy/lib/tp-zeitgeist.h              |    9 +-
 backends/telepathy/lib/tp-zeitgeist.vala           |   11 +-
 backends/telepathy/lib/tp-zeitgeist.vapi           |    4 +-
 backends/telepathy/lib/tpf-logger.c                |    2 +-
 backends/telepathy/lib/tpf-namespace.c             |    2 +-
 backends/telepathy/lib/tpf-persona-store-cache.c   |    2 +-
 backends/telepathy/lib/tpf-persona-store.c         |  416 +-
 backends/telepathy/lib/tpf-persona-store.vala      |   33 +-
 backends/telepathy/lib/tpf-persona.c               |   20 +-
 backends/telepathy/lib/tpf-persona.vala            |    6 +-
 backends/telepathy/tp-backend-factory.c            |   95 +-
 backends/telepathy/tp-backend-factory.vala         |   25 +-
 backends/telepathy/tp-backend.c                    |    2 +-
 backends/tracker/Makefile.am                       |   43 +-
 backends/tracker/Makefile.in                       |  359 +-
 backends/tracker/lib/FolksTracker-0.6.gir          | 1039 ++--
 backends/tracker/lib/Makefile.am                   |   63 +-
 backends/tracker/lib/Makefile.in                   |  357 +-
 .../tracker/lib/folks-tracker-uninstalled.pc.in    |    2 +-
 backends/tracker/lib/folks-tracker.vapi            |    2 +-
 backends/tracker/lib/folks/folks-tracker.h         |    2 +-
 backends/tracker/lib/trf-namespace.c               |    2 +-
 backends/tracker/lib/trf-persona-store.c           |   58 +-
 backends/tracker/lib/trf-persona-store.vala        |    3 +-
 backends/tracker/lib/trf-persona.c                 |   12 +-
 backends/tracker/lib/trf-persona.vala              |   10 +-
 backends/tracker/lib/trf-util.c                    |    2 +-
 backends/tracker/tr-backend-factory.c              |   97 +-
 backends/tracker/tr-backend-factory.vala           |   27 +-
 backends/tracker/tr-backend.c                      |    2 +-
 compile                                            |   99 +-
 config.guess                                       |  194 +-
 config.h.in                                        |    3 +
 config.sub                                         |  114 +-
 configure                                          |  988 ++--
 configure.ac                                       |   44 +-
 depcomp                                            |  487 +-
 docs/Makefile.in                                   |  137 +-
 folks/Makefile.am                                  |   15 +
 folks/Makefile.in                                  |  517 +-
 folks/abstract-field-details.c                     |    2 +-
 folks/alias-details.c                              |    2 +-
 folks/anti-linkable.c                              |    2 +-
 folks/avatar-cache.c                               |    2 +-
 folks/avatar-details.c                             |    2 +-
 folks/backend-store.c                              |    8 +-
 folks/backend.c                                    |    2 +-
 folks/backend.vala                                 |    2 +
 folks/birthday-details.c                           |    2 +-
 folks/build-conf.vapi                              |    3 +
 folks/debug.c                                      |    2 +-
 folks/email-details.c                              |    2 +-
 folks/favourite-details.c                          |    2 +-
 folks/folks-generics.vapi                          |    1 +
 folks/folks-internal.h                             |    2 +-
 folks/folks-internal.vapi                          |    4 +-
 folks/folks-namespace.c                            |    2 +-
 folks/folks.h                                      |    2 +-
 folks/folks.vapi                                   |    2 +-
 folks/gender-details.c                             |    2 +-
 folks/group-details.c                              |    2 +-
 folks/im-details.c                                 |    2 +-
 folks/individual-aggregator.c                      |  690 +--
 folks/individual-aggregator.vala                   |   32 +-
 folks/individual.c                                 | 1561 +++--
 folks/individual.vala                              |  234 +-
 folks/interaction-details.c                        |    2 +-
 folks/internal.c                                   |   56 +-
 folks/internal.vala                                |    2 +
 folks/local-id-details.c                           |    2 +-
 folks/location-details.c                           |    2 +-
 folks/name-details.c                               |    2 +-
 folks/note-details.c                               |    2 +-
 folks/object-cache.c                               |   14 +-
 folks/object-cache.vala                            |    3 +-
 folks/persona-store.c                              |    4 +-
 folks/persona.c                                    |    2 +-
 folks/phone-details.c                              |  349 +-
 folks/phone-details.vala                           |   70 +-
 folks/postal-address-details.c                     |   14 +-
 folks/potential-match.c                            |    2 +-
 folks/presence-details.c                           |    2 +-
 folks/role-details.c                               |   14 +-
 folks/types.c                                      |    2 +-
 folks/url-details.c                                |    2 +-
 folks/utils.c                                      |    2 +-
 folks/warnings.h                                   |   85 +
 folks/web-service-details.c                        |    2 +-
 install-sh                                         |   14 +-
 m4/intltool.m4                                     |  237 +
 m4/libtool.m4                                      |    6 +-
 missing                                            |  414 +-
 po/LINGUAS                                         |    2 +
 po/POTFILES.in                                     |    3 +
 po/POTFILES.skip                                   |    3 +
 po/eu.po                                           |  170 +-
 po/{id.po => fi.po}                                |  362 +-
 po/gl.po                                           |  270 +-
 po/id.po                                           |  286 +-
 po/lt.po                                           |  290 +-
 po/pl.po                                           |  293 +-
 po/pt_BR.po                                        |  435 +-
 po/sl.po                                           |  297 +-
 po/sr.po                                           |  287 +-
 po/sr at latin.po                                     |  287 +-
 po/{id.po => tr.po}                                |  394 +-
 test-driver                                        |  127 -
 tests/Makefile.am                                  |    6 +
 tests/Makefile.in                                  |  284 +-
 tests/data/Makefile.in                             |  104 +-
 tests/eds/Makefile.am                              |   13 +-
 tests/eds/Makefile.in                              | 1474 ++---
 tests/eds/add-contacts-stress-test.c               |  878 +--
 tests/eds/add-persona.c                            | 3072 +++++-----
 tests/eds/anti-linking.c                           | 1466 ++---
 tests/eds/avatar-details.c                         |  554 +-
 tests/eds/email-details.c                          |  920 +--
 tests/eds/enable-disable-stores.c                  |  698 +--
 tests/eds/helper-create-many-contacts.c            |  957 ++--
 tests/eds/helper-create-many-contacts.vala         |    3 +-
 tests/eds/helper-delete-contacts.c                 |  481 +-
 tests/eds/helper-delete-contacts.vala              |    3 +-
 tests/eds/helper-prepare-aggregator.c              |  890 +--
 tests/eds/im-details.c                             |  556 +-
 tests/eds/individual-retrieval.c                   |  482 +-
 tests/eds/link-personas-diff-stores.c              | 1414 ++---
 tests/eds/link-personas.c                          | 2766 ++++-----
 tests/eds/linkable-properties.c                    |  760 +--
 tests/eds/name-details.c                           | 1070 ++--
 tests/eds/perf.c                                   | 1686 +++---
 tests/eds/persona-store-tests.c                    |  676 +--
 tests/eds/phone-details.c                          |  844 +--
 tests/eds/postal-address-details.c                 |  544 +-
 tests/eds/remove-persona.c                         |  772 +--
 tests/eds/removing-contacts.c                      |  394 +-
 tests/eds/set-avatar.c                             | 1220 ++--
 tests/eds/set-birthday.c                           |  506 +-
 tests/eds/set-emails.c                             |  438 +-
 tests/eds/set-gender.c                             |  444 +-
 tests/eds/set-im-addresses.c                       |  486 +-
 tests/eds/set-is-favourite.c                       |  444 +-
 tests/eds/set-names.c                              |  584 +-
 tests/eds/set-notes.c                              |  502 +-
 tests/eds/set-phones.c                             |  518 +-
 tests/eds/set-postal-addresses.c                   |  526 +-
 tests/eds/set-properties-race.c                    |  550 +-
 tests/eds/set-roles.c                              |  470 +-
 tests/eds/set-structured-name.c                    |  450 +-
 tests/eds/set-urls.c                               |  652 +--
 tests/eds/store-removed.c                          |  636 +--
 tests/eds/updating-contacts.c                      |  520 +-
 tests/folks/Makefile.am                            |    1 +
 tests/folks/Makefile.in                            |  856 +--
 tests/folks/abstract-field-details.c               |  948 ++--
 tests/folks/aggregation.c                          | 5956 ++++++++++----------
 tests/folks/aggregation.vala                       |   42 +-
 tests/folks/async-locking.c                        |  466 +-
 tests/folks/avatar-cache.c                         |  666 +--
 tests/folks/backend-loading.c                      | 1432 ++---
 tests/folks/init.c                                 |  544 +-
 tests/folks/object-cache.c                         | 1910 +++----
 tests/folks/phone-field-details.c                  |  150 +-
 tests/folks/phone-field-details.vala               |    7 +-
 tests/folks/small-set.c                            | 2168 +++----
 tests/folks/utils.c                                |  102 +-
 tests/key-file/Makefile.am                         |    1 +
 tests/key-file/Makefile.in                         |  705 +--
 tests/key-file/individual-retrieval.c              |  418 +-
 tests/lib/Makefile.in                              |  319 +-
 tests/lib/eds/Makefile.am                          |    5 +
 tests/lib/eds/Makefile.in                          |  235 +-
 tests/lib/eds/backend.c                            | 2542 +++++----
 tests/lib/eds/backend.vala                         |    3 +-
 tests/lib/eds/eds-test.h                           |    2 +-
 tests/lib/eds/eds-test.vapi                        |    2 +-
 tests/lib/eds/test-case.c                          |  116 +-
 tests/lib/folks-test-internal.h                    |    2 +-
 tests/lib/folks-test.h                             |    2 +-
 tests/lib/folks-test.vapi                          |    2 +-
 tests/lib/key-file/Makefile.am                     |    5 +
 tests/lib/key-file/Makefile.in                     |  235 +-
 tests/lib/key-file/backend.c                       |  276 +-
 tests/lib/key-file/kf-test.h                       |    2 +-
 tests/lib/key-file/kf-test.vapi                    |    2 +-
 tests/lib/key-file/test-case.c                     |   32 +-
 tests/lib/libsocialweb/Makefile.am                 |    5 +
 tests/lib/libsocialweb/Makefile.in                 |  237 +-
 tests/lib/libsocialweb/backend.c                   | 1310 ++---
 tests/lib/libsocialweb/libsocialweb-test.h         |    2 +-
 tests/lib/libsocialweb/libsocialweb-test.vapi      |    2 +-
 tests/lib/libsocialweb/test-case.c                 |  134 +-
 tests/lib/telepathy/Makefile.am                    |    5 +
 tests/lib/telepathy/Makefile.in                    |  321 +-
 tests/lib/telepathy/contactlist/Makefile.am        |    4 +
 tests/lib/telepathy/contactlist/Makefile.in        |  208 +-
 .../telepathy/contactlist/tp-test-contactlist.gir  |    5 +-
 tests/lib/telepathy/test-case.c                    |  254 +-
 tests/lib/telepathy/tpf-test.h                     |    2 +-
 tests/lib/telepathy/tpf-test.vapi                  |    2 +-
 tests/lib/test-case.c                              |  646 +--
 tests/lib/test-utils.c                             | 1224 ++--
 tests/lib/tracker/Makefile.am                      |    5 +
 tests/lib/tracker/Makefile.in                      |  237 +-
 tests/lib/tracker/backend.c                        | 2154 +++----
 tests/lib/tracker/test-case.c                      |   66 +-
 tests/lib/tracker/tracker-test.h                   |    2 +-
 tests/lib/tracker/tracker-test.vapi                |    2 +-
 tests/libsocialweb/Makefile.am                     |    2 +
 tests/libsocialweb/Makefile.in                     |  720 +--
 tests/libsocialweb/aggregation.c                   | 1044 ++--
 tests/libsocialweb/dummy-lsw.c                     | 1090 ++--
 tests/telepathy/Makefile.am                        |    2 +-
 tests/telepathy/Makefile.in                        |  779 +--
 tests/telepathy/fake-tp-backend.c                  |  106 +-
 tests/telepathy/individual-properties.c            | 3951 ++++++-------
 tests/telepathy/individual-properties.vala         |   11 +-
 tests/telepathy/individual-retrieval.c             | 1726 +++---
 tests/telepathy/individual-retrieval.vala          |   47 +-
 tests/telepathy/individual-zeitgeist.c             |  370 +-
 tests/telepathy/init.c                             |  138 +-
 tests/telepathy/persona-store-capabilities.c       |  490 +-
 tests/tools/Makefile.in                            |  104 +-
 tests/tracker/Makefile.am                          |   72 +-
 tests/tracker/Makefile.in                          | 1693 ++----
 tests/tracker/add-contact.c                        |  402 +-
 tests/tracker/add-persona.c                        | 2852 +++++-----
 tests/tracker/additional-names-updates.c           |  466 +-
 tests/tracker/avatar-details-interface.c           |  426 +-
 tests/tracker/avatar-updates.c                     |  554 +-
 tests/tracker/birthday-details-interface.c         |  414 +-
 tests/tracker/birthday-updates.c                   |  528 +-
 tests/tracker/default-contact.c                    |  390 +-
 tests/tracker/duplicated-emails.c                  | 1066 ++--
 tests/tracker/duplicated-phones.c                  | 1066 ++--
 tests/tracker/email-details-interface.c            |  410 +-
 tests/tracker/emails-updates.c                     |  682 +--
 tests/tracker/family-name-updates.c                |  456 +-
 tests/tracker/favourite-details-interface.c        |  456 +-
 tests/tracker/favourite-updates.c                  |  522 +-
 tests/tracker/favourite-updates.vala               |    2 +-
 tests/tracker/fullname-updates.c                   |  412 +-
 tests/tracker/gender-details-interface.c           |  378 +-
 tests/tracker/given-name-updates.c                 |  456 +-
 tests/tracker/im-details-interface.c               |  512 +-
 tests/tracker/imaddresses-updates.c                |  676 +--
 tests/tracker/individual-retrieval.c               |  406 +-
 tests/tracker/link-personas-via-local-ids.c        | 1076 ++--
 tests/tracker/link-personas.c                      | 1308 ++---
 tests/tracker/match-all.c                          | 1096 ++--
 tests/tracker/match-email-addresses.c              | 1104 ++--
 tests/tracker/match-im-addresses.c                 | 1110 ++--
 tests/tracker/match-known-emails.c                 | 1104 ++--
 tests/tracker/match-name.c                         | 1028 ++--
 tests/tracker/match-phone-number.c                 | 1110 ++--
 tests/tracker/name-details-interface.c             |  580 +-
 tests/tracker/nickname-updates.c                   |  436 +-
 tests/tracker/note-details-interface.c             |  508 +-
 tests/tracker/phone-details-interface.c            |  428 +-
 tests/tracker/phones-updates.c                     |  592 +-
 tests/tracker/postal-address-details-interface.c   |  726 +--
 tests/tracker/prefix-name-updates.c                |  456 +-
 tests/tracker/remove-contact.c                     |  426 +-
 tests/tracker/remove-persona.c                     |  852 +--
 tests/tracker/role-details-interface.c             |  466 +-
 tests/tracker/set-avatar.c                         |  428 +-
 tests/tracker/set-birthday.c                       |  450 +-
 tests/tracker/set-duplicate-email.c                |  934 +--
 tests/tracker/set-emails.c                         |  512 +-
 tests/tracker/set-favourite.c                      |  540 +-
 tests/tracker/set-full-name.c                      |  430 +-
 tests/tracker/set-gender.c                         |  392 +-
 tests/tracker/set-im-addresses.c                   |  542 +-
 tests/tracker/set-nickname.c                       |  428 +-
 tests/tracker/set-notes.c                          |  460 +-
 tests/tracker/set-null-avatar.c                    |  444 +-
 tests/tracker/set-phones.c                         |  524 +-
 tests/tracker/set-postal-addresses.c               |  590 +-
 tests/tracker/set-roles.c                          |  480 +-
 tests/tracker/set-structured-name.c                |  472 +-
 tests/tracker/set-urls.c                           |  650 +--
 tests/tracker/suffix-name-updates.c                |  458 +-
 tests/tracker/url-details-interface.c              |  424 +-
 tests/tracker/website-updates.c                    |  524 +-
 tools/Makefile.am                                  |    1 +
 tools/Makefile.in                                  |  331 +-
 tools/import-pidgin.c                              |   12 +-
 tools/import.c                                     |    2 +-
 tools/inspect/Makefile.am                          |    1 +
 tools/inspect/Makefile.in                          |  235 +-
 tools/inspect/command-backends.c                   |    2 +-
 tools/inspect/command-debug.c                      |    2 +-
 tools/inspect/command-help.c                       |    2 +-
 tools/inspect/command-individuals.c                |    2 +-
 tools/inspect/command-linking.c                    |    2 +-
 tools/inspect/command-persona-stores.c             |    2 +-
 tools/inspect/command-personas.c                   |    2 +-
 tools/inspect/command-quit.c                       |    2 +-
 tools/inspect/command-set.c                        |    2 +-
 tools/inspect/command-signals.c                    |    2 +-
 tools/inspect/inspect.c                            |    2 +-
 tools/inspect/signal-manager.c                     |    2 +-
 tools/inspect/utils.c                              |    2 +-
 397 files changed, 79640 insertions(+), 72561 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/folks.git



More information about the Pkg-telepathy-commits mailing list