[tracker/zeitgeist: 37/670] Merge branch 'master' into zeitgeist

[Robert James Taylor <robtaylor src gnome org>]

commit 013a22856c125aec11ee4aff7b0d2a17e9ab17cf
Merge: 7d8937d 3b5af4b
Author: Rob Taylor <rob taylor codethink co uk>
Date:   Fri May 14 17:25:47 2010 +0200

    Merge branch 'master' into zeitgeist

 Makefile.am                                        |    4 +-
 NEWS                                               |  107 ++
 configure.ac                                       |  162 ++-
 data/.gitignore                                    |    2 +
 data/Makefile.am                                   |   43 +-
 data/dbus/Makefile.am                              |   30 +-
 ...rg.freedesktop.Tracker1.Miner.EMails.service.in |    0
 data/miners/Makefile.am                            |    7 +-
 .../miners/tracker-miner-evolution.desktop.in      |    0
 ...sktop.in.in => tracker-miner-flickr.desktop.in} |    0
 data/ontologies/Makefile.am                        |   41 +-
 data/tracker-miner-flickr.desktop.in.in            |   18 +
 data/tracker-miner-fs.desktop.in.in                |    2 +-
 data/tracker-miner-rss.desktop.in.in               |   21 +-
 data/tracker-status-icon.desktop.in.in             |    2 +-
 data/tracker-store.desktop.in.in                   |    2 +-
 docs/ontologies/README.ontologiesdoc               |    9 +-
 docs/reference/libtracker-client/Makefile.am       |    8 +-
 docs/reference/libtracker-common/Makefile.am       |    5 +-
 docs/reference/libtracker-extract/Makefile.am      |    5 +-
 docs/reference/libtracker-miner/Makefile.am        |    5 +-
 docs/reference/ontology/Makefile.am                |  122 ++-
 docs/tools/Makefile.am                             |   51 +-
 docs/tools/gen-doc.sh                              |   19 +-
 examples/libtracker-extract/Makefile.am            |    2 +
 examples/libtracker-miner/Makefile.am              |    2 +
 po/POTFILES.in                                     |    4 +-
 po/POTFILES.skip                                   |    3 +-
 po/es.po                                           |  366 ++++---
 po/nb.po                                           | 1201 +++++++++++---------
 src/libtracker-client/Makefile.am                  |    3 +-
 src/libtracker-data/Makefile.am                    |    8 +-
 src/libtracker-data/tracker-sparql-expression.vala |   78 +-
 src/libtracker-extract/Makefile.am                 |    1 +
 src/libtracker-miner/Makefile.am                   |    3 +
 src/libtracker-miner/tracker-miner-fs.c            |   15 +-
 src/miners/Makefile.am                             |    2 +-
 src/miners/flickr/.gitignore                       |    2 +
 src/miners/flickr/Makefile.am                      |    4 +-
 src/miners/fs/Makefile.am                          |    4 +-
 src/miners/rss/.gitignore                          |    1 +
 src/miners/rss/Makefile.am                         |    2 +
 src/plugins/Makefile.am                            |    4 +-
 src/plugins/evolution/Makefile.am                  |   19 +-
 src/plugins/kmail/Makefile.am                      |    2 +
 src/plugins/nautilus/Makefile.am                   |    2 +
 src/tracker-control/Makefile.am                    |    2 +
 src/tracker-extract/Makefile.am                    |   17 +
 src/tracker-extract/tracker-extract-gif.c          |  492 ++++++++
 src/tracker-extract/tracker-extract-gstreamer.c    |   46 +
 src/tracker-extract/tracker-extract-mp3.c          |   12 +-
 src/tracker-extract/tracker-extract-pdf.cpp        |    5 +-
 src/tracker-search-bar/Makefile.am                 |    2 +
 src/tracker-search-tool/Makefile.am                |    2 +-
 src/tracker-status-icon/Makefile.am                |    2 +
 src/tracker-store/Makefile.am                      |    2 +
 src/tracker-store/tracker-statistics.c             |    2 +-
 src/tracker-store/tracker-store.c                  |  118 +--
 src/tracker-store/tracker-store.h                  |    1 +
 src/tracker-utils/Makefile.am                      |    2 +
 src/tracker-writeback/Makefile.am                  |    2 +
 tests/functional-tests/.gitignore                  |    3 +
 tests/functional-tests/Makefile.am                 |   21 +-
 ...d-batch.sh => force-sqlite-misused-batch.sh.in} |    2 +-
 ...qlite-misused.sh => force-sqlite-misused.sh.in} |    2 +-
 ...{helper-test-data.sh => helper-test-data.sh.in} |    6 +-
 tests/libtracker-data/Makefile.am                  |    2 +
 tests/libtracker-extract/Makefile.am               |    2 +
 tests/libtracker-extract/tracker-xmp-test.c        |   10 +-
 tests/libtracker-fts/Makefile.am                   |    2 +
 tests/libtracker-miner/Makefile.am                 |    8 +-
 tests/libtracker-miner/tracker-monitor-test.c      |  462 --------
 tests/tracker-miner-fs/Makefile.am                 |    2 +-
 utils/data-generators/{ => deprecated}/README      |    0
 utils/data-generators/{ => deprecated}/atom2ttl.py |    0
 .../data-generators/{ => deprecated}/bookmarks.in  |    0
 .../{ => deprecated}/generate-all-and-import.sh    |    0
 .../{ => deprecated}/generate-all.sh               |    0
 .../generate-data-for-bookmarks.py                 |    0
 .../generate-data-for-contact-messages.py          |    0
 .../{ => deprecated}/generate-data-for-gossip.py   |    0
 .../{ => deprecated}/generate-data-for-music.py    |    0
 .../generate-data-for-webhistory.py                |    0
 .../{ => deprecated}/generate-name.py              |    0
 .../{ => deprecated}/generate_Image.py             |    0
 .../{ => deprecated}/generate_Video.py             |    0
 .../{ => deprecated}/get-fresh-planets.sh          |    0
 .../{ => deprecated}/id32nmmTurtle.py              |    0
 utils/data-generators/{ => deprecated}/id32ttl.py  |    0
 .../{ => deprecated}/internals/__init__.py         |    0
 .../{ => deprecated}/internals/id3reader.py        |    0
 .../{ => deprecated}/internals/tools.py            |    0
 .../data-generators/{ => deprecated}/songlist.ttl  |    0
 utils/services/Makefile.am                         |    3 +-
 94 files changed, 2113 insertions(+), 1512 deletions(-)
