diff -Nru kdesvn-1.5.4/debian/changelog kdesvn-1.5.4/debian/changelog
--- kdesvn-1.5.4/debian/changelog	2010-09-05 07:19:39.000000000 +0200
+++ kdesvn-1.5.4/debian/changelog	2010-11-03 17:37:42.000000000 +0100
@@ -1,3 +1,10 @@
+kdesvn (1.5.4-2ubuntu1) natty; urgency=low
+
+  * Merge with Debian Unstable
+	- Keep the docbook FTBFS patch
+
+ -- Kristóf Kiszel <ulysses@kubuntu.org>  Wed, 03 Nov 2010 17:34:39 +0100
+
 kdesvn (1.5.4-2) unstable; urgency=low

   * debian/control
diff -Nru kdesvn-1.5.4/debian/patches/doctype_version.patch kdesvn-1.5.4/debian/patches/doctype_version.patch
--- kdesvn-1.5.4/debian/patches/doctype_version.patch	1970-01-01 01:00:00.000000000 +0100
+++ kdesvn-1.5.4/debian/patches/doctype_version.patch	2010-11-03 17:34:34.000000000 +0100
@@ -0,0 +1,11 @@
+Index: kdesvn-1.5.3/doc/nl/index.docbook
+===================================================================
+--- kdesvn-1.5.3.orig/doc/nl/index.docbook	2010-08-09 19:00:17.000000000 +0200
++++ kdesvn-1.5.3/doc/nl/index.docbook	2010-08-09 19:00:26.000000000 +0200
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+   <!ENTITY kdesvn "<application>kdesvn</application>">
+   <!ENTITY kappname "&kdesvn;"><!-- Do *not* replace kappname-->
+   <!ENTITY package "kde-module"><!-- kdebase, kdeadmin, etc -->
diff -Nru kdesvn-1.5.4/debian/patches/series kdesvn-1.5.4/debian/patches/series
--- kdesvn-1.5.4/debian/patches/series	2009-02-19 15:26:39.000000000 +0100
+++ kdesvn-1.5.4/debian/patches/series	2010-11-03 17:34:34.000000000 +0100
@@ -1 +1,2 @@
 # Patches for kdesvn
+doctype_version.patch