Merge lp://qastaging/~noskcaj/ubuntu/utopic/liquidsoap/merge into lp://qastaging/ubuntu/utopic/liquidsoap
Proposed by
Jackson Doak
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~noskcaj/ubuntu/utopic/liquidsoap/merge |
| Merge into: | lp://qastaging/ubuntu/utopic/liquidsoap |
| Diff against target: |
2349 lines (+153/-1980) 17 files modified
.pc/applied-patches (+0/-1) .pc/fdkaad-dynlink.patch/Makefile.defs.in (+0/-118) .pc/fdkaad-dynlink.patch/configure.ac (+0/-1036) .pc/fdkaad-dynlink.patch/src/Makefile (+0/-351) .pc/fdkaad-dynlink.patch/src/encoder/fdkaac_encoder.ml (+0/-106) Makefile.defs.in (+0/-1) configure.ac (+0/-9) debian/changelog (+14/-0) debian/patches/fdkaad-dynlink.patch (+37/-41) debian/patches/series (+1/-0) debian/patches/shine_abi_3 (+13/-0) src/Makefile (+1/-4) src/encoder/fdkaac_encoder.ml (+87/-137) src/encoder/fdkaac_encoder_builtin.ml (+0/-28) src/encoder/fdkaac_encoder_dynlink.ml (+0/-50) src/tools/fdkaac_dynlink.ml (+0/-50) src/tools/fdkaac_dynlink.mli (+0/-48) |
| To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/utopic/liquidsoap/merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge from debian. (shine transition)
To post a comment you must log in.
Unmerged revisions
- 44. By Jackson Doak
-
* Merge from debian. Remaining changes:
- Build-Depend on and Recommend fonts-liberation rather than
ttf-liberation.
* Patch shine encoder to adapt to new ABI.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks. Uploaded.