diff -u xapian-core-1.0.12/debian/rules xapian-core-1.0.12/debian/rules
--- xapian-core-1.0.12/debian/rules
+++ xapian-core-1.0.12/debian/rules
@@ -18,6 +18,8 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
 # USA
 
+include /usr/share/quilt/quilt.make
+
 # Codename we're building packages for.  If not explicitly specified, default
 # to that named in debian/codename and if that's not given, use "sid".
 CODENAME ?= $(shell cat debian/codename 2>/dev/null||echo sid)
@@ -127,7 +129,7 @@
 
 
 configure: configure-stamp
-configure-stamp: debian/control
+configure-stamp: debian/control patch
 	dh_testdir
 
 	# Use the latest config.sub and config.guess from the autotools-dev
@@ -213,7 +215,7 @@
 	dh_md5sums
 	dh_builddeb
 
-clean: debian/control
+clean: debian/control unpatch
 	dh_testdir
 	dh_testroot
 	rm -rf build
diff -u xapian-core-1.0.12/debian/control.in xapian-core-1.0.12/debian/control.in
--- xapian-core-1.0.12/debian/control.in
+++ xapian-core-1.0.12/debian/control.in
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Olly Betts <olly@survex.com>
 Standards-Version: 3.8.1
-Build-Depends: debhelper (>= 4.1.22), autotools-dev, zlib1g-dev
+Build-Depends: debhelper (>= 4.1.22), autotools-dev, zlib1g-dev, quilt
 Homepage: http://xapian.org/
 DM-Upload-Allowed: yes
 
diff -u xapian-core-1.0.12/debian/control xapian-core-1.0.12/debian/control
--- xapian-core-1.0.12/debian/control
+++ xapian-core-1.0.12/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Olly Betts <olly@survex.com>
 Standards-Version: 3.8.1
-Build-Depends: debhelper (>= 4.1.22), autotools-dev, zlib1g-dev
+Build-Depends: debhelper (>= 4.1.22), autotools-dev, zlib1g-dev, quilt
 Homepage: http://xapian.org/
 DM-Upload-Allowed: yes
 
diff -u xapian-core-1.0.12/debian/changelog xapian-core-1.0.12/debian/changelog
--- xapian-core-1.0.12/debian/changelog
+++ xapian-core-1.0.12/debian/changelog
@@ -1,3 +1,13 @@
+xapian-core (1.0.12-2ubuntu1) karmic; urgency=low
+
+  * debian/control.in, debian/rules:
+    - Use quilt
+  * debian/patches/10_ftbfs_topercent2_test.patch:
+    - Fix FTBFS by not running the topercent2 test for the multi backend.
+      LP: #374230
+
+ -- Michael Terry <michael.terry@canonical.com>  Fri, 05 Jun 2009 12:05:32 -0400
+
 xapian-core (1.0.12-2) unstable; urgency=low
 
   * debian/control.in: libxapian<SOVERSION>-dbg should be section debug not
only in patch2:
unchanged:
--- xapian-core-1.0.12.orig/debian/patches/series
+++ xapian-core-1.0.12/debian/patches/series
@@ -0,0 +1 @@
+10_ftbfs_topercent2_test.patch
only in patch2:
unchanged:
--- xapian-core-1.0.12.orig/debian/patches/10_ftbfs_topercent2_test.patch
+++ xapian-core-1.0.12/debian/patches/10_ftbfs_topercent2_test.patch
@@ -0,0 +1,13 @@
+Index: xapian-core-1.0.12/tests/api_anydb.cc
+===================================================================
+--- xapian-core-1.0.12.orig/tests/api_anydb.cc	2009-06-05 12:00:19.000000000 -0400
++++ xapian-core-1.0.12/tests/api_anydb.cc	2009-06-05 12:01:02.000000000 -0400
+@@ -493,6 +493,8 @@
+ 
+ // tests the percentage values returned
+ DEFINE_TESTCASE(topercent2, backend) {
++    SKIP_TEST_FOR_BACKEND("multi");
++
+     BackendManagerLocal local_manager;
+     local_manager.set_datadir(test_driver::get_srcdir() + "/testdata/");
+     Xapian::Enquire localenq(local_manager.get_database("apitest_simpledata"));