diff -Nru xfpt-0.07/debian/changelog xfpt-0.08/debian/changelog
--- xfpt-0.07/debian/changelog	2010-11-15 09:51:56.000000000 +0000
+++ xfpt-0.08/debian/changelog	2010-11-14 17:34:35.000000000 +0000
@@ -1,3 +1,11 @@
+xfpt (0.08-1) unstable; urgency=low
+
+  * New upstream version.
+  * Convert to v3 format, drop quilt build-dep.
+  * Register manual with doc-base.
+
+ -- Andreas Metzler <ametzler@debian.org>  Sun, 14 Nov 2010 18:22:25 +0100
+
 xfpt (0.07-1) unstable; urgency=low
 
   * New upstream version.
diff -Nru xfpt-0.07/debian/control xfpt-0.08/debian/control
--- xfpt-0.07/debian/control	2010-11-15 09:51:56.000000000 +0000
+++ xfpt-0.08/debian/control	2010-11-14 17:27:10.000000000 +0000
@@ -2,8 +2,8 @@
 Section: text
 Priority: extra
 Maintainer: Andreas Metzler <ametzler@debian.org>
-Build-Depends: debhelper (>= 7), autotools-dev, quilt
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7), autotools-dev
+Standards-Version: 3.9.1
 
 Package: xfpt
 Architecture: any
diff -Nru xfpt-0.07/debian/copyright xfpt-0.08/debian/copyright
--- xfpt-0.07/debian/copyright	2010-11-15 09:51:56.000000000 +0000
+++ xfpt-0.08/debian/copyright	2010-11-14 17:22:49.000000000 +0000
@@ -9,7 +9,7 @@
 
 Copyright:
 
-/* Copyright (c) University of Cambridge, 2009 */
+/* Copyright (c) University of Cambridge, 2010 */
 /* Written by Philip Hazel. */
 
 License:
diff -Nru xfpt-0.07/debian/patches/10_destdirsupport.diff xfpt-0.08/debian/patches/10_destdirsupport.diff
--- xfpt-0.07/debian/patches/10_destdirsupport.diff	2010-11-15 09:51:56.000000000 +0000
+++ xfpt-0.08/debian/patches/10_destdirsupport.diff	2010-11-14 17:27:57.000000000 +0000
@@ -1,3 +1,6 @@
+Author: Andreas Metzler
+Description: Add support for make DESTDIR=...
+
 --- xfpt-0.06.orig/Makefile.in
 +++ xfpt-0.06/Makefile.in
 @@ -13,9 +13,10 @@
diff -Nru xfpt-0.07/debian/rules xfpt-0.08/debian/rules
--- xfpt-0.07/debian/rules	2010-11-15 09:51:56.000000000 +0000
+++ xfpt-0.08/debian/rules	2010-11-14 17:24:28.000000000 +0000
@@ -3,9 +3,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/quilt/quilt.make
-
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -18,7 +15,7 @@
 
 
 
-config.status: $(QUILT_STAMPFN) configure
+config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
@@ -42,7 +39,7 @@
 
 	touch $@
 
