diff -u buffy-1.2.1/debian/changelog buffy-1.2.1/debian/changelog
--- buffy-1.2.1/debian/changelog
+++ buffy-1.2.1/debian/changelog
@@ -1,3 +1,11 @@
+buffy (1.2.1-1ubuntu1) oneiric; urgency=low
+
+  * Backport relevant hunks from 1a98b431 and 55a575a4 from upstream git
+    to fix FTBFS. For the former changeset, also apply to Makefile.in.
+    (LP: #749201) (Closes: #629882)
+
+ -- Daniel T Chen <crimsun@ubuntu.com>  Thu, 22 Sep 2011 19:09:55 -0400
+
 buffy (1.2.1-1) unstable; urgency=low
 
   * New upstream version
diff -u buffy-1.2.1/debian/control buffy-1.2.1/debian/control
--- buffy-1.2.1/debian/control
+++ buffy-1.2.1/debian/control
@@ -1,7 +1,8 @@
 Source: buffy
 Section: mail
 Priority: optional
-Maintainer: Enrico Zini <enrico@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Enrico Zini <enrico@debian.org>
 Uploaders: martin f krafft <madduck@debian.org>
 Build-Depends: cdbs, debhelper (>= 7), dh-buildinfo, pkg-config, libgtkmm-2.4-dev, libbuffy-dev (>= 1.4), libbuffy-dev (<< 2.0), libwibble-dev (>= 0.1.15), libwibble-dev (<< 0.2)
 Standards-Version: 3.8.4.0
only in patch2:
unchanged:
--- buffy-1.2.1.orig/Makefile.in
+++ buffy-1.2.1/Makefile.in
@@ -806,7 +806,7 @@
 
 
 buffy.1: src/buffy
-	$< --manpage > $@
+	$< --manpage="" > $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
only in patch2:
unchanged:
--- buffy-1.2.1.orig/Makefile.am
+++ buffy-1.2.1/Makefile.am
@@ -3,7 +3,7 @@
 SUBDIRS = src
 
 buffy.1: src/buffy
-	$< --manpage > $@
+	$< --manpage="" > $@
 
 man_MANS = buffy.1
 
only in patch2:
unchanged:
--- buffy-1.2.1.orig/src/PrefDialog.cc
+++ buffy-1.2.1/src/PrefDialog.cc
@@ -105,7 +105,11 @@
 	line = Gtk::manage(new Gtk::HBox());
 	diavbox->pack_start(*line, false, false);
 	line->pack_start(*manage(new Gtk::Label("Mail editor:")), true, true);
-	line->pack_start(*manage(editorSelection = new Gtk::ComboBox(editorListModel)), false, false);
+
+    // work around something that I don't know if I should classify as a gtk--
+    // bug or as excessive gcc strictness
+    Glib::RefPtr<Gtk::TreeModel> tmp(editorListModel);
+	line->pack_start(*manage(editorSelection = new Gtk::ComboBox(tmp)), false, false);
 	Gtk::Button* confButton;
 	line->pack_start(*manage(confButton = new Gtk::Button("Configure")), false, false);
 	confButton->signal_clicked().connect(sigc::mem_fun(*this, &PrefDialog::on_configure_mail_programs));
only in patch2:
unchanged:
--- buffy-1.2.1.orig/debian/patches/lp749201.diff
+++ buffy-1.2.1/debian/patches/lp749201.diff
@@ -0,0 +1,25 @@
+From: Enrico Zini <enrico@enricozini.org>
+Date: Sat, 30 Jul 2011 01:02:52 +0000 (+0200)
+Subject: Compiles with newer GCC. Closes: #629882
+X-Git-Url: http://anonscm.debian.org/gitweb/?p=buffy%2Fbuffy.git;a=commitdiff_plain;h=55a575a42ee3601a60bf250fcf91d2530c39357a
+
+Compiles with newer GCC. Closes: #629882
+---
+
+diff --git a/src/PrefDialog.cc b/src/PrefDialog.cc
+index 4403368..1955caf 100644
+--- a/src/PrefDialog.cc
++++ b/src/PrefDialog.cc
+@@ -105,7 +105,11 @@ PrefDialog::PrefDialog(Gtk::Window& parent)
+ 	line = Gtk::manage(new Gtk::HBox());
+ 	diavbox->pack_start(*line, false, false);
+ 	line->pack_start(*manage(new Gtk::Label("Mail editor:")), true, true);
+-	line->pack_start(*manage(editorSelection = new Gtk::ComboBox(editorListModel)), false, false);
++
++    // work around something that I don't know if I should classify as a gtk--
++    // bug or as excessive gcc strictness
++    Glib::RefPtr<Gtk::TreeModel> tmp(editorListModel);
++	line->pack_start(*manage(editorSelection = new Gtk::ComboBox(tmp)), false, false);
+ 	Gtk::Button* confButton;
+ 	line->pack_start(*manage(confButton = new Gtk::Button("Configure")), false, false);
+ 	confButton->signal_clicked().connect(sigc::mem_fun(*this, &PrefDialog::on_configure_mail_programs));
only in patch2:
unchanged:
--- buffy-1.2.1.orig/debian/patches/ftbfs.diff
+++ buffy-1.2.1/debian/patches/ftbfs.diff
@@ -0,0 +1,21 @@
+From: Enrico Zini <enrico@enricozini.org>
+Date: Wed, 23 Mar 2011 14:12:37 +0000 (+0000)
+Subject: Changed manpage creation to work with wibble's stricter command line option checking
+X-Git-Url: http://anonscm.debian.org/gitweb/?p=buffy%2Fbuffy.git;a=commitdiff_plain;h=1a98b43127ab0966e2bc5f062efd77935eb8f455
+
+Changed manpage creation to work with wibble's stricter command line option checking
+---
+
+diff --git a/Makefile.am b/Makefile.am
+index 4e1528a..4dc7685 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,7 +3,7 @@
+ SUBDIRS = src
+ 
+ buffy.1: src/buffy
+-	$< --manpage > $@
++	$< --manpage="" > $@
+ 
+ man_MANS = buffy.1
+