[grilo/debian: 12/14] Merge commit 'grilo-0.1.17' into debian

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

commit 0e2289cdcf42e8739049731b57cbf7f30fc9cdfb
Merge: 423848f c78e287
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date:   Mon Sep 5 13:22:21 2011 +0200

    Merge commit 'grilo-0.1.17' into debian
    
    Conflicts resolved:
    	doc/libs/grilo-libs-sections.txt

 NEWS                             |   19 ++
 configure.ac                     |   33 ++--
 doc/Makefile.am                  |    2 +-
 doc/grilo/Makefile.am            |    2 +-
 doc/grilo/grilo-docs.sgml        |   17 ++
 doc/grilo/grilo-sections.txt     |   27 +++
 doc/libs/Makefile.am             |  105 ----------
 doc/libs/grilo-libs-docs.sgml    |   51 -----
 doc/libs/grilo-libs-sections.txt |   27 ---
 src/Makefile.am                  |    5 +-
 src/data/grl-media-audio.c       |   30 +++
 src/data/grl-media-audio.h       |    4 +
 src/grilo.c                      |   27 ++-
 src/grl-media-plugin.c           |    3 -
 src/grl-media-source.c           |   14 +-
 src/grl-metadata-key.c           |   12 +
 src/grl-metadata-key.h           |    1 +
 src/grl-metadata-source.c        |    8 +-
 src/grl-plugin-registry-priv.h   |   32 +++
 src/grl-plugin-registry.c        |  415 +++++++++++++++++++++++---------------
 src/grl-plugin-registry.h        |    3 +-
 tools/grilo-test-ui/main.c       |    2 -
 22 files changed, 443 insertions(+), 396 deletions(-)
---
diff --cc configure.ac
index a75ca8e,6f18d9d..da7499a
--- a/configure.ac
+++ b/configure.ac
@@@ -281,13 -275,7 +275,12 @@@ AC_CONFIG_FILES(
    bindings/vala/grilo-net-uninstalled.namespace
    doc/Makefile
    doc/grilo/Makefile
-   doc/libs/Makefile
    examples/Makefile
 +  debian/libgrilo-0.1-dev.install
 +  debian/libgrilo-0.1-vala.install
 +  debian/libgrilo-0.1-doc.install
 +  debian/libgrilo-0.1-doc.links
 +  debian/libgrilo-0.1.install
  ])
  
  AC_OUTPUT