-clean:	unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
diff -Nru xfpt-0.07/debian/source/format xfpt-0.08/debian/source/format
--- xfpt-0.07/debian/source/format	1970-01-01 00:00:00.000000000 +0000
+++ xfpt-0.08/debian/source/format	2010-11-15 09:51:57.000000000 +0000
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru xfpt-0.07/debian/xfpt.doc-base xfpt-0.08/debian/xfpt.doc-base
--- xfpt-0.07/debian/xfpt.doc-base	1970-01-01 00:00:00.000000000 +0000
+++ xfpt-0.08/debian/xfpt.doc-base	2010-11-14 17:36:14.000000000 +0000
@@ -0,0 +1,12 @@
+Document: xfpt
+Title: xfpt manual
+Author: Philip Hazel
+Abstract: The xfpt plain text to XML processor
+Section: Text
+
+Format: PDF
+Files: /usr/share/doc/xfpt/xfpt.pdf*
+
+Format: HTML
+Index: /usr/share/doc/xfpt/xfpt.html
+Files: /usr/share/doc/xfpt/*.html
diff -Nru xfpt-0.07/share/stdmacs xfpt-0.08/share/stdmacs
--- xfpt-0.07/share/stdmacs	2009-07-24 15:28:45.000000000 +0000
+++ xfpt-0.08/share/stdmacs	2010-06-08 14:25:57.000000000 +0000
@@ -422,7 +422,7 @@
 .literal layout
 &<mediaobject>&&<imageobject>&
 &<imagedata fileref="$1" $=2+ scale="$2"+$=3+ align="$3"+&&&
-  $=4+ depth="$4"+$=5+ width="$5"+>&
+  $=4+ depth="$4"+$=5+ width="$5"+>&&&&
 &</imagedata>&&</imageobject>&&</mediaobject>&
 .literal off
 .endmacro
diff -Nru xfpt-0.07/src/globals.c xfpt-0.08/src/globals.c
--- xfpt-0.07/src/globals.c	2009-07-24 15:28:45.000000000 +0000
+++ xfpt-0.08/src/globals.c	2010-06-08 14:25:57.000000000 +0000
@@ -2,7 +2,7 @@
 *     xfpt - Simple ASCII->Docbook processor     *
 *************************************************/
 
-/* Copyright (c) University of Cambridge, 2009 */
+/* Copyright (c) University of Cambridge, 2010 */
 /* Written by Philip Hazel. */
 
 /* Allocate storage and initialize global variables */
@@ -11,7 +11,7 @@
 
 
 uschar    *xfpt_share                = US DATADIR;
-uschar    *xfpt_version              = US "0.07 22-July-2009";
+uschar    *xfpt_version              = US "0.08 08-June-2010";
 
 tree_node *entities                  = NULL;
 
diff -Nru xfpt-0.07/src/read.c xfpt-0.08/src/read.c
--- xfpt-0.07/src/read.c	2009-07-24 15:28:45.000000000 +0000
+++ xfpt-0.08/src/read.c	2010-06-08 14:25:57.000000000 +0000
@@ -2,7 +2,7 @@
 *     xfpt - Simple ASCII->Docbook processor     *
 *************************************************/
 
-/* Copyright (c) University of Cambridge, 2008 */
+/* Copyright (c) University of Cambridge, 2010 */
 /* Written by Philip Hazel. */
 
 /* This module contains code for reading the input. */
@@ -224,7 +224,10 @@
   }
 
 /* Get the next line from the current macro or the current file. We need a loop
-for handling the ends of macros and files. */
+for handling the ends of macros and files. First check for having previously
+reached the end of the input. */
+
+if (from_type_ptr < 0) return NULL;
 
 for (;;)
   {
@@ -249,7 +252,6 @@
 
   else
     {
-    if (istack == NULL) return NULL;
     if (Ufgets(inbuffer, INBUFFSIZE, istack->file) == NULL)
       {
       istackstr *prev = istack->prev;
@@ -291,9 +293,10 @@
 
   /* We get here if the end of a macro or a file was reached. The appropriate
   chain has been popped. Back up the stack of input types before the loop
-  repeats. */
+  repeats. When we reach the end of the stack, we have reached the end of all
+  the input. */
 
-  from_type_ptr--;
+  if (--from_type_ptr < 0) return NULL;
   }
 
 return inbuffer;
diff -Nru xfpt-0.07/testing/outfiles/03 xfpt-0.08/testing/outfiles/03
--- xfpt-0.07/testing/outfiles/03	2009-07-24 15:28:45.000000000 +0000
+++ xfpt-0.08/testing/outfiles/03	2010-06-08 14:25:58.000000000 +0000
@@ -5,8 +5,7 @@
 </literallayout>
 <figure>
 <mediaobject><imageobject>
-<imagedata fileref="infiles/pic01.eps.inc" >
-</imagedata></imageobject></mediaobject>
+<imagedata fileref="infiles/pic01.eps.inc" ></imagedata></imageobject></mediaobject>
 </figure>
 </chapter>