Merge pull request #12014 from zapashcanon/master

oasis2debian 0.1.5 and fix urls
ocaml · May 31, 2018 · aba9509 · aba9509
2 parents 06460e6 + d888ece
commit aba9509
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 13 deletions.
diff --git a/packages/oasis2debian/oasis2debian.0.1.3/opam b/packages/oasis2debian/oasis2debian.0.1.3/opam
@@ -4,9 +4,9 @@ version: "0.1.3"
 maintainer: "Sylvain Le Gall <sylvain@le-gall.net>"
 authors: [ "Sylvain Le Gall" ]
 license: "GPL-3.0"
-homepage: "http://oasis.forge.ocamlcore.org/oasis2debian"
+homepage: "http://oasis.forge.ocamlcore.org/oasis2debian.html"
 dev-repo: "git://github.com/ocaml/oasis2debian.git"
-bug-reports: "http://oasis.forge.ocamlcore.org/oasis2debian"
+bug-reports: "https://github.com/ocaml/oasis2debian/issues"
 build: [
   ["oasis" "setup"]
   ["ocaml" "setup.ml" "-configure" "--prefix" prefix]
@@ -17,14 +17,7 @@ remove: [
   ["ocaml" "%{etc}%/oasis2debian/setup.ml" "-C" "%{etc}%/oasis2debian"
     "-uninstall"]
 ]
-build-test: [
-  ["oasis" "setup"]
-  ["ocaml" "setup.ml" "-configure" "--enable-tests"]
-  ["ocaml" "setup.ml" "-build"]
-  ["ocaml" "setup.ml" "-test"]
-]
 depends: [
-  "base-unix" {test}
   "calendar" {build}
   "debian-formats" {build & >= "0.0.1"}
   "fileutils" {build & >= "0.4.2"}
@@ -33,8 +26,6 @@ depends: [
   "ocaml-xdg-basedir" {build & >= "0.0.1"}
   "ocamlbuild" {build}
   "ocamlfind" {build}
-  "ocamlmod" {test}
-  "ounit" {test & >= "2.0.0"}
   "pcre" {build}
   "xstrp4" {build & >= "1.8"}
 ]

diff --git a/packages/oasis2debian/oasis2debian.0.1.4/opam b/packages/oasis2debian/oasis2debian.0.1.4/opam
@@ -3,9 +3,9 @@ name: "oasis2debian"
 maintainer: "Sylvain Le Gall <sylvain@le-gall.net>"
 authors: [ "Sylvain Le Gall" ]
 license: "GPL-3.0"
-homepage: "http://oasis.forge.ocamlcore.org/oasis2debian"
+homepage: "http://oasis.forge.ocamlcore.org/oasis2debian.html"
 dev-repo: "git://github.com/ocaml/oasis2debian.git"
-bug-reports: "http://oasis.forge.ocamlcore.org/oasis2debian"
+bug-reports: "https://github.com/ocaml/oasis2debian/issues"
 build: [
   ["oasis" "setup"]
   ["ocaml" "setup.ml" "-configure" "--prefix" prefix]

diff --git a/packages/oasis2debian/oasis2debian.0.1.5/descr b/packages/oasis2debian/oasis2debian.0.1.5/descr
@@ -0,0 +1,7 @@
+Create and maintain Debian package for an OASIS package
+
+This program is a helper to translate _oasis file into a debian/
+directory that is suitable to create a Debian package.
+
+When the _oasis file is lacking some information, a prompt is
+displayed to gather more data.
diff --git a/packages/oasis2debian/oasis2debian.0.1.5/files/oasis.install b/packages/oasis2debian/oasis2debian.0.1.5/files/oasis.install
@@ -0,0 +1,5 @@
+etc: [
+  "setup.ml"
+  "setup.data"
+  "setup.log"
+]
diff --git a/packages/oasis2debian/oasis2debian.0.1.5/opam b/packages/oasis2debian/oasis2debian.0.1.5/opam
@@ -0,0 +1,42 @@
+opam-version: "1.2"
+name: "oasis2debian"
+maintainer: "Sylvain Le Gall <sylvain@le-gall.net>"
+authors: [ "Sylvain Le Gall" ]
+license: "GPL-3.0"
+homepage: "http://oasis.forge.ocamlcore.org/oasis2debian.html"
+dev-repo: "git://github.com/ocaml/oasis2debian.git"
+bug-reports: "https://github.com/ocaml/oasis2debian/issues"
+build: [
+  ["oasis" "setup"]
+  ["ocaml" "setup.ml" "-configure" "--prefix" prefix]
+  ["ocaml" "setup.ml" "-build"]
+]
+install: ["ocaml" "setup.ml" "-install"]
+remove: [
+  ["ocaml" "%{etc}%/oasis2debian/setup.ml" "-C" "%{etc}%/oasis2debian"
+    "-uninstall"]
+]
+# TODO: reactivate when we can skip the package building part of it that fails
+# on Travis.
+#build-test: [
+#  ["oasis" "setup"]
+#  ["ocaml" "setup.ml" "-configure" "--enable-tests"]
+#  ["ocaml" "setup.ml" "-build"]
+#  ["ocaml" "setup.ml" "-test"]
+#]
+depends: [
+  "base-unix" {test}
+  "calendar" {build}
+  "debian-formats" {build & >= "0.0.1"}
+  "fileutils" {build & >= "0.4.2"}
+  "oasis" {build & >= "0.4.7"}
+  "ocaml-inifiles" {build & >= "1.2"}
+  "ocaml-xdg-basedir" {build & >= "0.0.1"}
+  "ocamlbuild" {build}
+  "ocamlfind" {build}
+  "ocamlmod" {test}
+  "ounit" {test & >= "2.0.0"}
+  "pcre" {build}
+  "base-bytes" {build}
+]
+available: [ ocaml-version >= "3.12.1" ]
diff --git a/packages/oasis2debian/oasis2debian.0.1.5/url b/packages/oasis2debian/oasis2debian.0.1.5/url
@@ -0,0 +1,2 @@
+archive: "https://forge.ocamlcore.org/frs/download.php/1760/oasis2debian-0.1.5.tar.gz"
+checksum: "4db8cb503728ef54d596b12738479e0f"
diff --git a/packages/xstrp4/xstrp4.1.8/opam b/packages/xstrp4/xstrp4.1.8/opam
@@ -8,3 +8,4 @@ remove: [["ocamlfind" "remove" "xstrp4"]]
 patches: ["version.patch"]
 depends: ["ocamlfind" "camlp4"]
 install: [make "install"]
+available: [ocaml-version < "4.06.0"]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		archive: "https://forge.ocamlcore.org/frs/download.php/1760/oasis2debian-0.1.5.tar.gz"
		checksum: "4db8cb503728ef54d596b12738479e0f"