---
diff --cc data/ontologies/Makefile.am
index 781eabc,004f7a0..fb5b145
--- a/data/ontologies/Makefile.am
+++ b/data/ontologies/Makefile.am
@@@ -2,29 -2,29 +2,30 @@@ include $(top_srcdir)/Makefile.dec
  
  configdir = $(datadir)/tracker/ontologies
  
- config_DATA =			\
- 	10-xsd.ontology		\
- 	11-rdf.ontology		\
- 	12-nrl.ontology		\
- 	20-dc.ontology		\
- 	30-nie.ontology		\
- 	31-nao.ontology		\
- 	32-nco.ontology		\
- 	33-nfo.ontology		\
- 	34-nmo.ontology		\
- 	35-ncal.ontology	\
- 	36-scal.ontology	\
- 	37-nid3.ontology	\
- 	38-nmm.ontology		\
- 	39-mto.ontology		\
- 	40-mlo.ontology		\
- 	41-mfo.ontology		\
- 	89-mtp.ontology		\
- 	90-tracker.ontology     \
+ config_DATA =						\
+ 	10-xsd.ontology	    10-xsd.description		\
+ 	11-rdf.ontology	    11-rdf.description		\
+ 	12-nrl.ontology	    12-nrl.description		\
+ 	20-dc.ontology      20-dc.description		\
+ 	30-nie.ontology	    30-nie.description		\
+ 	31-nao.ontology	    31-nao.description		\
+ 	32-nco.ontology     32-nco.description		\
+ 	33-nfo.ontology	    33-nfo.description		\
+ 	34-nmo.ontology	    34-nmo.description		\
+ 	35-ncal.ontology    35-ncal.description		\
+ 	36-scal.ontology    36-scal.description		\
+ 	37-nid3.ontology    37-nid3.description		\
+ 	38-nmm.ontology	    38-nmm.description		\
+ 	39-mto.ontology	    39-mto.description		\
+ 	40-mlo.ontology	    40-mlo.description		\
+ 	41-mfo.ontology	    41-mfo.description		\
+ 	89-mtp.ontology	    89-mtp.description		\
 -	90-tracker.ontology 90-tracker.description
++	90-tracker.ontology 90-tracker.description	\
 +	92-zg.ontology
  
  if HAVE_MAEMO
- config_DATA += 91-maemo.ontology	
+ config_DATA += 			\
+ 	91-maemo.ontology   91-maemo.description
  endif
  
  EXTRA_DIST = $(config_DATA)