From 71d10fa0d6bfbf3f42b1268bdeff6b81bb98d9fe Mon Sep 17 00:00:00 2001
From: Vasilis Papavasileiou <vasilis+git@besport.com>
Date: Mon, 12 Feb 2018 15:48:06 +0100
Subject: [PATCH] Tighten Ocsigen Start & Toolkit version constraints

Also drop problematic npm external dependency.
---
 packages/ocsigen-start/ocsigen-start.1.0.0/opam     | 5 ++---
 packages/ocsigen-toolkit/ocsigen-toolkit.0.99/opam  | 2 +-
 packages/ocsigen-toolkit/ocsigen-toolkit.1.0.0/opam | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/ocsigen-start/ocsigen-start.1.0.0/opam b/packages/ocsigen-start/ocsigen-start.1.0.0/opam
index 5754bd2cb49..14505f36a45 100644
--- a/packages/ocsigen-start/ocsigen-start.1.0.0/opam
+++ b/packages/ocsigen-start/ocsigen-start.1.0.0/opam
@@ -12,15 +12,14 @@ depends: [
   "macaque" {>= "0.7.4"}
   "safepass"
   "ocsigen-i18n" {>= "3.1.0"}
-  "eliom" {>= "6.2"}
-  "ocsigen-toolkit" {>= "0.99"}
+  "eliom" {= "6.2.0"}
+  "ocsigen-toolkit" {>= "0.99" & <= "1.0.0"}
   "yojson"
 ]
 depexts: [
   [["debian"] ["imagemagick"]]
   [["debian"] ["ruby-sass"]]
   [["debian"] ["postgresql"]]
-  [["debian"] ["npm"]]
   [["ubuntu"] ["imagemagick"]]
   [["ubuntu"] ["ruby-sass"]]
   [["ubuntu"] ["postgresql"]]
diff --git a/packages/ocsigen-toolkit/ocsigen-toolkit.0.99/opam b/packages/ocsigen-toolkit/ocsigen-toolkit.0.99/opam
index 0c4f397da0b..bd9a4113c17 100644
--- a/packages/ocsigen-toolkit/ocsigen-toolkit.0.99/opam
+++ b/packages/ocsigen-toolkit/ocsigen-toolkit.0.99/opam
@@ -8,7 +8,7 @@ build: [ make ]
 install: [ make "install" ]
 remove: [ make "uninstall" ]
 depends: [
-  "eliom" {>= "6.0"}
+  "eliom" {>= "6.0.0" & <= "6.2.0"}
   "calendar"
 ]
 available: [ ocaml-version >= "4.02" ]
diff --git a/packages/ocsigen-toolkit/ocsigen-toolkit.1.0.0/opam b/packages/ocsigen-toolkit/ocsigen-toolkit.1.0.0/opam
index 0c4f397da0b..bd9a4113c17 100644
--- a/packages/ocsigen-toolkit/ocsigen-toolkit.1.0.0/opam
+++ b/packages/ocsigen-toolkit/ocsigen-toolkit.1.0.0/opam
@@ -8,7 +8,7 @@ build: [ make ]
 install: [ make "install" ]
 remove: [ make "uninstall" ]
 depends: [
-  "eliom" {>= "6.0"}
+  "eliom" {>= "6.0.0" & <= "6.2.0"}
   "calendar"
 ]
 available: [ ocaml-version >= "4.02" ]