[Pkg-ocaml-maint-commits] [ocaml-debian-formats] 04/06: fix build with Ocaml 4.02+

Sylvain LE GALL gildor at moszumanska.debian.org
Mon May 11 00:23:32 UTC 2015


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

gildor pushed a commit to branch master
in repository ocaml-debian-formats.

commit a9f5ae3f0bd53f037cb00764b27c9888209a8226
Author: Török Edwin <edwin at etorok.net>
Date:   Sun May 10 23:18:08 2015 +0300

    fix build with Ocaml 4.02+
    
    modules that are aliases cannot be InternalModules
---
 _oasis                     |  6 ++----
 setup.ml                   | 19 ++++++-------------
 src/DFChangelog.mli        | 30 ++++++++++++++++++++++++++++++
 src/DFWatch.mli            |  4 ++++
 src/debian-formats.mldylib |  6 +++---
 src/debian-formats.mllib   |  6 +++---
 6 files changed, 48 insertions(+), 23 deletions(-)

diff --git a/_oasis b/_oasis
index 433111b..6068db9 100644
--- a/_oasis
+++ b/_oasis
@@ -10,13 +10,11 @@ BuildTools:  ocamlbuild
 Library "debian-formats"
   Path:            src
   BuildTools:      ocamlbuild
-  Modules:         DebianFormats
+  Modules:         DebianFormats, DFChangelog, DFWatch
   InternalModules: DF822_lexer,
                    DF822_parser,
                    DF822,
-                   DFUtils,
-                   DFChangelog,
-                   DFWatch
+                   DFUtils
   BuildDepends: extlib, str, mikmatch_pcre
   
 Document "api-debian-formats"
diff --git a/setup.ml b/setup.ml
index 06f7f88..f30c8fb 100644
--- a/setup.ml
+++ b/setup.ml
@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.2.0 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 6580cd6ffc2e1967770e303d6dada3cd) *)
+(* DO NOT EDIT (digest: 7e0c548dbe93ae9ff7d2eb58a7fb2cad) *)
 (*
    Regenerated by OASIS v0.4.5
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6987,17 +6987,11 @@ let setup_t =
                       bs_nativeopt = [(OASISExpr.EBool true, [])]
                    },
                    {
-                      lib_modules = ["DebianFormats"];
+                      lib_modules =
+                        ["DebianFormats"; "DFChangelog"; "DFWatch"];
                       lib_pack = false;
                       lib_internal_modules =
-                        [
-                           "DF822_lexer";
-                           "DF822_parser";
-                           "DF822";
-                           "DFUtils";
-                           "DFChangelog";
-                           "DFWatch"
-                        ];
+                        ["DF822_lexer"; "DF822_parser"; "DF822"; "DFUtils"];
                       lib_findlib_parent = None;
                       lib_findlib_name = None;
                       lib_findlib_containers = []
@@ -7157,8 +7151,7 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.5";
-     oasis_digest =
-       Some "N(\220\250\029\011\214\178W\233\172\226\193\003%\137";
+     oasis_digest = Some "|v\2401tv\r\198\135\021\155\239\135pD\233";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false
@@ -7166,6 +7159,6 @@ let setup_t =
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 7170 "setup.ml"
+# 7163 "setup.ml"
 (* OASIS_STOP *)
 let () = setup ();;
diff --git a/src/DFChangelog.mli b/src/DFChangelog.mli
new file mode 100644
index 0000000..088c2de
--- /dev/null
+++ b/src/DFChangelog.mli
@@ -0,0 +1,30 @@
+type entry = {
+  source : string;
+  version : string;
+  distributions : string list;
+  optional_fields : (string * string) list;
+  urgency : string;
+  maintainer : string;
+  timestamp : string;
+  changes : string;
+}
+exception Skip_end
+val __mikmatch_regexp_1 : Pcre.regexp
+val __mikmatch_regexp_2 : Pcre.regexp
+val __mikmatch_regexp_3 : Pcre.regexp
+val __mikmatch_regexp_4 : Pcre.regexp
+val __mikmatch_regexp_5 : Pcre.regexp
+val skip_line : ?fst:string -> IO.input -> int * string option
+val __mikmatch_regexp_6 : Pcre.regexp
+val __mikmatch_regexp_7 : Pcre.regexp
+val __mikmatch_regexp_8 : Pcre.regexp
+val __mikmatch_regexp_9 : Pcre.regexp
+val __mikmatch_regexp_10 : Pcre.regexp
+val __mikmatch_regexp_11 : Pcre.regexp
+val parse_one : IO.input -> string -> entry
+val head : IO.input -> entry
+val parse : IO.input -> entry list
+val to_string : entry -> string
+val filename : string
+val default : unit -> entry list
+val default_head : unit -> entry
diff --git a/src/DFWatch.mli b/src/DFWatch.mli
new file mode 100644
index 0000000..7d2bf3a
--- /dev/null
+++ b/src/DFWatch.mli
@@ -0,0 +1,4 @@
+val __mikmatch_regexp_1 : Pcre.regexp
+val __mikmatch_regexp_2 : Pcre.regexp
+val __mikmatch_regexp_3 : Pcre.regexp
+val parse : IO.input -> string list
diff --git a/src/debian-formats.mldylib b/src/debian-formats.mldylib
index 12257a9..b813299 100644
--- a/src/debian-formats.mldylib
+++ b/src/debian-formats.mldylib
@@ -1,10 +1,10 @@
 # OASIS_START
-# DO NOT EDIT (digest: 9bf30c39154519664ef8b355fca992ba)
+# DO NOT EDIT (digest: 5f07f2ed946434ee0d42ebf13155c161)
 DebianFormats
+DFChangelog
+DFWatch
 DF822_lexer
 DF822_parser
 DF822
 DFUtils
-DFChangelog
-DFWatch
 # OASIS_STOP
diff --git a/src/debian-formats.mllib b/src/debian-formats.mllib
index 12257a9..b813299 100644
--- a/src/debian-formats.mllib
+++ b/src/debian-formats.mllib
@@ -1,10 +1,10 @@
 # OASIS_START
-# DO NOT EDIT (digest: 9bf30c39154519664ef8b355fca992ba)
+# DO NOT EDIT (digest: 5f07f2ed946434ee0d42ebf13155c161)
 DebianFormats
+DFChangelog
+DFWatch
 DF822_lexer
 DF822_parser
 DF822
 DFUtils
-DFChangelog
-DFWatch
 # OASIS_STOP

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



More information about the Pkg-ocaml-maint-commits mailing list