diff -u faad2-2.7/debian/control faad2-2.7/debian/control
--- faad2-2.7/debian/control
+++ faad2-2.7/debian/control
@@ -1,7 +1,8 @@
 Source: faad2
 Section: libs
 Priority: optional
-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
 Uploaders: Matthew W. S. Bell <matthew@bells23.org.uk>,
            Andres Mejia <mcitadel@gmail.com>,
            Reinhard Tartler <siretart@tauware.de>,
diff -u faad2-2.7/debian/changelog faad2-2.7/debian/changelog
--- faad2-2.7/debian/changelog
+++ faad2-2.7/debian/changelog
@@ -1,3 +1,12 @@
+faad2 (2.7-6ubuntu1) natty; urgency=low
+
+  * 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
+
+ -- Angel Abad <angelabad@ubuntu.com>  Tue, 23 Nov 2010 13:48:21 +0100
+
 faad2 (2.7-6) unstable; urgency=high
 
   [ Alessio Treglia ]
@@ -11,6 +20,14 @@
 
  -- Andres Mejia <mcitadel@gmail.com>  Mon, 22 Nov 2010 19:17:36 -0500
 
+faad2 (2.7-5ubuntu1) natty; urgency=low
+
+  * 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>  Tue, 23 Nov 2010 12:35:27 +0530
+
 faad2 (2.7-5) unstable; urgency=low
 
   * Update my e-mail address.
diff -u faad2-2.7/debian/patches/series faad2-2.7/debian/patches/series
--- faad2-2.7/debian/patches/series
+++ faad2-2.7/debian/patches/series
@@ -2,0 +3 @@
+fix_ftbfs_with_gcc4.5.patch
only in patch2:
unchanged:
--- faad2-2.7.orig/debian/patches/fix_ftbfs_with_gcc4.5.patch
+++ faad2-2.7/debian/patches/fix_ftbfs_with_gcc4.5.patch
@@ -0,0 +1,31 @@
+Index: faad2-2.7/libfaad/common.h
+=====================================
+--- faad2-2.7.orig/libfaad/common.h
++++ faad2-2.7/libfaad/common.h
+@@ -315,7 +315,7 @@
+ 
+   #if defined(_WIN32) && !defined(__MINGW32__)
+     #define HAS_LRINTF
+-    static INLINE int lrintf(float f)
++    static INLINE int _lrintf(float f)
+     {
+         int i;
+         __asm
+@@ -330,7 +330,7 @@
+     #ifndef HAVE_LRINTF
+     #define HAS_LRINTF
+     // from http://www.stereopsis.com/FPU.html
+-    static INLINE int lrintf(float f)
++    static INLINE int _lrintf(float f)
+     {
+         int i;
+         __asm__ __volatile__ (
+@@ -396,7 +396,7 @@
+ 
+ #ifndef HAS_LRINTF
+ /* standard cast */
+-#define lrintf(f) ((int32_t)(f))
++#define _lrintf(f) ((int32_t)(f))
+ #endif
+ 
+ typedef real_t complex_t[2];