[Pkg-ocaml-maint-commits] [SCM] oasis2debian project branch, master, updated. e4b433010fd297f19fb02e6deca06a3ee0dac3a1

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit a1a4769068e0f7dfb39ee5caee282b7020757a07
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Sun Mar 24 23:53:31 2013 +0100

    Allow to ignore lintian warnings.

diff --git a/src/ActInit.ml b/src/ActInit.ml
index 188e1e0..87d1a77 100644
--- a/src/ActInit.ml
+++ b/src/ActInit.ml
@@ -119,6 +119,6 @@ let run ~ctxt args =
     Group.create ~ctxt t;
     DpkgStatOverride.create ~ctxt t;
     DhDirs.create ~ctxt t;
+    LintianOverrides.create ~ctxt t;
   in 
-
     ()
diff --git a/src/LintianOverrides.ml b/src/LintianOverrides.ml
new file mode 100644
index 0000000..d15b704
--- /dev/null
+++ b/src/LintianOverrides.ml
@@ -0,0 +1,18 @@
+
+open Common
+
+let no_manpage = 
+  let lst = ref [] in
+    Conf.create_full
+      ~cli:"--no-manpage"
+      (fun s -> lst := s :: !lst; !lst)
+      "exec Disable lintian warning for the given exec without a manpage."
+      (Conf.Value !lst)
+
+let add lintian_id arg = 
+  debian_with_append_fn
+    "lintian-overrides"
+    (output_content (Printf.sprintf "%s %s" lintian_id arg))
+
+let create ~ctxt t =
+  List.iter (add "binary-without-manpage") (Conf.get ~ctxt no_manpage)
diff --git a/test/test.ml b/test/test.ml
index 2698598..e6fabf7 100644
--- a/test/test.ml
+++ b/test/test.ml
@@ -28,7 +28,8 @@ let oasis2debian =
 
 let args_for_tarball =
   ["ocamlify-0.0.1.tar.gz", 
-   ["--homepage"; "http://forge.ocamlcore.org/projects/ocamlify"];
+   ["--homepage"; "http://forge.ocamlcore.org/projects/ocamlify";
+    "--no-manpage"; "usr/bin/ocamlify"];
   
    "ocamlmod-0.0.3.tar.gz",
    ["--homepage"; "http://forge.ocamlcore.org/projects/ocamlmod"];
@@ -38,7 +39,8 @@ let args_for_tarball =
 		"--group"; "sekred,/var/lib/sekred";
 		"--dh-dirs"; "sekred,var/lib/sekred/domains";
 		"--dpkg-statoverride"; "/usr/bin/sekred,root,sekred,2755";
-		"--dpkg-statoverride"; "/var/lib/sekred/domains,root,sekred,1730"];
+		"--dpkg-statoverride"; "/var/lib/sekred/domains,root,sekred,1730";
+    "--no-manpage"; "usr/bin/sekred"];
   ]
 
 let tests = 

-- 
oasis2debian project