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



commit 8f55849a839757875111c88f9674e9f3ab20ce38
Merge: 4340f52 82c2d96
Author: Frédéric Péters <fpeters 0d be>
Date:   Wed Mar 30 17:44:54 2011 +0530

    Merge branch 'master' into release-team-commands

 HACKING                                            |   47 +-
 NEWS                                               |  138 +
 README                                             |    4 +-
 configure.ac                                       |    3 +-
 doc/C/jhbuild.xml                                  | 4298 ++++++++---------
 doc/Makefile.am                                    |    2 +-
 doc/de/de.po                                       | 2541 ++++++----
 doc/es/es.po                                       | 1979 ++++----
 doc/fr/fr.po                                       | 1787 ++++----
 doc/ja/ja.po                                       | 5164 ++++++++++++++++++++
 examples/jhbuild-session                           |   18 +
 examples/jhbuild.desktop.in                        |   10 +
 sample.jhbuildrc => examples/sample.jhbuildrc      |   25 +-
 jamesh.jhbuildrc                                   |   37 -
 jhbuild.doap                                       |    8 +
 jhbuild/buildbot/changes.py                        |   28 +-
 jhbuild/buildbot/status/web/__init__.py            |   38 +-
 jhbuild/buildbot/status/web/changes.py             |   10 +-
 jhbuild/buildbot/status/web/feeds.py               |   12 +-
 jhbuild/buildbot/steps.py                          |    1 +
 jhbuild/commands/autobuild.py                      |    3 +
 jhbuild/commands/base.py                           |   18 +-
 jhbuild/commands/bot.py                            |    1 +
 jhbuild/commands/info.py                           |   22 +-
 jhbuild/commands/rdepends.py                       |    4 +-
 jhbuild/commands/sanitycheck.py                    |   45 +-
 jhbuild/commands/uninstall.py                      |    6 +-
 jhbuild/config.py                                  |   15 +-
 jhbuild/defaults.jhbuildrc                         |   24 +-
 jhbuild/errors.py                                  |    2 +
 jhbuild/frontends/autobuild.py                     |    2 +-
 jhbuild/frontends/buildscript.py                   |    6 +-
 jhbuild/frontends/gtkui.py                         |   17 +-
 jhbuild/frontends/terminal.py                      |    9 +-
 jhbuild/frontends/tinderbox.py                     |    9 +-
 jhbuild/modtypes/__init__.py                       |   13 +-
 jhbuild/modtypes/ant.py                            |    2 +-
 jhbuild/modtypes/autotools.py                      |   18 +-
 jhbuild/modtypes/cmake.py                          |   66 +-
 jhbuild/modtypes/distutils.py                      |    2 +-
 jhbuild/moduleset.py                               |   53 +-
 jhbuild/utils/cmds.py                              |    6 +-
 jhbuild/utils/trayicon.py                          |   19 +
 jhbuild/versioncontrol/bzr.py                      |    6 +-
 jhbuild/versioncontrol/git.py                      |   28 +-
 modulesets/bootstrap.modules                       |   35 +-
 modulesets/freedesktop-devel.modules               |   19 -
 modulesets/gnome-apps-3.0.modules                  |  980 ++++
 modulesets/gnome-devel.modules                     |  187 -
 modulesets/gnome-external-deps-devel.modules       |  652 ---
 modulesets/gnome-suites-core-3.0.modules           | 1031 ++++
 modulesets/gnome-suites-core-deps-3.0.modules      | 1257 +++++
 modulesets/gnome-suites-devel.modules              |  153 -
 .../{gnome-3.0.modules => gnome-world-3.0.modules} | 1119 ++---
 modulesets/{ => gnome2}/freedesktop-2.14.modules   |    0
 modulesets/{ => gnome2}/freedesktop-2.16.modules   |    0
 modulesets/{ => gnome2}/freedesktop-2.18.modules   |    0
 modulesets/{ => gnome2}/freedesktop-2.20.modules   |    0
 modulesets/{ => gnome2}/freedesktop-2.22.modules   |    0
 modulesets/{ => gnome2}/freedesktop-2.24.modules   |    0
 modulesets/{ => gnome2}/freedesktop-2.26.modules   |    0
 modulesets/{ => gnome2}/freedesktop-2.28.modules   |    0
 modulesets/{ => gnome2}/freedesktop-2.30.modules   |    0
 .../freedesktop-2.32.modules}                      |    2 +-
 modulesets/{ => gnome2}/gnome-2.10.modules         |    0
 modulesets/{ => gnome2}/gnome-2.12.modules         |    0
 modulesets/{ => gnome2}/gnome-2.14-test.modules    |    0
 modulesets/{ => gnome2}/gnome-2.14.modules         |    0
 modulesets/{ => gnome2}/gnome-2.16.modules         |    0
 modulesets/{ => gnome2}/gnome-2.18.modules         |    0
 modulesets/{ => gnome2}/gnome-2.20.modules         |    0
 modulesets/{ => gnome2}/gnome-2.22.modules         |    1 -
 modulesets/{ => gnome2}/gnome-2.24.modules         |    1 -
 modulesets/{ => gnome2}/gnome-2.26.modules         |    1 -
 modulesets/{ => gnome2}/gnome-2.28.modules         |    1 -
 modulesets/{ => gnome2}/gnome-2.30.modules         |   28 +-
 .../gnome-2.32.modules}                            |  228 +-
 .../{ => gnome2}/gnome-external-deps-2.20.modules  |    0
 .../{ => gnome2}/gnome-external-deps-2.22.modules  |    0
 .../{ => gnome2}/gnome-external-deps-2.24.modules  |    0
 .../{ => gnome2}/gnome-external-deps-2.26.modules  |    9 +-
 .../{ => gnome2}/gnome-external-deps-2.28.modules  |    9 +-
 .../{ => gnome2}/gnome-external-deps-2.30.modules  |    9 +-
 .../gnome-external-deps-2.32.modules}              |  313 +-
 modulesets/{ => gnome2}/gnome-suites-2.20.modules  |    0
 modulesets/{ => gnome2}/gnome-suites-2.22.modules  |    0
 modulesets/{ => gnome2}/gnome-suites-2.24.modules  |    0
 modulesets/{ => gnome2}/gnome-suites-2.26.modules  |    0
 modulesets/{ => gnome2}/gnome-suites-2.28.modules  |    0
 modulesets/{ => gnome2}/gnome-suites-2.30.modules  |   39 +-
 .../gnome-suites-2.32.modules}                     |  482 +--
 modulesets/{ => gnome2}/mobile-2.24.modules        |    0
 modulesets/{ => gnome2}/mobile-2.26.modules        |    0
 modulesets/{ => gnome2}/mobile-2.28.modules        |    0
 modulesets/{ => gnome2}/mobile-2.30.modules        |    0
 modulesets/mobile-3.0.modules                      |   34 -
 modulesets/moduleset.dtd                           |    1 +
 modulesets/moduleset.rnc                           |    1 +
 modulesets/{ => other}/gnutls.modules              |    0
 modulesets/{ => other}/gtk.modules                 |    0
 modulesets/{ => other}/gtk28.modules               |    0
 modulesets/{ => other}/hildon.modules              |    0
 modulesets/{ => other}/matchbox.modules            |    0
 modulesets/{ => other}/online-desktop.modules      |    0
 modulesets/{ => other}/pulseaudio.modules          |   12 +-
 patches/WebKit-1.3.9-changeset_r75081.diff         |   28 +
 patches/cairo-1.10.0-TrailingComma.patch           |   11 +
 patches/gettext-0.17-open.patch                    |   14 -
 patches/gnutls-2.10.1-handshake-errors.patch       |   57 +
 patches/gnutls-2.10.2-rpath.patch                  |  104 +
 patches/gssdp-0.8.0-fixdso.patch                   |   13 +
 patches/gtk-vnc.drawable.patch                     |   26 +
 patches/gudev-147.patch                            |  459 ++
 patches/guile-1.8.5-libtool2.patch                 |   55 -
 patches/guile-1.8.7-445f31fc06.patch               |   35 +
 patches/gupnp-av-0.7.1-link.patch                  |   12 +
 patches/libcanberra-quit-add.patch                 |   24 +
 patches/libproxy-0.4-python-libdir.patch           |   32 -
 patches/libxklavier-5.0.xlibs.patch                | 2093 ++++++++
 patches/mozilla-1.9.1-mozilla-js-pc-fix.patch      |   10 +
 patches/nspr.autogen.patch                         |   17 +
 patches/nspr.config_64bits.patch                   |   85 +-
 patches/nspr.configure.patch                       |  978 ----
 patches/nspr.hostcompiler.patch                    |   22 +
 patches/nspr.pkgconfig.patch                       |   38 +-
 patches/nss.pkgconfig-and-configure.patch          | 4405 +-----------------
 patches/pulseaudio-0.9.21.potfiles.patch           |   11 +
 patches/python-2.5.2-lib64.patch                   |    7 -
 patches/sqlite-3.7.1.dlsym1.patch                  |   41 +
 patches/sqlite-3.7.1.dlsym2.patch                  |  164 +
 .../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                                         |    2 +
 po/cs.po                                           |    2 +-
 po/de.po                                           |  330 +-
 po/en_GB.po                                        |    4 +-
 po/es.po                                           |  422 +-
 po/fr.po                                           |  168 +-
 po/gl.po                                           |  906 ++--
 po/it.po                                           |    2 +-
 po/ja.po                                           | 1472 ++++++
 po/nb.po                                           |  538 ++-
 po/nl.po                                           |    2 +-
 po/pt_BR.po                                        | 1433 ++++--
 po/sl.po                                           |  467 +-
 po/sv.po                                           |  621 ++--
 po/uk.po                                           |  400 +-
 po/zh_CN.po                                        | 1484 ++++++
 tests/mock.py                                      |    2 +-
 151 files changed, 24863 insertions(+), 15514 deletions(-)
---



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