diff -u oprofile-0.9.4+cvs20090629/debian/changelog oprofile-0.9.4+cvs20090629/debian/changelog
--- oprofile-0.9.4+cvs20090629/debian/changelog
+++ oprofile-0.9.4+cvs20090629/debian/changelog
@@ -1,3 +1,18 @@
+oprofile (0.9.4+cvs20090629-2.1ubuntu3) karmic; urgency=low
+
+  * Remove debian/patches/unstatic_libbfd.patch.  It caused oprofile to
+    break on every binutils upgrade because the libbfd soname changes
+    frequently.  Presumably for this reason, the package description for
+    binutils-dev says “Note that building Debian packages which depend on
+    the shared libbfd is Not Allowed.”  (LP: #426614)
+  * Don’t build-depend autoconf (just to keep the Debian diff smaller;
+    this actually has no effect since automake1.10 already depends
+    autoconf).
+  * Undo the change in -2.1ubuntu2 to the versioned build-dependency on
+    binutils-dev.
+
+ -- Anders Kaseorg <andersk@mit.edu>  Sun, 18 Oct 2009 14:40:37 -0400
+
 oprofile (0.9.4+cvs20090629-2.1ubuntu2) karmic; urgency=low
 
   * Rebuild using binutils-dev 2.20. LP: #426614.
diff -u oprofile-0.9.4+cvs20090629/debian/control oprofile-0.9.4+cvs20090629/debian/control
--- oprofile-0.9.4+cvs20090629/debian/control
+++ oprofile-0.9.4+cvs20090629/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: LIU Qi <liuqi82@gmail.com>
 Standards-Version: 3.8.2
-Build-Depends: debhelper (>= 7), xsltproc, docbook-xsl, docbook-xml, libqt3-mt-dev, libpopt-dev, binutils-dev (>= 2.20), zlib1g-dev, qt3-dev-tools, g++ (>>3.3.1), automake1.10, libtool, ppu-binutils [powerpc], autoconf, quilt
+Build-Depends: debhelper (>= 7), xsltproc, docbook-xsl, docbook-xml, libqt3-mt-dev, libpopt-dev, binutils-dev (>= 2.18~cvs20070812), zlib1g-dev, qt3-dev-tools, g++ (>>3.3.1), automake1.10, libtool, ppu-binutils [powerpc], quilt
 Homepage: http://oprofile.sourceforge.net
 Vcs-Browser: http://git.printk.org/?p=liuqi/debian/oprofile.git;a=summary
 Vcs-git: git://git.printk.org/liuqi/debian/oprofile.git
diff -u oprofile-0.9.4+cvs20090629/debian/patches/series oprofile-0.9.4+cvs20090629/debian/patches/series
--- oprofile-0.9.4+cvs20090629/debian/patches/series
+++ oprofile-0.9.4+cvs20090629/debian/patches/series
@@ -4 +3,0 @@
-unstatic_libbfd.patch
reverted:
--- oprofile-0.9.4+cvs20090629/debian/patches/unstatic_libbfd.patch
+++ oprofile-0.9.4+cvs20090629.orig/debian/patches/unstatic_libbfd.patch
@@ -1,13 +0,0 @@
-Index: oprofile-0.9.4+cvs20090629/configure.in
-===================================================================
---- oprofile-0.9.4+cvs20090629.orig/configure.in	2009-07-27 01:10:30.000000000 +0100
-+++ oprofile-0.9.4+cvs20090629/configure.in	2009-07-27 01:11:05.000000000 +0100
-@@ -147,7 +147,7 @@
- dnl finally restore the original libs setting
- LIBS="$ORIG_SAVE_LIBS"
- LIBERTY_LIBS="-liberty $DL_LIB $INTL_LIB"
--BFD_LIBS="/usr/lib/libbfd.a -lz -liberty $DL_LIB $INTL_LIB"
-+BFD_LIBS="-lbfd -lz -liberty $DL_LIB $INTL_LIB"
- POPT_LIBS="-lpopt"
- AC_SUBST(LIBERTY_LIBS)
- AC_SUBST(BFD_LIBS)