Merge lp://staging/~mvo/apt/mvo into lp://staging/~ubuntu-core-dev/apt/ubuntu
Proposed by
Michael Vogt
| Status: | Merged |
|---|---|
| Merged at revision: | 1810 |
| Proposed branch: | lp://staging/~mvo/apt/mvo |
| Merge into: | lp://staging/~ubuntu-core-dev/apt/ubuntu |
| Diff against target: |
73066 lines (+13639/-12297) (has conflicts) 76 files modified
apt-pkg/contrib/fileutl.cc (+26/-2) apt-pkg/contrib/strutl.cc (+2/-2) apt-pkg/deb/debindexfile.cc (+13/-9) apt-pkg/deb/deblistparser.cc (+6/-0) apt-pkg/deb/debsystem.cc (+2/-2) apt-pkg/depcache.cc (+15/-1) apt-pkg/packagemanager.cc (+3/-3) apt-pkg/pkgcache.cc (+1/-0) apt-pkg/pkgcache.h (+1/-1) apt-pkg/policy.cc (+5/-4) buildlib/debiandoc.mak (+2/-2) buildlib/po4a_manpage.mak (+1/-1) cmdline/apt-get.cc (+12/-0) debian/apt.cron.daily (+15/-28) debian/changelog (+158/-0) debian/control (+1/-1) doc/examples/configure-index (+1/-0) doc/po/de.po (+292/-590) doc/po/fr.po (+8/-4) po/apt-all.pot (+278/-266) po/ar.po (+278/-266) po/ast.po (+299/-287) po/bg.po (+278/-266) po/bs.po (+278/-266) po/ca.po (+375/-241) po/cs.po (+278/-266) po/cy.po (+278/-266) po/da.po (+405/-226) po/de.po (+350/-247) po/dz.po (+278/-266) po/el.po (+278/-266) po/es.po (+278/-266) po/eu.po (+278/-266) po/fi.po (+278/-266) po/fr.po (+278/-268) po/gl.po (+278/-266) po/he.po (+2/-2) po/hu.po (+278/-266) po/it.po (+284/-272) po/ja.po (+278/-266) po/km.po (+278/-266) po/ko.po (+278/-266) po/ku.po (+278/-266) po/lt.po (+278/-266) po/mr.po (+278/-266) po/nb.po (+377/-236) po/ne.po (+278/-266) po/nl.po (+280/-268) po/nn.po (+278/-266) po/pl.po (+278/-266) po/pt.po (+279/-267) po/pt_BR.po (+278/-266) po/ro.po (+278/-266) po/ru.po (+279/-267) po/sk.po (+278/-266) po/sl.po (+278/-266) po/sv.po (+278/-266) po/th.po (+278/-266) po/tl.po (+278/-266) po/uk.po (+278/-266) po/vi.po (+543/-535) po/zh_CN.po (+278/-273) po/zh_TW.po (+278/-266) test/integration/Packages-policy-pinning (+12/-0) test/integration/framework (+2/-1) test/integration/run-tests (+1/-1) test/integration/test-autoremove (+1/-1) test/integration/test-bug-590438-broken-provides-thanks-to-remove-order (+1/-1) test/integration/test-bug-591882-conkeror (+5/-5) test/integration/test-bug-595691-empty-and-broken-archive-files (+91/-0) test/integration/test-bug-598669-install-postfix-gets-exim-heavy (+22/-0) test/integration/test-compressed-indexes (+1/-1) test/integration/test-disappearing-packages (+1/-1) test/integration/test-pdiff-usage (+1/-1) test/integration/test-policy-pinning (+228/-0) test/integration/test-ubuntu-bug-614993 (+62/-0) Text conflict in apt-pkg/depcache.cc Text conflict in debian/changelog Text conflict in doc/po/fr.po Text conflict in po/ca.po Text conflict in po/da.po Text conflict in po/de.po Text conflict in po/nb.po Text conflict in test/integration/test-bug-598669-install-postfix-gets-exim-heavy Text conflict in test/integration/test-ubuntu-bug-614993 |
| To merge this branch: | bzr merge lp://staging/~mvo/apt/mvo |
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Core Development Team | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
