[grilo-plugins/debian: 21/22] Merge commit 'grilo-plugins-0.1.10' into debian

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

commit 524bd52b6707ddd8f7c6fd0cfb52f136a598291b
Merge: 0fa8f9d 8725c73
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date:   Fri Mar 4 18:08:08 2011 +0100

    Merge commit 'grilo-plugins-0.1.10' into debian

 NEWS                                               |   39 +++++++
 configure.ac                                       |   56 ++++++-----
 src/Makefile.am                                    |   73 +-------------
 src/media/Makefile.am                              |   63 ++++++++++++
 src/{ => media}/apple-trailers/Makefile.am         |    0
 .../apple-trailers/grl-apple-trailers.c            |    0
 .../apple-trailers/grl-apple-trailers.h            |    0
 .../apple-trailers/grl-apple-trailers.xml          |    0
 src/{ => media}/bookmarks/Makefile.am              |    0
 src/{ => media}/bookmarks/grl-bookmarks.c          |    0
 src/{ => media}/bookmarks/grl-bookmarks.h          |    0
 src/{ => media}/bookmarks/grl-bookmarks.xml        |    0
 src/{ => media}/filesystem/Makefile.am             |    0
 src/{ => media}/filesystem/TODO                    |    0
 src/{ => media}/filesystem/grl-filesystem.c        |    0
 src/{ => media}/filesystem/grl-filesystem.h        |    0
 src/{ => media}/filesystem/grl-filesystem.xml      |    0
 src/{ => media}/flickr/Makefile.am                 |    0
 src/{ => media}/flickr/gflickr.c                   |    0
 src/{ => media}/flickr/gflickr.h                   |    0
 src/{ => media}/flickr/grl-flickr.c                |    0
 src/{ => media}/flickr/grl-flickr.h                |    0
 src/{ => media}/flickr/grl-flickr.xml              |    0
 src/{ => media}/jamendo/Makefile.am                |    0
 src/{ => media}/jamendo/TODO                       |    0
 src/{ => media}/jamendo/grl-jamendo.c              |    2 +-
 src/{ => media}/jamendo/grl-jamendo.h              |    0
 src/{ => media}/jamendo/grl-jamendo.xml            |    0
 src/{ => media}/podcasts/Makefile.am               |    0
 src/{ => media}/podcasts/TODO                      |    0
 src/{ => media}/podcasts/grl-podcasts.c            |    2 +-
 src/{ => media}/podcasts/grl-podcasts.h            |    0
 src/{ => media}/podcasts/grl-podcasts.xml          |    0
 src/{ => media}/shoutcast/Makefile.am              |    0
 src/{ => media}/shoutcast/grl-shoutcast.c          |    0
 src/{ => media}/shoutcast/grl-shoutcast.h          |    0
 src/{ => media}/shoutcast/grl-shoutcast.xml        |    0
 src/{ => media}/tracker/Makefile.am                |    0
 src/{ => media}/tracker/grl-tracker.c              |    0
 src/{ => media}/tracker/grl-tracker.h              |    0
 src/{ => media}/tracker/grl-tracker.xml            |    0
 src/{ => media}/upnp/Makefile.am                   |    0
 src/{ => media}/upnp/grl-upnp.c                    |   30 ++----
 src/{ => media}/upnp/grl-upnp.h                    |    0
 src/{ => media}/upnp/grl-upnp.xml                  |    0
 src/{ => media}/vimeo/Makefile.am                  |    0
 src/{ => media}/vimeo/grl-vimeo.c                  |   18 +++-
 src/{ => media}/vimeo/grl-vimeo.h                  |    0
 src/{ => media}/vimeo/grl-vimeo.xml                |    0
 src/{ => media}/vimeo/gvimeo.c                     |   12 ++-
 src/{ => media}/vimeo/gvimeo.h                     |    0
 src/{ => media}/youtube/Makefile.am                |    0
 src/{ => media}/youtube/TODO                       |    0
 src/{ => media}/youtube/grl-youtube.c              |    7 +-
 src/{ => media}/youtube/grl-youtube.h              |    0
 src/{ => media}/youtube/grl-youtube.xml            |    0
 src/metadata/Makefile.am                           |   38 +++++++
 src/{ => metadata}/fake-metadata/Makefile.am       |    0
 .../fake-metadata/grl-fake-metadata.c              |   41 ++++----
 .../fake-metadata/grl-fake-metadata.h              |    0
 .../fake-metadata/grl-fake-metadata.xml            |    0
 src/{ => metadata}/gravatar/Makefile.am            |    0
 src/{ => metadata}/gravatar/grl-gravatar.c         |  106 ++++++++++++--------
 src/{ => metadata}/gravatar/grl-gravatar.h         |    0
 src/{ => metadata}/gravatar/grl-gravatar.xml       |    0
 src/{ => metadata}/lastfm-albumart/Makefile.am     |    0
 .../lastfm-albumart/grl-lastfm-albumart.c          |   81 +++++++++++----
 .../lastfm-albumart/grl-lastfm-albumart.h          |    0
 .../lastfm-albumart/grl-lastfm-albumart.xml        |    0
 src/{ => metadata}/local-metadata/Makefile.am      |    0
 .../local-metadata/grl-local-metadata.c            |   68 ++++++++-----
 .../local-metadata/grl-local-metadata.h            |    0
 .../local-metadata/grl-local-metadata.xml          |    0
 src/{ => metadata}/metadata-store/Makefile.am      |    0
 .../metadata-store/grl-metadata-store.c            |   44 +++++---
 .../metadata-store/grl-metadata-store.h            |    0
 .../metadata-store/grl-metadata-store.xml          |    0
 test/main.c                                        |   22 ++--
 78 files changed, 437 insertions(+), 265 deletions(-)
---
diff --cc configure.ac
index ea39508,39c2955..c6769d5
--- a/configure.ac
+++ b/configure.ac
@@@ -753,24 -755,25 +755,26 @@@ AC_SUBST([builddir]
  AC_CONFIG_FILES([
    Makefile
    src/Makefile
-   src/youtube/Makefile
-   src/fake-metadata/Makefile
-   src/filesystem/Makefile
-   src/jamendo/Makefile
-   src/lastfm-albumart/Makefile
-   src/upnp/Makefile
-   src/flickr/Makefile
-   src/podcasts/Makefile
-   src/bookmarks/Makefile
-   src/shoutcast/Makefile
-   src/apple-trailers/Makefile
-   src/metadata-store/Makefile
-   src/vimeo/Makefile
-   src/gravatar/Makefile
-   src/tracker/Makefile
-   src/local-metadata/Makefile
+   src/media/upnp/Makefile
+   src/media/vimeo/Makefile
+   src/media/bookmarks/Makefile
+   src/media/tracker/Makefile
+   src/media/podcasts/Makefile
+   src/media/jamendo/Makefile
+   src/media/youtube/Makefile
+   src/media/shoutcast/Makefile
+   src/media/flickr/Makefile
+   src/media/filesystem/Makefile
+   src/media/Makefile
+   src/media/apple-trailers/Makefile
+   src/metadata/metadata-store/Makefile
+   src/metadata/gravatar/Makefile
+   src/metadata/lastfm-albumart/Makefile
+   src/metadata/fake-metadata/Makefile
+   src/metadata/Makefile
+   src/metadata/local-metadata/Makefile
    test/Makefile
 +  debian/grilo-0.1-plugins.install
  ])
  
  AC_OUTPUT