Fix end-of-line warning with OpamVersion
Fix to make the new ocaml-re compile
Update dose patch for the new ocaml-re