[grilo/debian: 141/142] Merge commit 'grilo-0.1.7' into debian

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

commit 89dcc9769fb1f1cdb64bc91bc61c5d8b26efbe31
Merge: a8bdd40 24ab608
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date:   Fri Jan 21 23:37:46 2011 +0100

    Merge commit 'grilo-0.1.7' into debian
    
    Conflicts resolved:
    	configure.ac

 AUTHORS                                            |    1 +
 Makefile.am                                        |    6 +-
 NEWS                                               |   37 ++
 README                                             |    2 +-
 bindings/vala/Makefile.am                          |   10 +-
 bindings/vala/grilo-0.1-custom.vala                |   14 +-
 bindings/vala/grilo-0.1.deps                       |    1 +
 bindings/vala/grilo-0.1.metadata                   |   54 ++-
 bindings/vala/grilo-net-0.1-custom.vala            |    1 +
 bindings/vala/grilo-net-0.1.deps                   |    1 +
 bindings/vala/grilo-net-0.1.metadata               |    6 +
 bindings/vala/grilo-net-uninstalled.files.in       |    2 +
 bindings/vala/grilo-net-uninstalled.namespace.in   |    1 +
 configure.ac                                       |   94 +++--
 doc/Makefile.am                                    |    2 +-
 doc/{reference => grilo}/.gitignore                |    0
 doc/{reference => grilo}/Makefile.am               |   15 +-
 doc/{reference => grilo}/grilo-docs.sgml           |    8 +
 doc/grilo/grilo-sections.txt                       |  495 +++++++++++++++++
 doc/grilo/grilo.types                              |   21 +
 doc/{reference => grilo}/overview.xml              |    0
 .../quick-start-using-grilo.xml                    |   24 +-
 doc/{reference => libs}/Makefile.am                |   21 +-
 doc/libs/grilo-libs-docs.sgml                      |   51 ++
 doc/libs/grilo-libs-sections.txt                   |   26 +
 grilo-0.1.pc.in                                    |    7 +-
 grilo-net-0.1.pc.in                                |   15 +
 grilo-net-uninstalled.pc.in                        |   15 +
 grilo-uninstalled.pc.in                            |   15 +-
 libs/Makefile.am                                   |   20 +
 libs/net/Makefile.am                               |   79 +++
 libs/net/grl-net-wc.c                              |  570 ++++++++++++++++++++
 libs/net/grl-net-wc.h                              |  134 +++++
 libs/net/grl-net.h                                 |   28 +
 libs/net/wc-test.c                                 |   88 +++
 src/Makefile.am                                    |   15 +-
 src/data/grl-config.c                              |   21 +-
 src/data/grl-data.c                                |   41 +-
 src/data/grl-media-audio.c                         |   17 +-
 src/data/grl-media-audio.h                         |    6 +
 src/data/grl-media-image.c                         |   13 +-
 src/data/grl-media-image.h                         |    6 +
 src/data/grl-media-video.c                         |    2 +-
 src/data/grl-media.c                               |   53 +-
 src/data/grl-media.h                               |   10 +-
 src/grilo.c                                        |   33 +-
 src/grl-error.h                                    |   57 ++-
 src/grl-log-priv.h                                 |   46 ++
 src/grl-log.c                                      |  408 +++++++++++---
 src/grl-log.h                                      |  251 +++++++++-
 src/grl-media-plugin.c                             |  120 ++++-
 src/grl-media-plugin.h                             |   78 +---
 src/grl-media-source.c                             |  365 +++++++++----
 src/grl-media-source.h                             |   60 ++-
 src/grl-metadata-key.c                             |   91 ++--
 src/grl-metadata-source.c                          |  376 +++++++-------
 src/grl-metadata-source.h                          |   55 +-
 src/grl-multiple.c                                 |  219 ++++++--
 src/grl-multiple.h                                 |    6 +
 src/grl-plugin-registry.c                          |  395 ++++++++++----
 src/grl-plugin-registry.h                          |   48 ++-
 src/grl-util.c                                     |    3 +-
 src/tests/.gitignore                               |    1 -
 tests/.gitignore                                   |    2 +
 {src/tests => tests}/Makefile.am                   |   16 +-
 tests/metadata_source.c                            |  180 ++++++
 tests/python/Makefile.am                           |   25 +
 tests/python/constants.py                          |   50 ++
 tests/python/test_metadata_source.py               |  106 ++++
 tests/python/test_plugin.py                        |   72 +++
 tests/python/test_registry.py                      |  164 ++++++
 tests/python/testrunner.py                         |   28 +
 tests/python/util.py.in                            |    9 +
 {src/tests => tests}/registry.c                    |   36 +-
 tools/grilo-inspect/grl-inspect.c                  |   20 +-
 tools/grilo-test-ui/main.c                         |  223 +++++----
 tools/js/testGrilo.js                              |    2 +-
 tools/python/grilo-test-ui.py                      |   80 +++-
 tools/vala/grilo-test.vala                         |    1 -
 79 files changed, 4662 insertions(+), 1012 deletions(-)
---
diff --cc configure.ac
index 6d15355,b49cc1c..4c35354
--- a/configure.ac
+++ b/configure.ac
@@@ -209,13 -233,11 +233,17 @@@ AC_CONFIG_FILES(
    bindings/vala/Makefile
    bindings/vala/grilo-uninstalled.files
    bindings/vala/grilo-uninstalled.namespace
+   bindings/vala/grilo-net-uninstalled.files
+   bindings/vala/grilo-net-uninstalled.namespace
    doc/Makefile
 +  doc/reference/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
+   doc/grilo/Makefile
+   doc/libs/Makefile
  ])
  
  AC_OUTPUT