[grilo-plugins/debian: 155/156] Merge commit 'grilo-plugins-0.1.6' into debian

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

commit 7246c3162cbaf3fcb5f3e90cf75e6be1c086e59f
Merge: aa86e14 30d69dd
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date:   Thu Aug 26 19:25:07 2010 +0200

    Merge commit 'grilo-plugins-0.1.6' into debian

 .gitignore                                  |   33 ++
 AUTHORS                                     |    1 +
 NEWS                                        |   95 ++++
 autogen.sh                                  |    7 +-
 configure.ac                                |  154 ++++-
 src/Makefile.am                             |    6 +-
 src/apple-trailers/Makefile.am              |    4 +
 src/apple-trailers/grl-apple-trailers.c     |   90 +++-
 src/apple-trailers/grl-apple-trailers.h     |    2 +-
 src/apple-trailers/grl-apple-trailers.xml   |    9 +
 src/bookmarks/Makefile.am                   |    4 +
 src/bookmarks/grl-bookmarks.c               |   14 +-
 src/bookmarks/grl-bookmarks.xml             |    9 +
 src/fake-metadata/Makefile.am               |    4 +
 src/fake-metadata/grl-fake-metadata.c       |   61 +--
 src/fake-metadata/grl-fake-metadata.xml     |    9 +
 src/filesystem/Makefile.am                  |    4 +
 src/filesystem/grl-filesystem.c             |  125 ++++-
 src/filesystem/grl-filesystem.h             |    7 +
 src/filesystem/grl-filesystem.xml           |    9 +
 src/flickr/Makefile.am                      |    8 +-
 src/flickr/gflickr.c                        |  811 +++++++++++++++++++++++++--
 src/flickr/gflickr.h                        |   55 ++-
 src/flickr/grl-flickr.c                     |  534 +++++++++++++++---
 src/flickr/grl-flickr.xml                   |    9 +
 src/gravatar/Makefile.am                    |   28 +
 src/gravatar/grl-gravatar.c                 |  297 ++++++++++
 src/gravatar/grl-gravatar.h                 |   74 +++
 src/gravatar/grl-gravatar.xml               |    9 +
 src/jamendo/Makefile.am                     |    4 +
 src/jamendo/grl-jamendo.c                   |  236 +++++++--
 src/jamendo/grl-jamendo.xml                 |    9 +
 src/lastfm-albumart/Makefile.am             |    4 +
 src/lastfm-albumart/grl-lastfm-albumart.c   |   32 +-
 src/lastfm-albumart/grl-lastfm-albumart.xml |    9 +
 src/metadata-store/Makefile.am              |    4 +
 src/metadata-store/grl-metadata-store.c     |   76 +--
 src/metadata-store/grl-metadata-store.xml   |    9 +
 src/podcasts/Makefile.am                    |    4 +
 src/podcasts/grl-podcasts.c                 |   17 +-
 src/podcasts/grl-podcasts.xml               |    9 +
 src/shoutcast/Makefile.am                   |    5 +
 src/shoutcast/grl-shoutcast.c               |  111 +++-
 src/shoutcast/grl-shoutcast.xml             |    9 +
 src/upnp/Makefile.am                        |    6 +
 src/upnp/grl-upnp.c                         |  244 +++-----
 src/upnp/grl-upnp.xml                       |    9 +
 src/vimeo/Makefile.am                       |    4 +
 src/vimeo/grl-vimeo.c                       |   18 +-
 src/vimeo/grl-vimeo.xml                     |    9 +
 src/youtube/Makefile.am                     |    8 +-
 src/youtube/grl-youtube.c                   |  448 ++++++++++-----
 src/youtube/grl-youtube.xml                 |    9 +
 test/.gitignore                             |    1 +
 test/main.c                                 |   16 +-
 55 files changed, 3012 insertions(+), 770 deletions(-)
---
diff --cc configure.ac
index fbe6dfd,bcbb518..60afb61
--- a/configure.ac
+++ b/configure.ac
@@@ -598,8 -691,8 +691,9 @@@ AC_CONFIG_FILES(
    src/apple-trailers/Makefile
    src/metadata-store/Makefile
    src/vimeo/Makefile
+   src/gravatar/Makefile
    test/Makefile
 +  debian/grilo-0.1-plugins.install
  ])
  
  AC_OUTPUT