Permalink
Browse files

Merge pull request #355 from avsm/master

jenkins and minor typo fix
  • Loading branch information...
2 parents 72e2d9d + 5099b72 commit 4b1269487e62c08440b079e4b23fc83f7c00f7f7 @samoht samoht committed Jan 1, 2013
Showing with 6 additions and 1 deletion.
  1. +5 −0 jenkins/10-opam-prepare.sh
  2. +1 −1 src/core/opamSystem.ml
@@ -16,6 +16,8 @@ add liblapack-dev
add libsdl-dev
# dbm
add libgdbm-dev
+# ocamlfuse
+add libfuse-dev
# liquidsoap
add libao-dev
add portaudio19-dev
@@ -36,6 +38,9 @@ add libgavl-dev
add liblo-dev
# lablgtk2
add libgtk2.0-dev
+add libgtksourceview2.0-dev
+# oqamldebug
+add qt4-qmake
# lwt-zmq
add libzmq-dev
# postgresql-ocaml
View
@@ -385,7 +385,7 @@ let flock file =
let pid = input_line ic in
close_in ic;
OpamGlobals.msg
- "An other process (%s) has already locked %S. Retrying in 1s (%d/%d)\n"
+ "Another process (%s) has already locked %S. Retrying in 1s (%d/%d)\n"
pid file !l max_l;
Unix.sleep 1;
incr l;

0 comments on commit 4b12694

Please sign in to comment.