[grilo-plugins/debian: 31/32] Merge commit 'grilo-plugins-0.1.9' into debian

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

commit 460eb1c6a2c316df0023737c8228d97181b71967
Merge: d5a3bcf 0bd4d0c
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date:   Thu Feb 10 19:59:29 2011 +0100

    Merge commit 'grilo-plugins-0.1.9' into debian

 NEWS                                      |   38 ++
 configure.ac                              |   42 ++-
 src/Makefile.am                           |    6 +-
 src/bookmarks/grl-bookmarks.c             |  218 ++++++----
 src/filesystem/grl-filesystem.c           |  685 +++++++++++++++++++++--------
 src/flickr/gflickr.c                      |   78 +++-
 src/flickr/gflickr.h                      |    6 +
 src/flickr/grl-flickr.c                   |   22 +-
 src/jamendo/grl-jamendo.c                 |   18 +-
 src/local-metadata/Makefile.am            |   34 ++
 src/local-metadata/grl-local-metadata.c   |  262 +++++++++++
 src/local-metadata/grl-local-metadata.h   |   72 +++
 src/local-metadata/grl-local-metadata.xml |    9 +
 src/podcasts/grl-podcasts.c               |  183 ++++++--
 src/tracker/grl-tracker.c                 |   55 ++-
 src/tracker/grl-tracker.h                 |    6 +-
 src/upnp/grl-upnp.c                       |   88 ++++-
 src/vimeo/grl-vimeo.c                     |   12 +
 test/Makefile.am                          |   16 +-
 test/test_local_metadata.c                |  306 +++++++++++++
 20 files changed, 1799 insertions(+), 357 deletions(-)
---
diff --cc configure.ac
index 63dc6bf,75ec7cc..ea39508
--- a/configure.ac
+++ b/configure.ac
@@@ -733,8 -768,8 +768,9 @@@ AC_CONFIG_FILES(
    src/vimeo/Makefile
    src/gravatar/Makefile
    src/tracker/Makefile
+   src/local-metadata/Makefile
    test/Makefile
 +  debian/grilo-0.1-plugins.install
  ])
  
  AC_OUTPUT