Merge lp://staging/~mitya57/ubuntu/trusty/qtchooser/39-g4717841-1ubuntu1 into lp://staging/ubuntu/trusty/qtchooser
Proposed by
Dmitry Shachnev
| Status: | Merged |
|---|---|
| Approved by: | Martin Pitt |
| Approved revision: | 8 |
| Merge reported by: | Martin Pitt |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~mitya57/ubuntu/trusty/qtchooser/39-g4717841-1ubuntu1 |
| Merge into: | lp://staging/ubuntu/trusty/qtchooser |
| Diff against target: |
900 lines (+92/-572) 13 files modified
.pc/applied-patches (+0/-1) .pc/enable-tests.patch/Makefile (+10/-1) .pc/ensure_harcoded_paths_are_found.patch/src/qtchooser/main.cpp (+0/-516) .tag (+1/-1) Makefile (+10/-1) debian/changelog (+16/-0) debian/control (+23/-7) debian/patches/enable-tests.patch (+2/-2) debian/patches/ensure_harcoded_paths_are_found.patch (+0/-27) debian/patches/series (+0/-1) doc/qtchooser.1 (+1/-1) src/qtchooser/main.cpp (+28/-14) tests/auto/qtchooser/tst_qtchooser.cpp (+1/-0) |
| To merge this branch: | bzr merge lp://staging/~mitya57/ubuntu/trusty/qtchooser/39-g4717841-1ubuntu1 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Martin Pitt | Approve | ||
|
Review via email:
|
|||
Description of the change
* Merge with Debian unstable, remaining changes:
- Break qt4 (<= 4:4.8.4+
- Make the package Multi-Arch: foreign.
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
Thanks! Uploaded.