[Pkg-ocaml-maint-commits] [opam] 01/02: Port to Dose3 4.0.1

[Mehdi Dogguy]

This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository opam.

commit e137731c741e81d8886c28baab2a7ab4c35331fe
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Mon Sep 14 23:15:56 2015 +0200

    Port to Dose3 4.0.1
---
 debian/changelog                              |  8 +++
 debian/control                                |  2 +-
 debian/patches/0001-Port-to-Dose3-4.0.1.patch | 77 +++++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 4 files changed, 87 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 555af9f..9636745 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+opam (1.2.2-3) UNRELEASED; urgency=medium
+
+  * Port to Dose3 4.0.1 (Closes: #797451)
+    - Add 0001-Port-to-Dose3-4.0.1.patch
+    - Bump build-dependency on dose3 to >= 4.0.1-2~
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Mon, 14 Sep 2015 23:13:42 +0200
+
 opam (1.2.2-2) unstable; urgency=medium
 
   * Run testsuite only on native architectures: Testsuite uses ocamlopt
diff --git a/debian/control b/debian/control
index 8e06ea7..a825220 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
  ocaml-findlib (>= 1.2.4),
  dh-ocaml (>= 0.9),
  libcudf-ocaml-dev,
- libdose3-ocaml-dev (>= 3.3~),
+ libdose3-ocaml-dev (>= 4.0.1-2~),
  libre-ocaml-dev,
  libcmdliner-ocaml-dev (>= 0.9.7~),
  libextlib-ocaml-dev,
diff --git a/debian/patches/0001-Port-to-Dose3-4.0.1.patch b/debian/patches/0001-Port-to-Dose3-4.0.1.patch
new file mode 100644
index 0000000..a06733c
--- /dev/null
+++ b/debian/patches/0001-Port-to-Dose3-4.0.1.patch
@@ -0,0 +1,77 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Mon, 14 Sep 2015 23:11:00 +0200
+Subject: Port to Dose3 4.0.1
+
+---
+ src/core/opamCompiler.ml   | 2 +-
+ src/core/opamFilter.ml     | 2 +-
+ src/core/opamPackage.ml    | 2 +-
+ src/core/opamVersion.ml.in | 2 +-
+ src/solver/opamCudf.ml     | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/core/opamCompiler.ml b/src/core/opamCompiler.ml
+index 4178311..c7beb93 100644
+--- a/src/core/opamCompiler.ml
++++ b/src/core/opamCompiler.ml
+@@ -30,7 +30,7 @@ module Version = struct
+ 
+   type constr = (OpamFormula.relop * t) OpamFormula.formula
+ 
+-  let compare v1 v2 = Debian.Version.compare (to_string v1) (to_string v2)
++  let compare v1 v2 = Versioning.Debian.compare (to_string v1) (to_string v2)
+ 
+   let eval_relop relop v1 v2 = OpamFormula.check_relop relop (compare v1 v2)
+ 
+diff --git a/src/core/opamFilter.ml b/src/core/opamFilter.ml
+index 0e919e7..ebce090 100644
+--- a/src/core/opamFilter.ml
++++ b/src/core/opamFilter.ml
+@@ -203,7 +203,7 @@ let rec reduce_aux env = function
+      | FUndef, _ | _, FUndef -> FUndef
+      | e,f ->
+        FBool (OpamFormula.check_relop relop
+-                (Debian.Version.compare (value_string e) (value_string f))))
++                (Versioning.Debian.compare (value_string e) (value_string f))))
+   | FAnd (e,f) -> logop2 (&&) false (reduce env e) (reduce env f)
+   | FOr (e,f) -> logop2 (||) true (reduce env e) (reduce env f)
+   | FNot e -> logop1 not (reduce env e)
+diff --git a/src/core/opamPackage.ml b/src/core/opamPackage.ml
+index 56605bb..8390896 100644
+--- a/src/core/opamPackage.ml
++++ b/src/core/opamPackage.ml
+@@ -29,7 +29,7 @@ module Version = struct
+ 
+   let of_string x = x
+ 
+-  let compare = Debian.Version.compare
++  let compare = Versioning.Debian.compare
+ 
+   let to_json x =
+     `String (to_string x)
+diff --git a/src/core/opamVersion.ml.in b/src/core/opamVersion.ml.in
+index 3c9fc92..ead47b8 100644
+--- a/src/core/opamVersion.ml.in
++++ b/src/core/opamVersion.ml.in
+@@ -27,7 +27,7 @@ let compare v w =
+   let cut s = match OpamMisc.cut_at s '-' with
+     | Some (s,_) -> s
+     | None -> s in
+-  Debian.Version.compare (cut v) (cut w)
++  Versioning.Debian.compare (cut v) (cut w)
+ 
+ module O = struct
+   type t = string
+diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml
+index 62ea551..f790352 100644
+--- a/src/solver/opamCudf.ml
++++ b/src/solver/opamCudf.ml
+@@ -611,7 +611,7 @@ let check_cudf_version =
+           `Compat
+         | s::_ ->
+           match OpamMisc.split s ' ' with
+-          | "aspcud"::_::v::_ when Debian.Version.compare v "1.9" >= 0 ->
++          | "aspcud"::_::v::_ when Versioning.Debian.compare v "1.9" >= 0 ->
+             log "Solver is aspcud > 1.9: using latest version criteria";
+             `Latest
+           | _ ->
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d51b4a5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Port-to-Dose3-4.0.1.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/opam.git