lp://qastaging/~noskcaj/ubuntu/utopic/liquidsoap/merge

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp://qastaging/ubuntu/utopic/liquidsoap

Daniel Holbach (community): Approve on 2014-08-21

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

44. By Jackson Doak on 2014-08-18

* Merge from debian. Remaining changes:
  - Build-Depend on and Recommend fonts-liberation rather than
    ttf-liberation.
* Patch shine encoder to adapt to new ABI.

43. By Matthias Klose on 2013-12-24

Rebuild for ocaml-4.01.

42. By Colin Watson on 2013-09-13

update-maintainer

41. By Colin Watson on 2013-09-13

changelog accuracy

40. By Colin Watson on 2013-09-13

merge lp:~noskcaj/ubuntu/saucy/liquidsoap/liberation

39. By Colin Watson on 2013-07-22

Rebuild for new OCaml ABIs.

38. By Colin Watson on 2013-06-20

Rebuild for new OCaml ABIs on armhf.

37. By Romain Beauxis on 2013-06-11

Bring back SDL plugin.

36. By Colin Watson on 2013-06-02

Rebuild for libgd3 on armhf.

35. By Romain Beauxis on 2013-05-15

* Switch GD build-dep to libgd-ocaml-dev.
* Provide alternative build-dep on libgd-gd2-ocaml-dev.
* Bump build-dep on camlimages.
* Drop optional SDL plugin until SDL and gd become compatible
  again (conflicts on libtiff{4,5}-dev).