[jhbuild: 16/27] Merge branch 'master' into dependency-based-build-steps



commit 276e441e852d33da3690c93a455296f9ed9819c0
Merge: b41bf59... 10719ba...
Author: Frédéric Péters <fpeters 0d be>
Date:   Sat May 16 14:37:31 2009 +0200

    Merge branch 'master' into dependency-based-build-steps

 Makefile.am                                  |   29 +-
 Makefile.plain                               |    4 +-
 configure.ac                                 |   14 +
 doc/es/es.po                                 | 1034 +++++++++++++-------------
 jhbuild.desktop                              |    9 +-
 jhbuild.in                                   |    6 -
 jhbuild/Makefile.am                          |   13 +
 jhbuild/buildbot/Makefile.am                 |   11 +
 jhbuild/buildbot/factory.py                  |    3 +-
 jhbuild/buildbot/status/Makefile.am          |    7 +
 jhbuild/buildbot/status/web/Makefile.am      |   13 +
 jhbuild/commands/Makefile.am                 |   17 +
 jhbuild/commands/__init__.py                 |    6 +-
 jhbuild/commands/autobuild.py                |    2 +-
 jhbuild/commands/base.py                     |   36 +-
 jhbuild/commands/bootstrap.py                |    2 +-
 jhbuild/commands/bot.py                      |   23 +-
 jhbuild/commands/checkbranches.py            |    2 +-
 jhbuild/commands/checkmodulesets.py          |    4 +-
 jhbuild/commands/gui.py                      |    2 +-
 jhbuild/commands/info.py                     |    4 +-
 jhbuild/commands/rdepends.py                 |    4 +-
 jhbuild/commands/sanitycheck.py              |    2 +-
 jhbuild/commands/snapshot.py                 |    2 +-
 jhbuild/commands/tinderbox.py                |    4 +-
 jhbuild/config.py                            |   15 +-
 jhbuild/cut_n_paste/Makefile.am              |    7 +
 jhbuild/defaults.jhbuildrc                   |    2 +-
 jhbuild/frontends/Makefile.am                |   21 +
 jhbuild/frontends/buildscript.py             |    4 +
 jhbuild/frontends/terminal.py                |    5 +-
 jhbuild/main.py                              |    8 +-
 jhbuild/modtypes/Makefile.am                 |   14 +
 jhbuild/modtypes/linux.py                    |    2 +-
 jhbuild/moduleset.py                         |    4 +-
 jhbuild/utils/Makefile.am                    |   12 +
 jhbuild/versioncontrol/Makefile.am           |   14 +
 jhbuild/versioncontrol/git.py                |   27 +-
 jhbuild/versioncontrol/hg.py                 |    7 +-
 jhbuild/versioncontrol/tarball.py            |   22 +-
 modulesets/bootstrap-devel.modules           |   44 ++
 modulesets/freedesktop-2.28.modules          |    2 +-
 modulesets/freedesktop-devel.modules         |   61 ++
 modulesets/gnome-2.26.modules                |   13 +-
 modulesets/gnome-2.28.modules                |   23 +-
 modulesets/gnome-devel.modules               |  203 +++++
 modulesets/gnome-external-deps-2.28.modules  |    7 +-
 modulesets/gnome-external-deps-devel.modules |  552 ++++++++++++++
 modulesets/gnome-suites-2.26.modules         |    4 +-
 modulesets/gnome-suites-2.28.modules         |   21 +-
 modulesets/gnome-suites-devel.modules        |  144 ++++
 po/POTFILES.in                               |    3 +-
 scripts/Makefile.am                          |   23 +
 scripts/jhbuild.in                           |   28 +
 tests/mock.py                                |    5 +
 tests/tests.py                               |   15 +-
 56 files changed, 1920 insertions(+), 645 deletions(-)




[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]