diff -u devhelp-0.19/debian/rules devhelp-0.19/debian/rules
--- devhelp-0.19/debian/rules
+++ devhelp-0.19/debian/rules
@@ -1,5 +1,10 @@
 #!/usr/bin/make -f
 
+# workaround cdbs wrongly unapplying patches before cleaning up
+# This needs to be set before cdbs is included
+clean::
+	[ ! -f Makefile ] || $(MAKE) distclean
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/class/gnome.mk
diff -u devhelp-0.19/debian/changelog devhelp-0.19/debian/changelog
--- devhelp-0.19/debian/changelog
+++ devhelp-0.19/debian/changelog
@@ -1,3 +1,13 @@
+devhelp (0.19-1ubuntu4) intrepid; urgency=low
+
+  * fix FTBFS in g_set_error() (LP: #238991)
+    - add debian/patches/06_fix_ftbfs_in_g_set_error.patch
+  * workaround cdbs unapplying patches before invoking clean
+    which is causing a loop because of the xul1.9 patch
+    - update debian/rules
+
+ -- Fabien Tassin <fta@sofaraway.org>  Tue, 10 Jun 2008 21:49:55 +0200
+
 devhelp (0.19-1ubuntu3) intrepid; urgency=low
 
   * respin and bump (build-)depends to fix breakage due to xulrunner 1.9 RC1
only in patch2:
unchanged:
--- devhelp-0.19.orig/debian/patches/06_fix_ftbfs_in_g_set_error.patch
+++ devhelp-0.19/debian/patches/06_fix_ftbfs_in_g_set_error.patch
@@ -0,0 +1,26 @@
+---
+ src/dh-parser.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: devhelp-0.19/src/dh-parser.c
+===================================================================
+--- devhelp-0.19.orig/src/dh-parser.c
++++ devhelp-0.19/src/dh-parser.c
+@@ -552,16 +552,17 @@
+ 	file = gzopen (path, "r");
+ 
+ 	if (!file) {
+ 		g_markup_parse_context_free (parser->context);
+ 		g_free (parser);
+ 		g_set_error (error,
+ 			     DH_ERROR,
+ 			     DH_ERROR_FILE_NOT_FOUND,
++			     "%s",
+ 			     g_strerror (errno));
+ 		return FALSE;
+ 	}
+ 
+ 	while (TRUE) {
+ 		gsize bytes_read;
+ 
+ 		bytes_read = gzread (file, buf, BYTES_PER_READ);