# 
# patch "INSTALL"
#  from [f4e6f306f6a19cf698f77b8ac43c8db16af19c4c]
#    to [69045e80305c3f573fb46cc5d70d402a880fd8b4]
# 
# patch "Makefile"
#  from [dbce3abd1fc0773566cbef48b2c50916080c02b3]
#    to [d406a10c5a4add07e2a63a3926e1f8ec5134c2df]
# 
# patch "NEWS"
#  from [3602e8bd4779572b71e1b69ed41097bfcfadacda]
#    to [73a074dc589888de3b5babf9539d348734324170]
# 
# patch "README"
#  from [18d17ed5745ddbe7b13cedd87304dd32a7126bbf]
#    to [40ba304e86f84a94b1db283e0e3dbcee94f42ac5]
# 
# patch "configure.ac"
#  from [c9959c1310ab37ecba84edab107f49b9d742711c]
#    to [491d04e192e312e6100f0c893e24da956c316e76]
# 
--- INSTALL
+++ INSTALL
@@ -20,34 +20,40 @@
 
 * LablGTK
 LablGTK is a GTK+ bindings for ocaml [2]. It is packaged for some
-Linux distributions, but make sure you have *at least* version 2.4.0. 
-The latest version is lablgtk2-20050218.
+Linux distributions, but make sure you have *at least* version 2.4.0.
+The latest version is lablgtk2-20050613. If you're compiling LablGTK
+from source, make sure it is built with libgnomecanvas support:
 
   $ ./configure --with-gnomecanvas
   $ make world
   $ make install
 
 
-* Monotone 
-You need the compiled monotone sources, for monotone-viz statically
-links the sqlite library embedded in monotone.  So, in the
-monotone-viz directory, create a link named monotone :
+* Sqlite
+If monotone was built with the --without-bundled-sqlite configure
+option, it uses a shared sqlite library and you simply need to run:
+
+  $ ./configure --with-shared-sqlite
+
+Otherwise, the sqlite library is statically linked with the monotone
+binary and you'll need the compiled monotone sources.  In the
+monotone-viz directory, create a link named monotone and run configure:
   
   $ ln -s /path/to/monotone-tree monotone
+  $ ./configure
 
 
 * Monotone-viz
-Compiling monotone-viz should now be as simple as :
+Compiling monotone-viz should now be as simple as:
 
-  $ ./configure
   $ make
 
 
 * Installing & cleaning
-There is no `install' target for the Makefile : monotone-viz is a
+There is no `install' target for the Makefile: monotone-viz is a
 single executable, just copy it somewhere in your PATH. 
 Also the ocaml compiler statically links everything caml-related so
-you can delete your ocaml installation if you so wish :
+you can delete your ocaml installation if you wish:
 
   $ rm -Rf /opt/ocaml
 
--- Makefile
+++ Makefile
@@ -42,8 +42,8 @@
           dot_types.mli dot_lexer.mll dot_parser.mly \
           subprocess.ml subprocess.mli icon.ml status.ml ui.ml \
           revision_types.mli revision_lexer.mll revision_parser.mly \
-          database.ml database.mli agraph.ml agraph.mli \
-          unidiff.ml unidiff.mli view.ml view.mli main.ml \
+          components.ml database.ml database.mli agraph.ml agraph.mli \
+          unidiff.ml unidiff.mli gnomecanvas_hack.c view.ml view.mli main.ml \
           mlsqlite/sqlite3.ml mlsqlite/sqlite3.mli mlsqlite/ocaml-sqlite3.c \
           ocamlnet-0.97.1/base64.ml ocamlnet-0.97.1/base64.mli ocamlnet-0.97.1/LICENSE \
           extlib-1.3/IO.ml extlib-1.3/IO.mli extlib-1.3/unzip.ml extlib-1.3/unzip.mli \
--- NEWS
+++ NEWS
@@ -1,3 +1,13 @@
+0.10:
+- try to reconnect disconnected parts of the graph (by adding grey edges)
+- libgnomecanvas hack to speed up drawing
+- somehow display the output of monotone diff, even if it is not valid UTF-8
+- middle clicking on the graph with a (prefix) of an id selected will
+  center the view on this id
+- support builds with a shared sqlite library
+  (--with-shared-sqlite option to configure)
+
+
 0.9:
 - the application window has an icon !
 - the layout is a bit more compact
--- README
+++ README
@@ -15,7 +15,7 @@
 To compile from sources, you'll also need:
 - a compiled monotone source tree
 - ocaml compiler (>= 3.07)
-- LablGTK 2.4.0 or lablgtk-20041119 or lablgtk-20050218
+- LablGTK 2.4.0 or a more recent snapshot
 - libcrypto, from the openssl toolkit
 
 
--- configure.ac
+++ configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(monotone-viz, 0.9)
+AC_INIT(monotone-viz, 0.10)
 
 AC_PROG_OCAML
 AC_PROG_OCAML_TOOLS
@@ -11,7 +11,7 @@
 
 # Check LablGTK
 AC_ARG_WITH([lablgtk-dir], 
-	    AS_HELP_STRING([--with-lablgtk-dir],
+	    AS_HELP_STRING([--with-lablgtk-dir=],
 			   [specify location of lablgtk library]),
 	    LABLGTK_DIR=$withval)
 AC_CHECK_OCAML_MODULE(lablgtk, LABLGTK_DIR, GFile, +lablgtk2 +lablgtk)
@@ -20,7 +20,7 @@
   AC_MSG_ERROR([
 
 Could not find LablGTK. Make sure LablGTK >= 2.4.0 is installed and
-specify its location to configure with the `--with-lablgtk-dir'
+specify its location to configure with the `--with-lablgtk-dir='
 option.])
 fi
 LABLGTK_DIR=$(echo $LABLGTK_DIR | sed "address@hidden@$OCAMLLIB/@")
@@ -45,12 +45,12 @@
 
 # Check the sqlite3 sources
 AC_ARG_WITH([monotone-dir], 
-	    AS_HELP_STRING([--with-monotone-dir],
+	    AS_HELP_STRING([--with-monotone-dir=],
 			   [specify location of monotone build tree]),
 	    MONOTONE_DIR=$withval,
 	    MONOTONE_DIR=monotone)
 AC_ARG_WITH([shared-sqlite],
-            AS_HELP_STRING([--with-shared-sqlite],
+            AS_HELP_STRING([--with-shared-sqlite=],
 	                   [use a system-wide shared sqlite library]),
             SHARED_SQLITE=$withval,
             SHARED_SQLITE=no)
@@ -65,11 +65,11 @@
 
 Could not find compiled sqlite sources. Monotone-viz needs a compiled
 monotone tree for the sqlite library. Create a link named `monotone'
-or specify the location to configure using the `--with-monotone-dir'
+or specify the location to configure using the `--with-monotone-dir='
 option.])
 fi
 if test "${MONOTONE_DIR:0:1}" != "/" ; then
-  MONOTONE_DIR=$PWD/$MONOTONE_DIR
+  MONOTONE_DIR=$(pwd)/$MONOTONE_DIR
 fi
 AC_SUBST(MONOTONE_DIR)