[grilo/rpm: 147/148] Merge commit 'grilo-0.1.6' into rpm

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

commit bc77499c1a4b0766ad1bbfe004310bde39ac6952
Merge: f41cfd0 df92cb1
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date:   Tue Jan 25 20:48:21 2011 +0100

    Merge commit 'grilo-0.1.6' into rpm

 .gitignore                                         |   10 +
 AUTHORS                                            |    9 +-
 Makefile.am                                        |    4 +-
 NEWS                                               |   64 ++
 autogen.sh                                         |    7 +-
 bindings/vala/Makefile.am                          |   72 ++-
 bindings/vala/grilo-0.1-custom.vala                |   76 ++
 bindings/vala/{grilo-0.1 => }/grilo-0.1.metadata   |    3 +
 bindings/vala/grilo-0.1.vapi                       |  510 -----------
 bindings/vala/grilo-0.1/grilo-0.1-custom.vala      |   39 -
 bindings/vala/grilo-0.1/grilo-0.1.files            |    3 -
 bindings/vala/grilo-0.1/grilo-0.1.gi               |  932 --------------------
 ...grilo-0.1.defines => grilo-uninstalled.defines} |    0
 bindings/vala/grilo-uninstalled.files.in           |   13 +
 ....1.namespace => grilo-uninstalled.namespace.in} |    0
 configure.ac                                       |   48 +-
 doc/reference/.gitignore                           |    2 +-
 doc/reference/quick-start-using-grilo.xml          |   24 +-
 ....1-uninstalled.pc.in => grilo-uninstalled.pc.in |    0
 src/.gitignore                                     |   10 -
 src/Makefile.am                                    |   35 +-
 src/data/grl-config.c                              |  127 +++
 src/data/grl-config.h                              |   96 +--
 src/data/grl-data.c                                |   66 +-
 src/data/grl-media-audio.c                         |  130 +++
 src/data/grl-media-audio.h                         |   54 +-
 src/data/grl-media-image.c                         |   62 ++
 src/data/grl-media-image.h                         |   21 +-
 src/data/grl-media-video.c                         |   81 ++
 src/data/grl-media-video.h                         |   63 +--
 src/data/grl-media.c                               |  784 ++++++++++++++++
 src/data/grl-media.h                               |  340 ++------
 src/grilo.c                                        |  129 +++
 src/grilo.h                                        |   16 +-
 src/grl-media-plugin.c                             |  128 ++--
 src/grl-media-plugin.h                             |   95 ++-
 src/grl-media-source.c                             |  500 ++++++++++--
 src/grl-media-source.h                             |   70 ++-
 src/grl-metadata-key-priv.h                        |   32 +
 src/grl-metadata-key.c                             |  299 ++++++-
 src/grl-metadata-key.h                             |  162 +---
 src/grl-metadata-source-priv.h                     |    1 +
 src/grl-metadata-source.c                          |  236 +++++-
 src/grl-metadata-source.h                          |   14 +-
 src/grl-multiple.c                                 |  615 +++++++++++++
 src/grl-multiple.h                                 |   51 ++
 src/grl-plugin-registry.c                          |  273 ++++--
 src/grl-plugin-registry.h                          |   62 +-
 src/grl-sync-priv.h                                |   37 +
 src/grl-sync.c                                     |   40 +
 src/grl-util.c                                     |  111 +++
 src/grl-util.h                                     |   45 +
 src/tests/.gitignore                               |    5 -
 src/tests/registry.c                               |   86 ++-
 tools/Makefile.am                                  |    6 +-
 tools/grilo-inspect/.gitignore                     |    1 +
 tools/grilo-inspect/Makefile.am                    |   30 +
 tools/grilo-inspect/grl-inspect.c                  |  208 +++++
 tools/grilo-test-ui/.gitignore                     |    5 -
 tools/grilo-test-ui/Makefile.am                    |   16 +-
 tools/grilo-test-ui/flickr-auth.c                  |  257 ++++++
 tools/grilo-test-ui/flickr-auth.h                  |   43 +
 tools/grilo-test-ui/main.c                         |  351 ++++++--
 tools/js/testGrilo.js                              |   14 +-
 tools/python/grilo-test-ui.py                      |  807 +++++++++++++++++
 tools/vala/.gitignore                              |    2 -
 tools/vala/grilo-test.vala                         |    5 +-
 67 files changed, 5855 insertions(+), 2582 deletions(-)
---
diff --cc configure.ac
index 102e0a5,a8207b5..46c1608
--- a/configure.ac
+++ b/configure.ac
@@@ -165,9 -196,8 +196,9 @@@ AC_SUBST([builddir]
  # ----------------------------------------------------------
  
  AC_CONFIG_FILES([
 +  grilo.spec
    Makefile
-   grilo-0.1-uninstalled.pc
+   grilo-uninstalled.pc
    grilo-0.1.pc
    src/Makefile
    src/tests/Makefile