diff -u monotone-viz-1.0.1/debian/changelog monotone-viz-1.0.1/debian/changelog
--- monotone-viz-1.0.1/debian/changelog
+++ monotone-viz-1.0.1/debian/changelog
@@ -1,3 +1,12 @@
+monotone-viz (1.0.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Rename stub for g_io_channel_read_chars, to avoid name clash with
+    recent lablgtk2. Patch from Fedore by Thomas Moschny. Fix FTBFS.
+    (Closes: #527731)
+
+ -- Stefano Zacchiroli <address@hidden>  Fri, 02 Oct 2009 19:19:45 +0200
+
 monotone-viz (1.0.1-1) unstable; urgency=low
 
   [Richared Levitte]
only in patch2:
unchanged:
--- monotone-viz-1.0.1.orig/glib/ocaml-giochannel.c
+++ monotone-viz-1.0.1/glib/ocaml-giochannel.c
@@ -134,7 +134,7 @@
 #endif
 
 CAMLprim value
-ml_g_io_channel_read_chars (value c, value o_off, value o_len, value s)
+ml_mtnviz_g_io_channel_read_chars (value c, value o_off, value o_len, value s)
 {
   CAMLparam1(s);
   GError *err = NULL;
only in patch2:
unchanged:
--- monotone-viz-1.0.1.orig/glib/giochannel.ml
+++ monotone-viz-1.0.1/glib/giochannel.ml
@@ -24,7 +24,7 @@
 
 external read_chars : t -> ?off:int -> ?len:int -> string -> 
   [ `NORMAL of int | `AGAIN | `EOF]
-  = "ml_g_io_channel_read_chars"
+  = "ml_mtnviz_g_io_channel_read_chars"
 external write_chars : t -> ?bytes_written:int ref -> ?off:int -> ?len:int -> string -> 
   [ `NORMAL of int | `AGAIN]
   = "ml_g_io_channel_write_chars"
only in patch2:
unchanged:
--- monotone-viz-1.0.1.orig/glib/giochannel.mli
+++ monotone-viz-1.0.1/glib/giochannel.mli
@@ -20,7 +20,7 @@
 
 external read_chars : t -> ?off:int -> ?len:int -> string -> 
   [ `NORMAL of int | `AGAIN | `EOF]
-  = "ml_g_io_channel_read_chars"
+  = "ml_mtnviz_g_io_channel_read_chars"
 (** @raise Error .
     @raise Glib.Convert.Error .*)
 external write_chars : t -> ?bytes_written:int ref -> ?off:int -> ?len:int -> string ->