This is an automated email from the git hooks/post-receive script. bengen pushed a commit to branch master in repository janest-core-kernel.
commit 76f7840061d77b8145949e484dc5f8252347416c Author: Hilko Bengen <ben...@debian.org> Date: Fri Dec 25 00:49:01 2015 +0100 113.00.00-1 --- debian/changelog | 5 + debian/compat | 1 + debian/control | 66 ++++++++ debian/copyright | 25 +++ debian/docs | 1 + debian/gbp.conf | 2 + debian/libcore-kernel-ocaml-dev.install.in | 15 ++ debian/libcore-kernel-ocaml.install.in | 1 + debian/patches/0001-Fix-apparent-typo.patch | 21 +++ ...-Fix-syntax-errors-in-ocamldoc-formatting.patch | 182 +++++++++++++++++++++ debian/patches/series | 2 + debian/rules | 36 ++++ debian/source/format | 1 + debian/source/local-options | 2 + debian/watch | 2 + 15 files changed, 362 insertions(+) diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..317e26d --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +janest-core-kernel (113.00.00-1) unstable; urgency=low + + * Initial release (Closes: #717760) + + -- Hilko Bengen <ben...@debian.org> Mon, 04 Jan 2016 19:39:26 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..e505bdb --- /dev/null +++ b/debian/control @@ -0,0 +1,66 @@ +Source: janest-core-kernel +Section: ocaml +Priority: optional +Maintainer: Debian OCaml Maintainers <debian-ocaml-ma...@lists.debian.org> +Uploaders: Lifeng Sun <lifong...@gmail.com>, Hilko Bengen <ben...@debian.org> +Build-Depends: + debhelper (>= 9), + dh-ocaml (>= 0.9~), + ocaml-nox (>= 4.00.1), + ocaml-findlib (>= 1.3.2), + camlp4, + camlp4-extra, + libbin-prot-camlp4-dev, + libcompare-camlp4-dev, + libcustom-printf-camlp4-dev, + libenumerate-camlp4-dev, + libfields-camlp4-dev, + libhere-camlp4-dev, + libpa-bench-camlp4-dev, + libpa-ounit-camlp4-dev, + libpa-test-camlp4-dev, + libpipebang-camlp4-dev, + libsexplib-camlp4-dev, + libtyperep-camlp4-dev, + libvariants-camlp4-dev, +Standards-Version: 3.9.6 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/janest-core-kernel.git +Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/janest-core-kernel.git +Homepage: http://janestreet.github.io/ + +Package: libcore-kernel-ocaml-dev +Architecture: any +Depends: + ${ocaml:Depends}, + ocaml-findlib, + camlp4, + ${shlibs:Depends}, + ${misc:Depends} +Provides: ${ocaml:Provides} +Description: Jane Street's standard library for OCaml - kernel + Core is an industrial-strength alternative to the OCaml standard + library. It was developed by Jane Street, which is the largest + industrial user of OCaml. + . + Core_kernel is the system-independent part of Core. It is aimed for + cases when the full Core is not available, such as in Javascript. + . + This package contains the headers and the OCaml library. + +Package: libcore-kernel-ocaml +Architecture: any +Depends: + ocaml-findlib, + ${ocaml:Depends}, + ${shlibs:Depends}, + ${misc:Depends} +Provides: ${ocaml:Provides} +Description: Jane Street's standard library for OCaml - kernel (runtime) + Core is an industrial-strength alternative to the OCaml standard + library. It was developed by Jane Street, which is the largest + industrial user of OCaml. + . + Core_kernel is the system-independent part of Core. It is aimed for + cases when the full Core is not available, such as in Javascript. + . + This package contains the shared library. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..6d0b0a5 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,25 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: core_kernel +Upstream-Contact: Jane Street Capital LLC <opensou...@janestreet.com> +Source: https://github.com/janestreet/core_kernel + +Files: * +Copyright: 2008-2015 Jane Street Capital LLC <opensou...@janestreet.com> +License: Apache-2.0 + +Files: debian/* +Copyright: Hilko Bengen <ben...@debian.org> +License: Apache-2.0 + +License: Apache-2.0 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + . + The full text of the Apache 2.0 License can be found in + `/usr/share/common-licenses/Apache-2.0'. diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..b43bf86 --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +README.md diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..cec628c --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,2 @@ +[DEFAULT] +pristine-tar = True diff --git a/debian/libcore-kernel-ocaml-dev.install.in b/debian/libcore-kernel-ocaml-dev.install.in new file mode 100644 index 0000000..6dd9f0c --- /dev/null +++ b/debian/libcore-kernel-ocaml-dev.install.in @@ -0,0 +1,15 @@ +@OCamlStdlibDir@/core_kernel/META +@OCamlStdlibDir@/core_kernel/*.a +@OCamlStdlibDir@/core_kernel/*.cma +@OCamlStdlibDir@/core_kernel/*.cmi +@OCamlStdlibDir@/core_kernel/*.ml +@OCamlStdlibDir@/core_kernel/*.mli +@OCamlStdlibDir@/core_kernel/*.h +OPT: @OCamlStdlibDir@/core_kernel/*.cmxa +DYN: @OCamlStdlibDir@/core_kernel/*.cma +OPT: @OCamlStdlibDir@/core_kernel/*.cmx +DYN: @OCamlStdlibDir@/core_kernel/*.cmxs + +@OCamlStdlibDir@/core_kernel/*.cmt +@OCamlStdlibDir@/core_kernel/*.cmti +@OCamlStdlibDir@/core_kernel/*.annot \ No newline at end of file diff --git a/debian/libcore-kernel-ocaml.install.in b/debian/libcore-kernel-ocaml.install.in new file mode 100644 index 0000000..1d5ce78 --- /dev/null +++ b/debian/libcore-kernel-ocaml.install.in @@ -0,0 +1 @@ +@OCamlDllDir@/*.so diff --git a/debian/patches/0001-Fix-apparent-typo.patch b/debian/patches/0001-Fix-apparent-typo.patch new file mode 100644 index 0000000..f7a62eb --- /dev/null +++ b/debian/patches/0001-Fix-apparent-typo.patch @@ -0,0 +1,21 @@ +From: Hilko Bengen <ben...@debian.org> +Date: Fri, 25 Dec 2015 01:33:43 +0100 +Subject: Fix apparent typo + +--- + test/pool_caml_modify_check.ml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/pool_caml_modify_check.ml b/test/pool_caml_modify_check.ml +index 0d5ccc4..62e798c 100644 +--- a/test/pool_caml_modify_check.ml ++++ b/test/pool_caml_modify_check.ml +@@ -4,7 +4,7 @@ + This can be very easily broken, and as such we're adding these tests to detect when + this may have happened. *) + +-open Core.Std ++open Core_kernel.Std + open Check_caml_modify + + (* Big enough length so an array goes directly into the major heap. *) diff --git a/debian/patches/0002-Fix-syntax-errors-in-ocamldoc-formatting.patch b/debian/patches/0002-Fix-syntax-errors-in-ocamldoc-formatting.patch new file mode 100644 index 0000000..9c483dd --- /dev/null +++ b/debian/patches/0002-Fix-syntax-errors-in-ocamldoc-formatting.patch @@ -0,0 +1,182 @@ +From: Hilko Bengen <ben...@debian.org> +Date: Mon, 4 Jan 2016 18:04:10 +0100 +Subject: Fix syntax errors in ocamldoc formatting + +--- + src/bigstring.mli | 6 +++--- + src/binary_searchable_intf.ml | 2 +- + src/core_list.mli | 2 +- + src/core_string.mli | 4 ++-- + src/float_intf.ml | 6 +++--- + src/int_intf.ml | 8 ++++---- + src/perms.mli | 12 ++++++------ + 7 files changed, 20 insertions(+), 20 deletions(-) + +diff --git a/src/bigstring.mli b/src/bigstring.mli +index 50209b3..c653d08 100644 +--- a/src/bigstring.mli ++++ b/src/bigstring.mli +@@ -97,7 +97,7 @@ include Blit.S with type t := t + module To_string : Blit.S_distinct with type src := t with type dst := string + module From_string : Blit.S_distinct with type src := string with type dst := t + +-(** {6 Reading/writing bin-prot *) ++(** {6 Reading/writing bin-prot} *) + + (** These functions write the "size-prefixed" bin-prot format that is used by, e.g., + async's [Writer.write_bin_prot], [Reader.read_bin_prot] and +@@ -137,14 +137,14 @@ val map_file : shared : bool -> Unix.file_descr -> int -> t + + Users must keep in mind that operations on the resulting bigstring may result in disk + operations which block the runtime. This is true for pure OCaml operations (such as +- t.{1} <- 1), and for calls to [blit]. While some I/O operations may release the OCaml ++ t.\{1\} <- 1), and for calls to [blit]. While some I/O operations may release the OCaml + lock, users should not expect this to be done for all operations on a bigstring + returned from [map_file]. *) + + (** {6 Search} *) + + (** [find ?pos ?len char t] returns [Some i] for the smallest [i >= pos] such that +- [t.{i} = char], or [None] if there is no such [i]. ++ [t.\{i\} = char], or [None] if there is no such [i]. + + @param pos default = 0 + @param len default = [length bstr - pos] *) +diff --git a/src/binary_searchable_intf.ml b/src/binary_searchable_intf.ml +index b308035..44fd0ff 100644 +--- a/src/binary_searchable_intf.ml ++++ b/src/binary_searchable_intf.ml +@@ -60,7 +60,7 @@ module type S = sig + type t + + (** +- {0:Examples} ++ {0 Examples} + + The functions produced by this functor are very powerful, but also somewhat + complex to read. Here are some simple examples to clarify the use cases. +diff --git a/src/core_list.mli b/src/core_list.mli +index 564af55..e0d1528 100644 +--- a/src/core_list.mli ++++ b/src/core_list.mli +@@ -313,7 +313,7 @@ val filter_opt : 'a option t -> 'a t + + is always the same as (or at least sort of isomorphic to): + +- {[ Map.xxx (alist |! Map.of_alist_multi |! Map.map ~f:List.hd) ...args... }] ++ {[ Map.xxx (alist |! Map.of_alist_multi |! Map.map ~f:List.hd) ...args... ]} + *) + module Assoc : sig + +diff --git a/src/core_string.mli b/src/core_string.mli +index 494db7f..be11f5d 100644 +--- a/src/core_string.mli ++++ b/src/core_string.mli +@@ -91,10 +91,10 @@ module Search_pattern : sig + looking for another one at the very next position ([~may_overlap:true]), or jump to + the end of that match and continue from there ([~may_overlap:false]), e.g.: + +- {| ++ {[ + index_all (create "aaa") ~may_overlap:false ~in_:"aaaaBaaaaaa" = [0; 5; 8] + index_all (create "aaa") ~may_overlap:true ~in_:"aaaaBaaaaaa" = [0; 1; 5; 6; 7; 8] +- |} ++ ]} + + E.g. [replace_all] internally calls [index_all ~may_overlap:false]. + *) +diff --git a/src/float_intf.ml b/src/float_intf.ml +index 0eb9a22..25876fe 100644 +--- a/src/float_intf.ml ++++ b/src/float_intf.ml +@@ -82,7 +82,7 @@ module type S = sig + v} + + [iround_exn] raises when trying to handle nan or trying to handle a float outside the +- range [float min_int, float max_int). ++ range \[float min_int, float max_int). + + + Here are some examples for [round] for each direction: +@@ -261,12 +261,12 @@ module type S = sig + + Exact ties are resolved to even in the decimal: + +- {| ++ {[ + to_padded_compact_string 3.25 = "3.2" + to_padded_compact_string 3.75 = "3.8" + to_padded_compact_string 33_250. = "33k2" + to_padded_compact_string 33_350. = "33k4" +- |} ++ ]} + + *) + val to_padded_compact_string : float -> string +diff --git a/src/int_intf.ml b/src/int_intf.ml +index f979ba4..b3e9a47 100644 +--- a/src/int_intf.ml ++++ b/src/int_intf.ml +@@ -17,10 +17,10 @@ module type Round = sig + Here are some examples for [round ~to_multiple_of:10] for each direction: + + {v +- | `Down | {10 .. 19} --> 10 | { 0 ... 9} --> 0 | {-10 ... -1} --> -10 | +- | `Up | { 1 .. 10} --> 10 | {-9 ... 0} --> 0 | {-19 .. -10} --> -10 | +- | `Zero | {10 .. 19} --> 10 | {-9 ... 9} --> 0 | {-19 .. -10} --> -10 | +- | `Nearest | { 5 .. 14} --> 10 | {-5 ... 4} --> 0 | {-15 ... -6} --> -10 | ++ | `Down | \{10 .. 19\} --> 10 | \{ 0 ... 9\} --> 0 | \{-10 ... -1\} --> -10 | ++ | `Up | \{ 1 .. 10\} --> 10 | \{-9 ... 0\} --> 0 | \{-19 .. -10\} --> -10 | ++ | `Zero | \{10 .. 19\} --> 10 | \{-9 ... 9\} --> 0 | \{-19 .. -10\} --> -10 | ++ | `Nearest | \{ 5 .. 14\} --> 10 | \{-5 ... 4\} --> 0 | \{-15 ... -6\} --> -10 | + v} + + For convenience and performance, there are variants of [round] with [dir] hard-coded. +diff --git a/src/perms.mli b/src/perms.mli +index 60da332..fb90108 100644 +--- a/src/perms.mli ++++ b/src/perms.mli +@@ -5,7 +5,7 @@ + + Here's a hypothetical interface to an on-off switch which uses them: + +- {| ++ {[ + open Perms.Export + + module Switch : sig +@@ -15,17 +15,17 @@ + val read : [> read] t -> [`On | `Off] + val write : [> write] t -> [`On | `Off] -> unit + end +- |} ++ ]} + + Note that the permissions parameter must be contravariant -- you are allowed to forget + that you have any particular permissions, but not give yourself new permissions. + + You can now create different "views" of a switch. For example, in: + +- {| ++ {[ + let read_write_s1 : read_write Switch.t = Switch.create () + let read_only_s1 = (read_write_s1 :> read t) +- |} ++ ]} + + [read_write_s1] and [read_only_s1] are physically equal, but calling + [Switch.write read_only_s1] is a type error, while [Switch.write read_write_s1] is +@@ -33,11 +33,11 @@ + + Also note that this is a type error: + +- {| ++ {[ + let s1 = Switch.create () + let read_write_s1 = (s1 :> read_write t) + let immutable_s1 = (s1 :> immutable t) +- |} ++ ]} + + which is good, since it would be incorrect if it were allowed. This is enforced by: + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..663b78b --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +0001-Fix-apparent-typo.patch +0002-Fix-syntax-errors-in-ocamldoc-formatting.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..cc829dc --- /dev/null +++ b/debian/rules @@ -0,0 +1,36 @@ +#!/usr/bin/make -f + +DESTDIR=$(CURDIR)/debian/tmp + +include /usr/share/ocaml/ocamlvars.mk + +export OCAML_DLL_DIR +export OCAML_HAVE_OCAMLOPT +export OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR) +export OCAMLFIND_LDCONF=ignore + +%: + dh $@ --with ocaml + +override_dh_auto_configure: + ocaml setup.ml -configure --prefix /usr --destdir '$(DESTDIR)' \ + --enable-docs \ + --docdir /usr/share/doc/libcore-kernel-ocaml-doc/html/api \ + --enable-tests + +override_dh_auto_build: + ocaml setup.ml -build + ocaml setup.ml -doc + +override_dh_auto_test: + ocaml setup.ml -test + +override_dh_auto_install: + mkdir -p '$(OCAMLFIND_DESTDIR)' '$(DESTDIR)$(OCAML_DLL_DIR)' + ocaml setup.ml -install + +override_dh_auto_clean: + ocaml setup.ml -distclean + +override_dh_install: + dh_install --fail-missing -X.so.owner diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/local-options b/debian/source/local-options new file mode 100644 index 0000000..c4cf480 --- /dev/null +++ b/debian/source/local-options @@ -0,0 +1,2 @@ +abort-on-upstream-changes +unapply-patches diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..87e54f5 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +opts=uversionmangle=s/-rc/~rc/ https://github.com/janestreet/core_kernel/tags /.*/archive/([\d\.\-rc]+)\.tar\.gz -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/janest-core-kernel.git _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits