[grilo-plugins/debian: 48/49] Merge commit 'grilo-plugins-0.1.8' into debian

[Juan A. Suarez Romero <jasuarez src gnome org>]

commit e2aca6ca3de447ec19db72e04629926ed8242689
Merge: 7000a08 659a220
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date:   Thu Jan 27 20:21:05 2011 +0100

    Merge commit 'grilo-plugins-0.1.8' into debian

 AUTHORS                                 |    3 +
 NEWS                                    |   32 +
 configure.ac                            |  100 ++-
 setup-plugins-env.sh                    |    2 +-
 src/Makefile.am                         |   16 +-
 src/apple-trailers/Makefile.am          |    2 +-
 src/apple-trailers/grl-apple-trailers.c |   21 +-
 src/bookmarks/Makefile.am               |    2 +-
 src/fake-metadata/Makefile.am           |    2 +-
 src/filesystem/Makefile.am              |    2 +-
 src/filesystem/grl-filesystem.c         |  305 ++++++-
 src/filesystem/grl-filesystem.h         |    4 +-
 src/flickr/Makefile.am                  |    2 +-
 src/flickr/grl-flickr.c                 |   15 +-
 src/gravatar/Makefile.am                |    2 +-
 src/jamendo/Makefile.am                 |    2 +-
 src/lastfm-albumart/Makefile.am         |    2 +-
 src/metadata-store/Makefile.am          |    2 +-
 src/podcasts/Makefile.am                |    2 +-
 src/podcasts/grl-podcasts.c             |    4 +-
 src/shoutcast/Makefile.am               |    2 +-
 src/tracker/Makefile.am                 |   36 +
 src/tracker/grl-tracker.c               | 1502 +++++++++++++++++++++++++++++++
 src/tracker/grl-tracker.h               |   78 ++
 src/tracker/grl-tracker.xml             |    9 +
 src/upnp/Makefile.am                    |    7 +-
 src/upnp/grl-upnp.c                     |  393 +++++----
 src/vimeo/Makefile.am                   |    2 +-
 src/vimeo/grl-vimeo.c                   |   19 +-
 src/youtube/Makefile.am                 |    2 +-
 src/youtube/grl-youtube.c               |   11 +-
 31 files changed, 2339 insertions(+), 244 deletions(-)
---
diff --cc configure.ac
index 3374445,955a019..63dc6bf
--- a/configure.ac
+++ b/configure.ac
@@@ -697,8 -732,8 +732,9 @@@ AC_CONFIG_FILES(
    src/metadata-store/Makefile
    src/vimeo/Makefile
    src/gravatar/Makefile
+   src/tracker/Makefile
    test/Makefile
 +  debian/grilo-0.1-plugins.install
  ])
  
  AC_OUTPUT