The unified diff between revisions [f8cbc015..] and [2ed4efc2..] is displayed below. It can also be downloaded as a raw diff.
#
#
# patch "Makefile"
# from [7ba91e52dc268dd7d434781d8a20e42cd10ec368]
# to [9e00a714809bb52983da5f1d34790d1727a4472f]
#
# patch "NEWS"
# from [b91db41ad4c5f746f901a2ac9744b748c2270a40]
# to [e5dc9e771afb20d9d025ddd0cd85be9ec3d6dcba]
#
============================================================
--- Makefile 7ba91e52dc268dd7d434781d8a20e42cd10ec368
+++ Makefile 9e00a714809bb52983da5f1d34790d1727a4472f
@@ -4,16 +4,18 @@ EXTLIB := extlib-1.3
OCAMLNET := ocamlnet-0.97.1
EXTLIB := extlib-1.3
-VPATH = mlsqlite $(OCAMLNET) $(EXTLIB) glib crypto
-
-MLINCDIRS = -I $(OCAMLNET) -I mlsqlite -I $(EXTLIB) -I $(LABLGTK_DIR) -I glib -I crypto
+MLINCDIRS_LOCAL = -I $(OCAMLNET) -I mlsqlite -I $(EXTLIB) -I glib -I crypto
+MLINCDIRS = -I $(LABLGTK_DIR) $(MLINCDIRS_LOCAL)
GTK_CFLAGS := $(shell pkg-config gtk+-2.0 --cflags)
GNOMECANVAS_CFLAGS := $(shell pkg-config libgnomecanvas-2.0 --cflags)
-SRC = base64.ml base64.mli sqlite3.ml sqlite3.mli IO.mli IO.ml unzip.ml unzip.mli \
- gspawn.ml gspawn.mli giochannel.ml giochannel.mli viz_gmisc.ml gpattern.ml \
- crypto.ml crypto.mli \
+SRC = $(OCAMLNET)/base64.ml $(OCAMLNET)/base64.mli \
+ mlsqlite/sqlite3.ml mlsqlite/sqlite3.mli \
+ $(EXTLIB)/IO.mli $(EXTLIB)/IO.ml $(EXTLIB)/unzip.ml $(EXTLIB)/unzip.mli \
+ glib/gspawn.ml glib/gspawn.mli glib/giochannel.ml glib/giochannel.mli \
+ glib/viz_gmisc.ml glib/gpattern.ml \
+ crypto/crypto.ml crypto/crypto.mli \
viz_misc.ml viz_misc.mli viz_types.ml viz_types.mli \
q.ml q.mli \
dot_lexer.ml dot_parser.ml dot_parser.mli \
@@ -46,7 +48,8 @@ DISTSRC = Makefile configure.ac config.m
components.ml schema_lexer.mll database.ml database.mli agraph.ml agraph.mli \
unidiff.ml unidiff.mli gnomecanvas_hack.c view.ml view.mli \
query.ml query.mli app.mli app.ml main.ml \
- mlsqlite/sqlite3.ml mlsqlite/sqlite3.mli mlsqlite/ocaml-sqlite3.h mlsqlite/ocaml-sqlite3.c \
+ mlsqlite/sqlite3.ml mlsqlite/sqlite3.mli \
+ mlsqlite/config.h mlsqlite/ocaml-sqlite3.h 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 \
glib/gspawn.ml glib/gspawn.mli glib/giochannel.ml glib/giochannel.mli \
@@ -89,8 +92,8 @@ lib3rdparty.a : $(C_OBJ)
lib3rdparty.a : $(C_OBJ)
ar crs lib3rdparty.a $(LIB3RDPARTY_OBJ)
-glib/ocaml-gspawn.o : gspawn_tags.c gspawn_tags.h
-glib/ocaml-giochannel.o : giochannel_tags.c giochannel_tags.h
+glib/ocaml-gspawn.o : glib/gspawn_tags.c glib/gspawn_tags.h
+glib/ocaml-giochannel.o : glib/giochannel_tags.c glib/giochannel_tags.h
glib/ocaml-%.o : CINCDIRS = -I $(LABLGTK_DIR) -ccopt "$(GTK_CFLAGS)"
ifdef SQLITE_LIBS
mlsqlite/ocaml-sqlite3.o : CINCDIRS = -ccopt "$(SQLITE_CFLAGS)"
@@ -157,7 +160,7 @@ endif
-include .depend
.depend : $(SRC)
@echo "making deps ..."
- @$(OCAMLDEP) $(DEP_FLAGS) $(addprefix -I ,$(VPATH)) $(filter-out $(USE_P4),$^) > $@
+ @$(OCAMLDEP) $(DEP_FLAGS) $(MLINCDIRS_LOCAL) $(filter-out $(USE_P4),$^) > $@
@$(OCAMLDEP) $(DEP_FLAGS) -pp '$(CAMLP4O)' $(USE_P4) >> $@
dist : ../$(NAME)-$(VERSION).tar.gz
============================================================
--- NEWS b91db41ad4c5f746f901a2ac9744b748c2270a40
+++ NEWS e5dc9e771afb20d9d025ddd0cd85be9ec3d6dcba
@@ -1,3 +1,13 @@
+0.15:
+- adapt to newer monotone versions (new name of the program,
+ new book-keeping directory format)
+- do not display nodes that are simple propagates to another branch ;
+ add an option to allow the old behaviour
+- make sure the keyboard navigation tries to stay on the same branch
+- display the number of revisions per branch in the branch selection
+ dialog
+
+
0.14:
- support new format of monotone db (using BLOBs instead of base64 encoding)
/!\ these newer monotones (after 0.26pre2) use sqlite 3.3, if you're building