~ubuntu-branches/ubuntu/trusty/faad2/trusty

Viewing all changes in revision 8.

  • Committer: Bazaar Package Importer
  • Author(s): Angel Abad, Angel Abad, Bhavani Shankar
  • Date: 2010-11-23 13:48:21 UTC
  • mfrom: (6.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20101123134821-73xsqhbdn1gl6fud
Tags: 2.7-6ubuntu1
[ Angel Abad <angelabad@ubuntu.com> ]
* Merge from debian unstable (LP: #680474). Remaining changes:
  - debian/patches/fix_ftbfs_with_gcc4.5.patch
    + Correctly declare lrintf in libfaad/common.h to avoid a conflict of
      declaration in mathcalls.h to fix FTBFS on i386

[ Bhavani Shankar <bhavi@ubuntu.com> ]
* Remove useless chunk from the patch I created above to fix FTBFS
  which happened due to my mistake. Sigh!

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: