[tracker: 14/15] Merge branch 'data-in-binary-dirs'

From: Martyn James Russell <mr src gnome org>
To: commits-list gnome org
Cc:
Subject: [tracker: 14/15] Merge branch 'data-in-binary-dirs'
Date: Tue, 21 Oct 2014 09:56:38 +0000 (UTC)
commit 668537e654af4442b760deb02cbb54e7dc50b2e9
Merge: 7c94200 f22c5d6
Author: Martyn Russell <martyn lanedo com>
Date:   Mon Oct 20 15:48:05 2014 +0100

    Merge branch 'data-in-binary-dirs'

 Makefile.am                                        |    2 +-
 configure.ac                                       |   28 ++---
 data/.gitignore                                    |    2 -
 data/Makefile.am                                   |  101 ----------------
 data/dbus/.gitignore                               |    1 -
 data/dbus/Makefile.am                              |   61 ----------
 ...edesktop.Tracker1.Miner.Applications.service.in |    3 -
 ...rg.freedesktop.Tracker1.Miner.EMails.service.in |    2 -
 ...g.freedesktop.Tracker1.Miner.Extract.service.in |    3 -
 ...org.freedesktop.Tracker1.Miner.Files.service.in |    3 -
 .../org.freedesktop.Tracker1.Miner.RSS.service.in  |    3 -
 ...reedesktop.Tracker1.Miner.Userguides.service.in |    3 -
 data/dbus/tracker-miner-web.xml                    |  113 ------------------
 data/gschemas/Makefile.am                          |   29 -----
 data/languages/Makefile.am                         |   18 ---
 data/miners/.gitignore                             |    1 -
 data/miners/Makefile.am                            |   51 --------
 .../tracker-miner-applications.desktop.in.in       |    6 -
 data/miners/tracker-miner-evolution.desktop.in.in  |    5 -
 data/miners/tracker-miner-extract.desktop.in.in    |    6 -
 data/miners/tracker-miner-files.desktop.in.in      |    6 -
 data/miners/tracker-miner-rss.desktop.in.in        |    5 -
 data/miners/tracker-miner-userguides.desktop.in.in |    6 -
 data/tracker-stop-words.txt                        |  109 ------------------
 data/tracker.spec                                  |  121 --------------------
 docs/reference/ontology/Makefile.am                |    4 +-
 docs/tools/gen-doc.sh                              |    2 +-
 docs/tools/generate-ontology.sh                    |    2 +-
 po/POTFILES.in                                     |   36 +++---
 po/POTFILES.skip                                   |   13 +-
 src/Makefile.am                                    |    1 +
 src/libtracker-common/Makefile.am                  |    2 +
 src/libtracker-common/stop-words/Makefile.am       |   17 +++
 .../libtracker-common/stop-words}/stopwords.da     |    0
 .../libtracker-common/stop-words}/stopwords.de     |    0
 .../libtracker-common/stop-words}/stopwords.en     |    0
 .../libtracker-common/stop-words}/stopwords.es     |    0
 .../libtracker-common/stop-words}/stopwords.fi     |    0
 .../libtracker-common/stop-words}/stopwords.fr     |    0
 .../libtracker-common/stop-words}/stopwords.hu     |    0
 .../libtracker-common/stop-words}/stopwords.it     |    0
 .../libtracker-common/stop-words}/stopwords.nb     |    0
 .../libtracker-common/stop-words}/stopwords.nl     |    0
 .../libtracker-common/stop-words}/stopwords.pt     |    0
 .../libtracker-common/stop-words}/stopwords.ru     |    0
 .../libtracker-common/stop-words}/stopwords.sv     |    0
 src/libtracker-common/tracker-language.c           |    2 +-
 src/libtracker-control/.gitignore                  |    1 +
 src/libtracker-control/Makefile.am                 |   11 ++-
 .../libtracker-control}/tracker-control.pc.in      |    0
 src/libtracker-control/tracker-miner-manager.c     |   14 +-
 src/libtracker-data/.gitignore                     |    2 +
 src/libtracker-data/Makefile.am                    |   21 +++-
 .../org.freedesktop.Tracker.DB.gschema.xml.in      |    0
 {data/gschemas => src/libtracker-fts}/.gitignore   |    0
 src/libtracker-fts/Makefile.am                     |   14 +++
 .../org.freedesktop.Tracker.FTS.gschema.xml.in     |    0
 src/libtracker-miner/.gitignore                    |    1 +
 src/libtracker-miner/Makefile.am                   |   17 +++-
 {data => src/libtracker-miner}/tracker-miner.pc.in |    0
 .../libtracker-miner}/tracker-miner.xml            |    0
 src/libtracker-sparql/.gitignore                   |    1 +
 src/libtracker-sparql/Makefile.am                  |   12 ++-
 .../libtracker-sparql}/tracker-sparql.pc.in        |    0
 src/miners/apps/.gitignore                         |    1 +
 src/miners/apps/Makefile.am                        |   39 +++++++
 ...sktop.Tracker1.Miner.Applications.service.in.in |    8 ++
 .../miners/apps}/tracker-miner-apps.desktop.in.in  |    0
 src/miners/fs/.gitignore                           |    3 +
 src/miners/fs/Makefile.am                          |   62 ++++++++++
 ....freedesktop.Tracker.Miner.Files.gschema.xml.in |    0
 ....freedesktop.Tracker1.Miner.Files.service.in.in |    8 ++
 .../miners/fs}/tracker-miner-files-index.xml       |    0
 .../miners/fs}/tracker-miner-fs.desktop.in.in      |    0
 src/miners/rss/.gitignore                          |    1 +
 src/miners/rss/Makefile.am                         |   39 +++++++
 ...rg.freedesktop.Tracker1.Miner.RSS.service.in.in |    8 ++
 .../miners/rss}/tracker-miner-rss.desktop.in.in    |    0
 src/miners/user-guides/.gitignore                  |    1 +
 src/miners/user-guides/Makefile.am                 |   39 +++++++
 ...desktop.Tracker1.Miner.Userguides.service.in.in |    8 ++
 .../tracker-miner-user-guides.desktop.in.in        |    0
 {data => src}/ontologies/10-xsd.description        |    2 +-
 {data => src}/ontologies/10-xsd.ontology           |    0
 {data => src}/ontologies/11-rdf.description        |    2 +-
 {data => src}/ontologies/11-rdf.ontology           |    0
 {data => src}/ontologies/12-nrl.description        |    2 +-
 {data => src}/ontologies/12-nrl.ontology           |    0
 {data => src}/ontologies/20-dc.description         |    2 +-
 {data => src}/ontologies/20-dc.ontology            |    0
 {data => src}/ontologies/30-nie.description        |    2 +-
 {data => src}/ontologies/30-nie.ontology           |    0
 {data => src}/ontologies/31-nao.description        |    2 +-
 {data => src}/ontologies/31-nao.ontology           |    0
 {data => src}/ontologies/32-nco.description        |    2 +-
 {data => src}/ontologies/32-nco.ontology           |    0
 {data => src}/ontologies/33-nfo.description        |    2 +-
 {data => src}/ontologies/33-nfo.ontology           |    0
 {data => src}/ontologies/34-nmo.description        |    0
 {data => src}/ontologies/34-nmo.ontology           |    0
 {data => src}/ontologies/35-ncal.description       |    2 +-
 {data => src}/ontologies/35-ncal.ontology          |    0
 {data => src}/ontologies/36-scal.description       |    2 +-
 {data => src}/ontologies/36-scal.ontology          |    0
 {data => src}/ontologies/37-nid3.description       |    2 +-
 {data => src}/ontologies/37-nid3.ontology          |    0
 {data => src}/ontologies/38-nmm.description        |    2 +-
 {data => src}/ontologies/38-nmm.ontology           |    0
 {data => src}/ontologies/39-mto.description        |    2 +-
 {data => src}/ontologies/39-mto.ontology           |    0
 {data => src}/ontologies/40-mlo.description        |    2 +-
 {data => src}/ontologies/40-mlo.ontology           |    0
 {data => src}/ontologies/41-mfo.description        |    2 +-
 {data => src}/ontologies/41-mfo.ontology           |    0
 {data => src}/ontologies/89-mtp.description        |    2 +-
 {data => src}/ontologies/89-mtp.ontology           |    0
 {data => src}/ontologies/90-tracker.description    |    2 +-
 {data => src}/ontologies/90-tracker.ontology       |    0
 {data => src}/ontologies/91-maemo.description      |    2 +-
 {data => src}/ontologies/91-maemo.ontology         |    0
 {data => src}/ontologies/92-slo.description        |    2 +-
 {data => src}/ontologies/92-slo.ontology           |    0
 {data => src}/ontologies/93-libosinfo.description  |    2 +-
 {data => src}/ontologies/93-libosinfo.ontology     |    0
 {data => src}/ontologies/Indices.list              |    0
 {data => src}/ontologies/Makefile.am               |    7 +-
 src/plugins/evolution/.gitignore                   |    1 +
 src/plugins/evolution/Makefile.am                  |   39 +++++-
 ...freedesktop.Tracker1.Miner.EMails.service.in.in |    7 +
 src/tracker-extract/.gitignore                     |    4 +-
 src/tracker-extract/Makefile.am                    |   64 ++++++++++-
 .../org.freedesktop.Tracker.Extract.gschema.xml.in |    0
 ...reedesktop.Tracker1.Miner.Extract.service.in.in |    8 ++
 .../tracker-extract}/tracker-extract-priority.xml  |    0
 .../tracker-extract}/tracker-extract.desktop.in.in |    0
 .../tracker-extract}/tracker-extract.xml           |    0
 src/tracker-needle/Makefile.am                     |    2 +
 .../tracker-needle}/icons/16x16/Makefile.am        |    0
 .../tracker-needle}/icons/16x16/tracker.png        |  Bin 997 -> 997 bytes
 .../tracker-needle}/icons/22x22/Makefile.am        |    0
 .../tracker-needle}/icons/22x22/tracker.png        |  Bin 1334 -> 1334 bytes
 .../tracker-needle}/icons/24x24/Makefile.am        |    0
 .../tracker-needle}/icons/24x24/tracker.png        |  Bin 1484 -> 1484 bytes
 .../tracker-needle}/icons/32x32/Makefile.am        |    0
 .../tracker-needle}/icons/32x32/tracker.png        |  Bin 2242 -> 2242 bytes
 .../tracker-needle}/icons/48x48/Makefile.am        |    0
 .../tracker-needle}/icons/48x48/tracker.png        |  Bin 4145 -> 4145 bytes
 {data => src/tracker-needle}/icons/Makefile.am     |    0
 .../tracker-needle}/icons/scalable/Makefile.am     |    0
 .../tracker-needle}/icons/scalable/tracker.svg     |    0
 src/tracker-store/.gitignore                       |    3 +
 src/tracker-store/Makefile.am                      |   52 +++++++++
 .../org.freedesktop.Tracker.Store.gschema.xml.in   |    0
 .../org.freedesktop.Tracker.gschema.xml.in         |    0
 .../org.freedesktop.Tracker1.service.in            |    0
 .../dbus => src/tracker-store}/tracker-backup.xml  |    0
 .../tracker-store}/tracker-resources.xml           |    0
 .../tracker-store}/tracker-statistics.xml          |    0
 .../dbus => src/tracker-store}/tracker-status.xml  |    0
 .../tracker-store}/tracker-store.desktop.in.in     |    0
 src/tracker-writeback/.gitignore                   |    3 +
 src/tracker-writeback/Makefile.am                  |   30 +++++
 ...rg.freedesktop.Tracker.Writeback.gschema.xml.in |    0
 .../org.freedesktop.Tracker1.Writeback.service.in  |    0
 .../tracker-writeback}/tracker-writeback.xml       |    0
 tests/functional-tests/310-fts-indexing.py         |    2 +-
 tests/functional-tests/fts-tc.py                   |    2 +-
 tests/libtracker-data/tracker-backup-test.c        |    2 +-
 .../libtracker-data/tracker-ontology-change-test.c |    2 +-
 tests/libtracker-data/tracker-ontology-test.c      |    2 +-
 tests/libtracker-data/tracker-sparql-blank-test.c  |    2 +-
 tests/libtracker-data/tracker-sparql-test.c        |    2 +-
 tests/libtracker-fts/tracker-fts-test.c            |    2 +-
 tests/libtracker-fts/tracker-parser-test.c         |    2 +-
 utils/ontology/README.example                      |    4 +-
 utils/sandbox/tracker-sandbox.py                   |    2 +-
 176 files changed, 594 insertions(+), 768 deletions(-)
---
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]