[tracker: 4/4] Merge branch 'miner-rss'

[Martyn James Russell <mr src gnome org>]

commit a8718a5e8f06a3849458ee024c99d06006135572
Merge: 32818be b78eba9
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Mar 18 14:17:48 2010 +0000

    Merge branch 'miner-rss'

 configure.ac                              |   40 ++
 data/Makefile.am                          |   18 +
 data/miners/Makefile.am                   |    8 +
 data/miners/tracker-miner-rss.desktop.in  |    6 +
 data/tracker-miner-rss.desktop.in.in      |    6 +
 src/Makefile.am                           |    3 +
 src/tracker-miner-rss/Makefile.am         |   30 ++
 src/tracker-miner-rss/tracker-main.c      |   84 +++++
 src/tracker-miner-rss/tracker-miner-rss.c |  548 +++++++++++++++++++++++++++++
 src/tracker-miner-rss/tracker-miner-rss.h |   50 +++
 10 files changed, 793 insertions(+), 0 deletions(-)
---
diff --cc configure.ac
index f0d83c1,1dc3485..3012e71
--- a/configure.ac
+++ b/configure.ac
@@@ -157,7 -157,7 +157,8 @@@ EDS_REQUIRED=2.25.
  LIBSTREAMANALYZER_REQUIRED=0.7.0
  GEE_REQUIRED=0.3
  ID3LIB_REQUIRED=3.8.3
 +GNOME_KEYRING_REQUIRED=2.26
+ LIBGRSS_REQUIRED=0.3
  
  # Library Checks
  PKG_CHECK_MODULES(GLIB2, [glib-2.0 >= $GLIB_REQUIRED])