Merge lp://qastaging/~noskcaj/ubuntu/vivid/jhbuild/3.12 into lp://qastaging/ubuntu/vivid/jhbuild
Proposed by
Jackson Doak
Status: | Needs review |
---|---|
Proposed branch: | lp://qastaging/~noskcaj/ubuntu/vivid/jhbuild/3.12 |
Merge into: | lp://qastaging/ubuntu/vivid/jhbuild |
Diff against target: |
141882 lines (+82094/-32182) 175 files modified
Makefile.am (+22/-2) Makefile.in (+247/-200) NEWS (+323/-0) aclocal.m4 (+503/-304) autogen.sh (+56/-31) build-aux/compile (+347/-0) build-aux/depcomp (+269/-186) build-aux/install-sh (+7/-7) build-aux/missing (+159/-275) build-aux/py-compile (+16/-7) buildbot/Makefile.in (+76/-59) configure (+404/-2302) configure.ac (+1/-5) debian/changelog (+12/-0) debian/control (+8/-6) debian/control.in (+8/-6) debian/rules (+1/-3) doc/C/index.docbook (+119/-32) doc/Makefile.am (+1/-1) doc/Makefile.in (+80/-63) doc/de/de.po (+1/-1) doc/de/index.docbook (+394/-186) doc/el/el.po (+3921/-2098) doc/el/index.docbook (+1047/-1917) doc/es/es.po (+1520/-783) doc/es/index.docbook (+264/-167) doc/fr/fr.po (+2/-2) doc/fr/index.docbook (+449/-192) doc/ja/index.docbook (+725/-862) doc/ja/ja.po (+3047/-4520) doc/pt_BR/index.docbook (+2029/-0) doc/pt_BR/pt_BR.po (+5922/-0) doc/ru/index.docbook (+3218/-0) doc/ru/ru.po (+3895/-0) doc/sl/index.docbook (+521/-473) doc/sl/sl.po (+1/-1) doc/sv/index.docbook (+388/-202) doc/sv/sv.po (+1/-1) doc/zh_CN/index.docbook (+2923/-0) doc/zh_CN/zh_CN.po (+4901/-0) examples/Makefile.in (+79/-62) install-check.c (+4/-4) jhbuild.desktop.in (+1/-1) jhbuild/Makefile.am (+1/-1) jhbuild/Makefile.in (+169/-159) jhbuild/buildbot/Makefile.in (+168/-158) jhbuild/buildbot/status/Makefile.in (+168/-158) jhbuild/buildbot/status/web/Makefile.in (+97/-68) jhbuild/commands/Makefile.am (+1/-0) jhbuild/commands/Makefile.in (+98/-68) jhbuild/commands/__init__.py (+1/-1) jhbuild/commands/autobuild.py (+3/-3) jhbuild/commands/base.py (+20/-33) jhbuild/commands/bot.py (+2/-1) jhbuild/commands/checkmodulesets.py (+1/-1) jhbuild/commands/extdeps.py (+170/-0) jhbuild/commands/sanitycheck.py (+50/-31) jhbuild/commands/sysdeps.py (+49/-16) jhbuild/commands/tinderbox.py (+2/-2) jhbuild/commands/uninstall.py (+17/-5) jhbuild/config.py (+80/-24) jhbuild/cut_n_paste/Makefile.am (+0/-6) jhbuild/cut_n_paste/Makefile.in (+0/-477) jhbuild/cut_n_paste/subprocess.py (+0/-1165) jhbuild/defaults.jhbuildrc (+31/-7) jhbuild/frontends/Makefile.in (+98/-70) jhbuild/frontends/buildscript.py (+3/-1) jhbuild/frontends/gtkui.py (+1/-0) jhbuild/frontends/terminal.py (+3/-0) jhbuild/frontends/tinderbox.py (+42/-15) jhbuild/main.py (+4/-1) jhbuild/modtypes/Makefile.in (+97/-68) jhbuild/modtypes/__init__.py (+63/-38) jhbuild/modtypes/autotools.py (+123/-71) jhbuild/modtypes/waf.py (+21/-8) jhbuild/moduleset.py (+57/-1) jhbuild/monkeypatch.py (+0/-146) jhbuild/utils/Makefile.in (+97/-68) jhbuild/utils/cmds.py (+11/-13) jhbuild/utils/fileutils.py (+2/-2) jhbuild/utils/httpcache.py (+1/-1) jhbuild/utils/packagedb.py (+21/-4) jhbuild/utils/systeminstall.py (+130/-64) jhbuild/versioncontrol/Makefile.in (+97/-68) jhbuild/versioncontrol/__init__.py (+5/-2) jhbuild/versioncontrol/bzr.py (+13/-4) jhbuild/versioncontrol/git.py (+18/-9) jhbuild/versioncontrol/system.py (+4/-0) m4/gettext.m4 (+0/-381) m4/iconv.m4 (+0/-180) m4/intlmacosx.m4 (+0/-51) m4/lib-ld.m4 (+0/-110) m4/lib-link.m4 (+0/-709) m4/lib-prefix.m4 (+0/-185) m4/po.m4 (+0/-449) m4/progtest.m4 (+0/-92) modulesets/bootstrap.modules (+114/-24) modulesets/gnome-apps-3.0.modules (+6/-7) modulesets/gnome-apps-3.10.modules (+1057/-0) modulesets/gnome-apps-3.12.modules (+1137/-0) modulesets/gnome-apps-3.14.modules (+1146/-0) modulesets/gnome-apps-3.2.modules (+3/-4) modulesets/gnome-apps-3.4.modules (+2/-3) modulesets/gnome-apps-3.6.modules (+55/-35) modulesets/gnome-apps-3.8.modules (+875/-0) modulesets/gnome-apps-trunk.modules (+0/-1148) modulesets/gnome-suites-core-3.0.modules (+3/-2) modulesets/gnome-suites-core-3.10.modules (+1114/-0) modulesets/gnome-suites-core-3.12.modules (+1196/-0) modulesets/gnome-suites-core-3.14.modules (+1174/-0) modulesets/gnome-suites-core-3.2.modules (+0/-1) modulesets/gnome-suites-core-3.4.modules (+3/-4) modulesets/gnome-suites-core-3.6.modules (+52/-63) modulesets/gnome-suites-core-3.8.modules (+1103/-0) modulesets/gnome-suites-core-deps-3.0.modules (+4/-4) modulesets/gnome-suites-core-deps-3.10.modules (+1400/-0) modulesets/gnome-suites-core-deps-3.12.modules (+1519/-0) modulesets/gnome-suites-core-deps-3.14.modules (+1526/-0) modulesets/gnome-suites-core-deps-3.2.modules (+7/-7) modulesets/gnome-suites-core-deps-3.4.modules (+10/-10) modulesets/gnome-suites-core-deps-3.6.modules (+66/-91) modulesets/gnome-suites-core-deps-3.8.modules (+1273/-0) modulesets/gnome-suites-core-deps-base-3.4.modules (+3/-3) modulesets/gnome-suites-core-deps-base-3.6.modules (+20/-8) modulesets/gnome-suites-core-deps-base-trunk.modules (+0/-356) modulesets/gnome-suites-core-deps-trunk.modules (+0/-930) modulesets/gnome-suites-core-trunk.modules (+0/-1128) modulesets/gnome-sysdeps-3.10.modules (+796/-0) modulesets/gnome-sysdeps-3.12.modules (+860/-0) modulesets/gnome-sysdeps-3.14.modules (+860/-0) modulesets/gnome-sysdeps-3.6.modules (+20/-3) modulesets/gnome-sysdeps-3.8.modules (+748/-0) modulesets/gnome-world-3.0.modules (+3/-3) modulesets/gnome-world-3.10.modules (+3171/-0) modulesets/gnome-world-3.12.modules (+3234/-0) modulesets/gnome-world-3.14.modules (+3234/-0) modulesets/gnome-world-3.2.modules (+4/-4) modulesets/gnome-world-3.4.modules (+5/-5) modulesets/gnome-world-3.6.modules (+47/-17) modulesets/gnome-world-3.8.modules (+3252/-0) modulesets/gnome-world-trunk.modules (+0/-2043) modulesets/moduleset.dtd (+39/-12) modulesets/moduleset.rnc (+251/-0) modulesets/moduleset.xsl (+196/-0) patches/farstream.fix-introspection.patch (+0/-127) patches/farstream.netinet-in.patch (+22/-0) patches/ibus.skip-dconf-update-if-DESTDIR-is-set.patch (+42/-0) patches/js17-build-fixes.patch (+38/-0) patches/js24-buildapi.patch (+38/-0) patches/js24-prettyprinters.patch (+184/-0) patches/libpwquality.libintl-link.patch (+59/-0) patches/libvirt-0.9.13-daemon-auto-spawn.patch (+0/-46) patches/spice-gtk-0.23-fix-disable-static-builds.patch (+715/-0) po/LINGUAS (+1/-0) po/POTFILES.in (+1/-0) po/cs.po (+588/-399) po/de.po (+427/-395) po/el.po (+625/-544) po/es.po (+472/-321) po/gl.po (+485/-357) po/id.po (+686/-563) po/ja.po (+910/-879) po/ko.po (+259/-282) po/nb.po (+463/-377) po/pt_BR.po (+1226/-727) po/sl.po (+674/-513) po/tg.po (+1800/-0) po/zh_CN.po (+651/-444) scripts/Makefile.am (+1/-1) scripts/Makefile.in (+81/-64) scripts/debian-python2-postinstall-hook.sh (+24/-0) scripts/hg-update.py (+1/-7) triggers/Makefile.in (+80/-63) triggers/desktop-database.trigger (+1/-1) triggers/pango.trigger (+1/-1) |
To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/vivid/jhbuild/3.12 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sebastien Bacher | Needs Information | ||
Review via email:
|
Description of the change
New upstream release.
To post a comment you must log in.
Unmerged revisions
- 11. By Jackson Doak
-
Run autoreconf
- 10. By Jackson Doak
-
* New upstream release.
* Drop install override from rules file, no longer needed.
* Suggest rather than recommend version control systems other than git
Thanks, that package is currently in sync with Debian, is there any reason the update couldn't be done there and synced over?