[jhbuild: 6/6] Merge branch 'wip/sysdeps-rebase2'

[Colin Walters <walters src gnome org>]

commit 46d715fed56101c5d5392ad4c3cf16e4872c8bce
Merge: 5f0242d faa20f5
Author: Colin Walters <walters verbum org>
Date:   Fri Jul 15 16:44:02 2011 -0400

    Merge branch 'wip/sysdeps-rebase2'
    
    Conflicts:
    	modulesets/gnome-suites-core-3.2.modules

 jhbuild/commands/Makefile.am                  |    1 +
 jhbuild/commands/base.py                      |    1 +
 jhbuild/commands/sysdeps.py                   |  102 +++++++++++++++++
 jhbuild/config.py                             |   24 ++--
 jhbuild/defaults.jhbuildrc                    |    5 +-
 jhbuild/modtypes/__init__.py                  |   43 ++++++-
 jhbuild/modtypes/autotools.py                 |  102 +++++++----------
 jhbuild/modtypes/cmake.py                     |   25 ++---
 jhbuild/modtypes/distutils.py                 |   22 +---
 jhbuild/modtypes/linux.py                     |   11 +-
 jhbuild/modtypes/perl.py                      |   27 ++---
 jhbuild/modtypes/tarball.py                   |   17 ++-
 jhbuild/modtypes/testmodule.py                |   19 ++--
 jhbuild/modtypes/waf.py                       |   21 +---
 jhbuild/moduleset.py                          |   40 ++++++-
 jhbuild/utils/Makefile.am                     |    1 +
 jhbuild/utils/cmds.py                         |   22 ++--
 jhbuild/utils/systeminstall.py                |  148 +++++++++++++++++++++++++
 modulesets/gnome-suites-core-3.2.modules      |    2 +
 modulesets/gnome-suites-core-deps-3.2.modules |   45 +++++++-
 20 files changed, 495 insertions(+), 183 deletions(-)
---
diff --cc modulesets/gnome-suites-core-3.2.modules
index 32b1ec7,c8c326b..1f519d4
--- a/modulesets/gnome-suites-core-3.2.modules
+++ b/modulesets/gnome-suites-core-3.2.modules
@@@ -374,11 -374,16 +374,12 @@@
      </suggests>
    </autotools>
  
 -  <!-- tests fail to link on Debian for pulseaudio 0.9.22 and earlier.
 -       Can remove disable-default-build-tests for pulseaudio 0.9.23 and above
 -    -->
 -  <autotools id="pulseaudio" autogenargs="--disable-udev --disable-hal --disable-oss --disable-default-build-tests">
 +  <autotools id="pulseaudio" autogenargs="--disable-udev --disable-hal --disable-oss">
+     <pkg-config>libpulse.pc</pkg-config>
 -    <branch repo="0pointer.de" module="pulseaudio/pulseaudio-0.9.21.tar.gz" version="0.9.21"
 -            hash="sha256:94e22356ac70ee95388ae58da90d88c6b3186d1938618d21671627ff56cee254"
 -            md5sum="76e623c4c72e2258bc8bdeb1599bad74" size="2056896">
 -      <patch file="pulseaudio-0.9.21.potfiles.patch" strip="1"/>
 -    </branch>
 +    <branch repo="freedesktop.org" module="software/pulseaudio/releases/pulseaudio-0.9.23.tar.gz"
 +            version="0.9.23"
 +            hash="sha1:361f7d89606e8423aad19691bb27f6552e0b679e"
 +            md5sum="7391205a337d1e04a9ff38025f684034" size="2095454"/>
      <dependencies>
        <dep package="libsndfile"/>
        <dep package="liboil"/>