Merge pull request ocaml#11448 from nberth/master

camllib: comply with safe strings
pveber · Feb 21, 2018 · 1fcee8c · 1fcee8c
2 parents 18b3217 + 7f4258a
commit 1fcee8c
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 3 deletions.
diff --git a/packages/camllib/camllib.1.3.0/opam b/packages/camllib/camllib.1.3.0/opam
@@ -2,6 +2,9 @@ opam-version: "1.2"
 maintainer: "Nicolas Berthier <m@nberth.space>"
 authors: ["Bertrand Jeannet"]
 homepage: "https://www.inrialpes.fr/pop-art/people/bjeannet/bjeannet-forge/camllib/index.html"
+bug-reports: "https://gforge.inria.fr/projects/bjeannet/"
+# SVN repositories not supported (yet).
+# dev-repo: "svn://scm.gforge.inria.fr/svnroot/bjeannet/pkg/camllib/branches/opam-packaging"
 license: "LGPL-2.1"
 build: [
   ["cp" "Makefile.config.opam" "Makefile.config"]
@@ -14,7 +17,7 @@ remove: [
   ["ocamlfind" "remove" "camllib"]
 ]
 depends: [
-  "ocamlfind"
+  "ocamlfind"  {build}
   "ocamlbuild" {build}
 ]
 available: [ ocaml-version >= "4.00.0" & ocaml-version < "4.03.0" ]
diff --git a/packages/camllib/camllib.1.3.1/opam b/packages/camllib/camllib.1.3.1/opam
@@ -2,6 +2,9 @@ opam-version: "1.2"
 maintainer: "Nicolas Berthier <m@nberth.space>"
 authors: ["Bertrand Jeannet"]
 homepage: "https://www.inrialpes.fr/pop-art/people/bjeannet/bjeannet-forge/camllib/index.html"
+bug-reports: "https://gforge.inria.fr/projects/bjeannet/"
+# SVN repositories not supported (yet).
+# dev-repo: "svn://scm.gforge.inria.fr/svnroot/bjeannet/pkg/camllib/branches/opam-packaging"
 license: "LGPL-2.1"
 build: [
   ["cp" "Makefile.config.opam" "Makefile.config"]
@@ -14,7 +17,7 @@ remove: [
   ["ocamlfind" "remove" "camllib"]
 ]
 depends: [
-  "ocamlfind"
+  "ocamlfind"  {build}
   "ocamlbuild" {build}
 ]
-available: [ ocaml-version >= "4.02.0" ]
+available: [ ocaml-version >= "4.02.0" & ocaml-version < "4.06" ]
diff --git a/packages/camllib/camllib.1.3.2/descr b/packages/camllib/camllib.1.3.2/descr
@@ -0,0 +1 @@
+Utility Library (including various datatypes)
diff --git a/packages/camllib/camllib.1.3.2/opam b/packages/camllib/camllib.1.3.2/opam
@@ -0,0 +1,22 @@
+opam-version: "1.2"
+maintainer: "Nicolas Berthier <m@nberth.space>"
+authors: ["Bertrand Jeannet"]
+homepage: "https://www.inrialpes.fr/pop-art/people/bjeannet/bjeannet-forge/camllib/index.html"
+# SVN repositories not supported (yet).
+# dev-repo: "svn://scm.gforge.inria.fr/svnroot/bjeannet/pkg/camllib/branches/opam-packaging"
+license: "LGPL-2.1"
+build: [
+  ["cp" "Makefile.config.opam" "Makefile.config"]
+  [make]
+]
+install: [
+  [make "install"]
+]
+remove: [
+  ["ocamlfind" "remove" "camllib"]
+]
+depends: [
+  "ocamlfind"  {build}
+  "ocamlbuild" {build}
+]
+available: [ ocaml-version >= "4.02.0" ]
diff --git a/packages/camllib/camllib.1.3.2/url b/packages/camllib/camllib.1.3.2/url
@@ -0,0 +1,2 @@
+archive: "http://nberth.space/pool/camllib/camllib-1.3.2.tar.gz"
+checksum: "34cd32aa3f0523c0278f58b7f9496253"