[tracker: 7/7] Merge branch 'new-app-miner'

[Martyn James Russell <mr src gnome org>]

commit 815db76c62275ef1016d813170552a83fd3bdba1
Merge: 7894f3f 1d273cc
Author: Martyn Russell <martyn lanedo com>
Date:   Tue Apr 29 20:21:32 2014 +0100

    Merge branch 'new-app-miner'

 configure.ac                                       |   38 +++-
 data/Makefile.am                                   |   10 +
 data/miners/Makefile.am                            |    5 +-
 data/tracker-miner-apps.desktop.in.in              |   19 ++
 src/libtracker-common/Makefile.am                  |   16 +-
 src/libtracker-common/tracker-common.h             |    5 +
 .../tracker-meego.cpp}                             |   10 +-
 .../tracker-meego.h}                               |   18 +-
 .../tracker-miner-locale.c                         |    0
 .../tracker-miner-locale.h                         |    0
 src/miners/Makefile.am                             |    4 +
 src/miners/apps/Makefile.am                        |   28 +++
 src/miners/apps/tracker-main.c                     |  254 ++++++++++++++++++++
 .../{fs => apps}/tracker-miner-applications.c      |   15 +-
 .../{fs => apps}/tracker-miner-applications.h      |    0
 src/miners/fs/Makefile.am                          |    9 -
 src/miners/fs/tracker-main.c                       |   58 +-----
 src/miners/fs/tracker-miner-userguides.c           |   17 +-
 18 files changed, 398 insertions(+), 108 deletions(-)
---