[tracker: 9/9] Merge branch 'fts4-fixes'

[Martyn James Russell <mr src gnome org>]

commit c5ea4a7cce2ee6b08fa736a49be896291818cde7
Merge: 1e97a44 6739970
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Feb 15 09:58:12 2013 +0000

    Merge branch 'fts4-fixes'

 .../org.freedesktop.Tracker.FTS.gschema.xml.in     |    7 ---
 data/ontologies/11-rdf.ontology                    |    1 +
 data/ontologies/30-nie.ontology                    |    2 -
 data/ontologies/32-nco.ontology                    |    9 ---
 data/ontologies/38-nmm.ontology                    |    2 -
 docs/manpages/tracker-sparql.1                     |    3 +-
 src/libtracker-data/tracker-data-manager.c         |   55 ++------------------
 src/libtracker-data/tracker-property.c             |   26 ---------
 src/libtracker-data/tracker-property.h             |    3 -
 src/libtracker-fts/tracker-fts-config.c            |   37 -------------
 src/libtracker-fts/tracker-fts-config.h            |    7 +--
 .../test-ontologies/add-class/11-rdf.ontology      |    5 --
 .../add-domainIndex/11-rdf.ontology                |    5 --
 .../test-ontologies/add-prop/11-rdf.ontology       |    5 --
 .../test-ontologies/basic-future/11-rdf.ontology   |    5 --
 .../test-ontologies/basic/11-rdf.ontology          |    5 --
 .../test-ontologies/cardinality/11-rdf.ontology    |    5 --
 .../test-ontologies/indexed/11-rdf.ontology        |    5 --
 .../test-ontologies/notify/11-rdf.ontology         |    5 --
 .../property-promotion/11-rdf.ontology             |    5 --
 .../property-range-int-to-string/11-rdf.ontology   |    5 --
 .../property-range-string-to-date/11-rdf.ontology  |    5 --
 .../superclass-remove/11-rdf.ontology              |    5 --
 tests/libtracker-fts/data.ontology                 |    3 +-
 tests/libtracker-fts/limits/fts3limits-1.out       |    1 +
 tests/libtracker-fts/limits/fts3limits-2.out       |    1 +
 tests/libtracker-fts/limits/fts3limits-4.out       |    1 +
 tests/libtracker-fts/prefix/fts3prefix-2.out       |    1 +
 28 files changed, 14 insertions(+), 205 deletions(-)
---