[tracker/harmattan-pre-signal-updates: 952/1380] Merge branch 'master' into harmattan

[Martyn James Russell <mr src gnome org>]

commit 2550a8b82d461667ef5a62db7d93e5ae59cad5bb
Merge: ad1a87f 95c0fe4
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Aug 12 17:59:30 2010 +0100

    Merge branch 'master' into harmattan

 NEWS                                               |   27 +
 autogen.sh                                         |   31 +-
 configure.ac                                       |   39 +-
 data/Makefile.am                                   |    5 +
 data/ontologies/33-nfo.ontology                    |    8 +
 data/ontologies/89-mtp.ontology                    |    2 +-
 data/tracker-sparql.pc.in                          |   13 +
 docs/reference/Makefile.am                         |    1 +
 docs/reference/libtracker-sparql/Makefile.am       |   64 ++
 docs/reference/libtracker-sparql/examples.sgml     |  264 ++++++
 .../libtracker-sparql/libtracker-sparql-docs.sgml  |   39 +
 .../libtracker-sparql-sections.txt                 |  137 +++
 .../libtracker-sparql/libtracker-sparql.types      |    4 +
 docs/reference/libtracker-sparql/overview.sgml     |  114 +++
 docs/reference/libtracker-sparql/version.xml.in    |    1 +
 po/nds.po                                          |   40 +-
 po/zh_CN.po                                        |   47 +-
 src/Makefile.am                                    |    1 +
 src/libtracker-common/tracker-log.c                |  113 ++--
 src/libtracker-common/tracker-log.h                |    2 -
 src/libtracker-data/tracker-db-manager.c           |  140 ++--
 src/libtracker-data/tracker-sparql-expression.vala |    4 +-
 src/libtracker-miner/tracker-miner-fs.c            |   85 ++-
 src/libtracker-sparql/.gitignore                   |    8 +
 src/libtracker-sparql/Makefile.am                  |   72 ++
 src/libtracker-sparql/config.vapi                  |   23 +
 src/libtracker-sparql/tracker-builder.vala         |  603 ++++++++++++
 src/libtracker-sparql/tracker-connection.vala      |  397 ++++++++
 src/libtracker-sparql/tracker-cursor.vala          |  136 +++
 src/libtracker-sparql/tracker-plugin-loader.vala   |  188 ++++
 src/libtracker-sparql/tracker-uri.c                |  257 +++++
 src/libtracker-sparql/tracker-utils.vala           |   85 ++
 src/tracker-extract/Makefile.am                    |   14 +
 src/tracker-extract/tracker-extract-gupnp-dlna.c   |  999 ++++++++++++++++++++
 src/tracker-extract/tracker-extract-mp3.c          |   25 +
 src/tracker-extract/tracker-main.c                 |   15 -
 src/tracker-store/tracker-store.c                  |    1 -
 tests/libtracker-data/algebra/Makefile.am          |    4 +
 tests/libtracker-data/algebra/filter-in-3.out      |    4 +
 tests/libtracker-data/algebra/filter-in-3.rq       |    4 +
 tests/libtracker-data/algebra/filter-in-4.out      |    4 +
 tests/libtracker-data/algebra/filter-in-4.rq       |    4 +
 tests/libtracker-data/tracker-sparql-test.c        |    2 +
 43 files changed, 3808 insertions(+), 218 deletions(-)
---