Merge lp://staging/~mitya57/ubuntu/trusty/qtchooser/31-g980c64c-5ubuntu1 into lp://staging/ubuntu/trusty/qtchooser
Proposed by
Dmitry Shachnev
| Status: | Merged |
|---|---|
| Merge reported by: | Iain Lane |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~mitya57/ubuntu/trusty/qtchooser/31-g980c64c-5ubuntu1 |
| Merge into: | lp://staging/ubuntu/trusty/qtchooser |
| Diff against target: |
1933 lines (+663/-1116) 15 files modified
.pc/applied-patches (+1/-2) .pc/create-a-system-default-path.patch/src/qtchooser/Makefile (+0/-64) .pc/create-a-system-default-path.patch/src/qtchooser/main.cpp (+0/-471) .pc/ensure_harcoded_paths_are_found.patch/src/qtchooser/main.cpp (+516/-0) .pc/fix-PATH_MAX.diff/src/qtchooser/main.cpp (+0/-477) .tag (+1/-1) debian/README.source (+8/-0) debian/changelog (+53/-0) debian/control (+1/-1) debian/patches/create-a-system-default-path.patch (+0/-57) debian/patches/ensure_harcoded_paths_are_found.patch (+27/-0) debian/patches/fix-PATH_MAX.diff (+0/-21) debian/patches/series (+1/-2) debian/watch (+1/-1) src/qtchooser/main.cpp (+54/-19) |
| To merge this branch: | bzr merge lp://staging/~mitya57/ubuntu/trusty/qtchooser/31-g980c64c-5ubuntu1 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | Pending | ||
|
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
