[jhbuild: 67/68] Merge branch 'master' into release-team-commands



commit 3e8947c045163b0fb6f8ed731bdd3f92a9648675
Merge: 8f55849 1f8ef32
Author: FrÃdÃric PÃters <fpeters 0d be>
Date:   Fri May 11 09:00:25 2012 +0200

    Merge branch 'master' into release-team-commands

 .gitignore                                         |   21 +-
 Makefile.am                                        |    7 +-
 Makefile.plain                                     |   12 +-
 NEWS                                               |  353 ++
 README                                             |   13 +-
 autogen.sh                                         |  223 ++-
 configure.ac                                       |   45 +-
 doc/C/{jhbuild.xml => index.docbook}               |  466 +--
 doc/Makefile.am                                    |   11 +-
 doc/es/es.po                                       | 3706 +++++++++++---------
 doc/fr/fr.po                                       |    2 +-
 doc/ja/ja.po                                       | 2298 +++++++------
 doc/jhbuild.omf.in                                 |    9 -
 doc/sl/sl.po                                       | 3408 +++++++++---------
 examples/Makefile.am                               |   10 +
 examples/jhbuild-session                           |    2 -
 examples/sample.jhbuildrc                          |   10 +-
 examples/wayland.jhbuildrc                         |   19 +
 jhbuild/__init__.py                                |    2 +-
 jhbuild/buildbot/changes.py                        |    2 +-
 jhbuild/buildbot/factory.py                        |    2 +-
 jhbuild/buildbot/scheduler.py                      |    2 +-
 jhbuild/buildbot/status/web/__init__.py            |    2 +-
 jhbuild/buildbot/status/web/bot.py                 |    2 +-
 jhbuild/buildbot/status/web/build.py               |    2 +-
 jhbuild/buildbot/status/web/builder.py             |    2 +-
 jhbuild/buildbot/status/web/changes.py             |    2 +-
 jhbuild/buildbot/status/web/feeds.py               |    2 +-
 jhbuild/buildbot/status/web/logs.py                |    2 +-
 jhbuild/buildbot/status/web/step.py                |    2 +-
 jhbuild/buildbot/status/web/waterfall.py           |    2 +-
 jhbuild/buildbot/steps.py                          |    2 +-
 jhbuild/commands/Makefile.am                       |    2 +
 jhbuild/commands/__init__.py                       |   10 +-
 jhbuild/commands/autobuild.py                      |    4 +-
 jhbuild/commands/base.py                           |   80 +-
 jhbuild/commands/bootstrap.py                      |   59 +-
 jhbuild/commands/bot.py                            |    8 +-
 jhbuild/commands/checkbranches.py                  |    6 +-
 jhbuild/commands/checkmodulesets.py                |    2 +-
 jhbuild/commands/clean.py                          |    6 +-
 jhbuild/commands/gui.py                            |    2 +-
 jhbuild/commands/info.py                           |   15 +-
 jhbuild/commands/make.py                           |   93 +
 jhbuild/commands/rdepends.py                       |    2 +-
 jhbuild/commands/sanitycheck.py                    |   14 +-
 jhbuild/commands/snapshot.py                       |    2 +-
 jhbuild/commands/sysdeps.py                        |  102 +
 jhbuild/commands/tinderbox.py                      |    4 +-
 jhbuild/commands/uninstall.py                      |   13 +-
 jhbuild/config.py                                  |  113 +-
 jhbuild/defaults.jhbuildrc                         |   52 +-
 jhbuild/errors.py                                  |    2 +-
 jhbuild/frontends/__init__.py                      |    6 +-
 jhbuild/frontends/autobuild.py                     |    8 +-
 jhbuild/frontends/buildscript.py                   |   90 +-
 jhbuild/frontends/gtkui.py                         |   17 +-
 jhbuild/frontends/terminal.py                      |   56 +-
 jhbuild/frontends/tinderbox.py                     |   71 +-
 jhbuild/main.py                                    |    2 +-
 jhbuild/modtypes/Makefile.am                       |    1 -
 jhbuild/modtypes/__init__.py                       |  236 ++-
 jhbuild/modtypes/ant.py                            |  105 -
 jhbuild/modtypes/autotools.py                      |  195 +-
 jhbuild/modtypes/cmake.py                          |   62 +-
 jhbuild/modtypes/distutils.py                      |   35 +-
 jhbuild/modtypes/linux.py                          |   29 +-
 jhbuild/modtypes/perl.py                           |   34 +-
 jhbuild/modtypes/tarball.py                        |   22 +-
 jhbuild/modtypes/testmodule.py                     |   26 +-
 jhbuild/modtypes/waf.py                            |   51 +-
 jhbuild/moduleset.py                               |   78 +-
 jhbuild/monkeypatch.py                             |    2 +-
 jhbuild/utils/Makefile.am                          |    4 +
 jhbuild/utils/__init__.py                          |    2 +-
 jhbuild/utils/cmds.py                              |   28 +-
 jhbuild/utils/fileutils.py                         |  109 +
 jhbuild/utils/httpcache.py                         |   11 +-
 jhbuild/utils/lockfile.py                          |  145 +
 jhbuild/utils/notify.py                            |   55 +-
 jhbuild/utils/packagedb.py                         |  274 ++-
 jhbuild/utils/subprocess_win32.py                  |   10 +-
 jhbuild/utils/sxml.py                              |    2 +-
 jhbuild/utils/systeminstall.py                     |  208 ++
 jhbuild/utils/trayicon.py                          |    2 +-
 jhbuild/utils/trigger.py                           |   88 +
 jhbuild/utils/unpack.py                            |   11 +-
 jhbuild/versioncontrol/Makefile.am                 |    1 -
 jhbuild/versioncontrol/__init__.py                 |    2 +-
 jhbuild/versioncontrol/arch.py                     |  166 -
 jhbuild/versioncontrol/bzr.py                      |   20 +-
 jhbuild/versioncontrol/cvs.py                      |    2 +-
 jhbuild/versioncontrol/darcs.py                    |    2 +-
 jhbuild/versioncontrol/fossil.py                   |    2 +-
 jhbuild/versioncontrol/git.py                      |   22 +-
 jhbuild/versioncontrol/hg.py                       |    2 +-
 jhbuild/versioncontrol/mtn.py                      |    4 +-
 jhbuild/versioncontrol/svn.py                      |    7 +-
 jhbuild/versioncontrol/tarball.py                  |   49 +-
 modulesets/bootstrap.modules                       |   65 +-
 modulesets/gnome-apps-3.0.modules                  |  204 +-
 modulesets/gnome-apps-3.2.modules                  | 1089 ++++++
 modulesets/gnome-apps-3.4.modules                  | 1228 +++++++
 modulesets/gnome-apps-3.6.modules                  | 1259 +++++++
 modulesets/gnome-suites-core-3.0.modules           |   76 +-
 modulesets/gnome-suites-core-3.2.modules           | 1080 ++++++
 modulesets/gnome-suites-core-3.4.modules           | 1169 ++++++
 modulesets/gnome-suites-core-3.6.modules           | 1152 ++++++
 modulesets/gnome-suites-core-deps-3.0.modules      |  144 +-
 modulesets/gnome-suites-core-deps-3.2.modules      | 1364 +++++++
 modulesets/gnome-suites-core-deps-3.4.modules      |  992 ++++++
 modulesets/gnome-suites-core-deps-3.6.modules      | 1009 ++++++
 modulesets/gnome-suites-core-deps-base-3.4.modules |  516 +++
 modulesets/gnome-suites-core-deps-base-3.6.modules |  511 +++
 modulesets/gnome-world-3.0.modules                 |  120 +-
 modulesets/gnome-world-3.2.modules                 | 2115 +++++++++++
 modulesets/gnome-world-3.4.modules                 | 2171 ++++++++++++
 modulesets/gnome-world-3.6.modules                 | 2185 ++++++++++++
 modulesets/gnome2/gnome-2.30.modules               |   28 +-
 modulesets/gnome2/gnome-2.32.modules               |   54 +-
 modulesets/gnome2/gnome-external-deps-2.30.modules |    1 +
 modulesets/gnome2/gnome-external-deps-2.32.modules |    3 +-
 modulesets/gnome2/gnome-suites-2.32.modules        |   12 +-
 modulesets/moduleset.dtd                           |   24 +-
 modulesets/other/wayland.modules                   |  103 +
 patches/dbus-sharp-0.7.0-pkgconfig.patch           |   12 +
 patches/gettext-changelog.patch                    |  462 ---
 patches/gnutls-2.12.0-rpath.patch                  |   38 +
 patches/gudev-147.patch                            |   25 +-
 patches/gudev-173.patch                            |  524 +++
 patches/gupnp-av-0.7.1-link.patch                  |   12 -
 patches/js185.destdir.patch                        |   16 +
 patches/libmusicbrainz-r13451.patch                |   12 +
 patches/libtool-1.4.2-expsym.patch                 |   54 -
 patches/libtool-1.5.18-multilib.patch              |   31 -
 patches/libtool-1.5.24-multilib.patch              |   25 -
 patches/libxml2-2.7.8-versioning.patch             |   24 +
 patches/nspr.configure_4.8.9.patch                 |  982 ++++++
 patches/nspr.sonames.patch                         |  242 --
 patches/nss.linux3.patch                           |   52 +
 patches/nss.pkgconfig-and-configure.patch          |  146 +-
 patches/nss.sonames.patch                          |  308 --
 patches/python-2.6.7-lib64.patch                   |  169 +
 .../startup-notification-0.10-support-app-id.patch |  173 -
 patches/talloc-pkg-config-removal.patch            |   12 -
 patches/tdb-pkg-config-removal.patch               |   24 -
 patches/tevent-pkg-config-removal.patch            |   22 -
 po/LINGUAS                                         |    5 +
 po/POTFILES.in                                     |   18 +-
 po/POTFILES.skip                                   |    2 +
 po/ca.po                                           | 1550 ++++++++
 po/cs.po                                           | 1580 +++++----
 po/de.po                                           | 1257 ++++---
 po/eo.po                                           | 1708 +++++++++
 po/es.po                                           | 1306 +++++---
 po/fr.po                                           | 1044 ++++---
 po/gl.po                                           | 1343 +++++---
 po/it.po                                           | 1479 +++++----
 po/ja.po                                           | 1215 ++++---
 po/ko.po                                           | 1797 ++++++++++
 po/nb.po                                           | 1177 ++++---
 po/pt_BR.po                                        |   70 +-
 po/ro.po                                           | 1838 ++++++++++
 po/ru.po                                           | 1785 ++++++++++
 po/sl.po                                           | 1315 +++++---
 po/sv.po                                           |  220 +-
 po/zh_CN.po                                        | 1310 +++++---
 scripts/changecvsroot.py                           |    2 +-
 scripts/jhbuild.in                                 |    1 +
 tests/mock.py                                      |  111 +-
 tests/tests.py                                     |  272 +-
 triggers/Makefile.am                               |   11 +
 triggers/README                                    |   23 +
 triggers/desktop-database.trigger                  |   22 +
 triggers/gdk-pixbuf.trigger                        |   24 +
 triggers/glib.trigger                              |   22 +
 triggers/gtk+.trigger                              |   26 +
 triggers/immodules.trigger                         |   22 +
 triggers/mime-database.trigger                     |   22 +
 triggers/pango.trigger                             |   23 +
 180 files changed, 45273 insertions(+), 12954 deletions(-)
---



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