[grilo-plugins/debian: 46/50] Merge commit 'grilo-plugins-0.1.5' into debian

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

commit ac98c4cbb0af0be3853c723dfe9250acabfd1906
Merge: 6c16fce 498c7bf
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date:   Fri May 7 19:39:44 2010 +0200

    Merge commit 'grilo-plugins-0.1.5' into debian

 AUTHORS                                   |    2 +
 Makefile.am                               |    2 +
 NEWS                                      |   40 +
 README                                    |   38 +
 configure.ac                              |  134 ++-
 grilo-plugins.doap                        |   29 +
 src/Makefile.am                           |    6 +-
 src/apple-trailers/grl-apple-trailers.c   |   16 +-
 src/bookmarks/grl-bookmarks.c             |   17 +-
 src/filesystem/grl-filesystem.c           |    4 +-
 src/flickr/gflickr.c                      |   31 +-
 src/flickr/grl-flickr.c                   |    6 +-
 src/jamendo/grl-jamendo.c                 |   51 +-
 src/lastfm-albumart/grl-lastfm-albumart.c |    3 +-
 src/metadata-store/grl-metadata-store.c   |   14 +-
 src/podcasts/grl-podcasts.c               |   35 +-
 src/shoutcast/grl-shoutcast.c             |   33 +-
 src/upnp/grl-upnp.c                       |   14 +-
 src/vimeo/Makefile.am                     |   34 +
 src/vimeo/grl-vimeo.c                     |  391 ++++++++
 src/vimeo/grl-vimeo.h                     |   77 ++
 src/vimeo/gvimeo.c                        |  513 ++++++++++
 src/vimeo/gvimeo.h                        |  112 +++
 src/youtube/Makefile.am                   |    6 +-
 src/youtube/grl-youtube.c                 | 1553 ++++++++++++-----------------
 src/youtube/grl-youtube.h                 |    2 +
 test/main.c                               |   13 +-
 27 files changed, 2102 insertions(+), 1074 deletions(-)
---
diff --cc configure.ac
index dde5f14,783a06d..fbe6dfd
--- a/configure.ac
+++ b/configure.ac
@@@ -568,8 -597,8 +597,9 @@@ AC_CONFIG_FILES(
    src/shoutcast/Makefile
    src/apple-trailers/Makefile
    src/metadata-store/Makefile
+   src/vimeo/Makefile
    test/Makefile
 +  debian/grilo-0.1-plugins.install
  ])
  
  AC_OUTPUT