lp://staging/~noskcaj/ubuntu/saucy/libav/merge0.8.7-1

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/ubuntu/saucy/libav

Martin Pitt: Approve on 2013-07-23

Diff: 673 lines (+187/-63)

26 files modified

Changelog (+20/-0)
RELEASE (+1/-1)
VERSION (+1/-1)
debian/changelog (+14/-0)
debian/gbp.conf (+2/-0)
debian/patches/01-Tweak-doxygen-config.patch (+5/-3)
debian/patches/03-disable-configuration-warnings.patch (+5/-3)
debian/patches/04-ffmpeg-warning-change.patch (+4/-2)
debian/watch (+1/-1)
libavcodec/aacdec.c (+2/-0)
libavcodec/bmv.c (+1/-1)
libavcodec/dfa.c (+2/-0)
libavcodec/indeo3.c (+52/-24)
libavcodec/proresdec.c (+2/-0)
libavcodec/qdm2.c (+4/-0)
libavcodec/rv10.c (+5/-0)
libavfilter/avfiltergraph.c (+6/-1)
libavfilter/graphparser.c (+2/-1)
libavformat/id3v2.c (+3/-2)
libavformat/oggparsevorbis.c (+1/-1)
libavformat/oma.c (+1/-1)
libavformat/oma.h (+1/-1)
libavformat/omadec.c (+13/-4)
libavformat/utils.c (+1/-0)
libavformat/wav.c (+8/-2)
libavformat/xmv.c (+30/-14)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

32. By Jackson Doak on 2013-07-10

Merged from debian unstable

31. By Reinhard Tartler on 2013-03-30

Put back the dh_strip invocations. Otherwise, no .ddebs will be
available at all.

30. By Reinhard Tartler on 2013-03-27

* Merge from debian/unstable, LP: #1160734, remaining changes:
  - don't build against libdirac, lame, libopenjpeg, librtmp, frei0r,
    vo-aacenc, vo-amrenc, x264, and xvid (all in universe)
  - do not build libav-extra-dbg, it is build from the libav-extra source
    package in ubuntu.
  - drop libav-regular-dbg, not necessary in ubuntu
  - Adjust LIB_PKGS/LIB_PKGS2 lists in debian/rules
  - several ifdefs in debian/rules that allow the use of the same file
    in libav and libav-extra (most of this can be merged into the debian
    package)
* Tested that co-instability of libavcodec-dev with libavcodec-extra-53 works.
  LP: #1143929, #1101829
* Remove all debug packages. In ubuntu, we provide debug symbols via the
  .ddeb infrastructure.

29. By Marc Deslauriers on 2013-01-24

* Update to 0.8.5 to fix multiple security issues. (LP: #1104019)
  - CVE-2012-2783
  - CVE-2012-2791
  - CVE-2012-2797
  - CVE-2012-2798
  - CVE-2012-2801
  - CVE-2012-2802
  - CVE-2012-2803
  - CVE-2012-2804
  - CVE-2012-5144

28. By Reinhard Tartler on 2012-12-09

Weaken dependencies on -dev packages. LP: #1038781

27. By Jamie Strandboge on 2012-11-16

No change rebuild for raring

26. By Colin Watson on 2012-10-01

Temporarily fudge the versioning of libavcodec-dev's dependency on
libavcodec-extra-53 to cope with the botched merge of libav-extra.

25. By Reinhard Tartler on 2012-08-07

* Merge from debian, remaining changes:
  - don't build against libdirac, lame, libopenjpeg, librtmp, frei0r,
    vo-aacenc, vo-amrenc, x264, and xvid (all in universe)
  - do not build libav-extra-dbg, it is build from the libav-extra source
    package in ubuntu.
  - drop libav-regular-dbg, not necessary in ubuntu
  - Adjust LIB_PKGS/LIB_PKGS2 lists in debian/rules
  - several ifdefs in debian/rules that allow the use of the same file
    in libav and libav-extra (most of this can be merged into the debian
    package)
  - several dependency fixups in debian/control

24. By Steve Langasek on 2012-07-30

Merge fix for bug #937561

23. By Michael Terry on 2012-07-17

* debian/control:
  - Prefer libtiff5-dev