[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, master, updated. debian/0.5.3-1-42-g1b9df77

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit cf80df5fb0efac78d4394cc6aedcdd30470a8d98
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Fri Nov 13 11:03:29 2009 +0100

    make dh_ocamldoc be invoked twice on the -doc package
    
    intead of invoking it on different packages

diff --git a/debian/libcore-ocaml-dev.ocamldoc b/debian/libcore-ocaml-dev.ocamldoc
deleted file mode 100644
index 72dc823..0000000
--- a/debian/libcore-ocaml-dev.ocamldoc
+++ /dev/null
@@ -1,6 +0,0 @@
- -I lib -I +threads
- -syntax camlp4o
- -package bin_prot.syntax
- -package fieldslib.syntax
- -package sexplib.syntax
- -package type-conv.syntax
diff --git a/debian/libcore-ocaml-doc.links b/debian/libcore-ocaml-doc.links
index 2d95a77..444bdb5 100644
--- a/debian/libcore-ocaml-doc.links
+++ b/debian/libcore-ocaml-doc.links
@@ -1,2 +1,2 @@
-/usr/share/doc/libcore-ocaml-dev/html/api		/usr/share/doc/libcore-ocaml-doc/html/core-api
-/usr/share/doc/libcore-extended-ocaml-dev/html/api	/usr/share/doc/libcore-ocaml-doc/html/extended-api
+/usr/share/doc/libcore-ocaml-doc/html/core-api		/usr/share/doc/libcore-ocaml-dev/html/api
+/usr/share/doc/libcore-ocaml-doc/html/extended-api	/usr/share/doc/libcore-extended-ocaml-dev/html/api
diff --git a/debian/libcore-extended-ocaml-dev.ocamldoc b/debian/libcore-ocaml-doc.ocamldoc-core.in
similarity index 55%
rename from debian/libcore-extended-ocaml-dev.ocamldoc
rename to debian/libcore-ocaml-doc.ocamldoc-core.in
index b177bee..37d776d 100644
--- a/debian/libcore-extended-ocaml-dev.ocamldoc
+++ b/debian/libcore-ocaml-doc.ocamldoc-core.in
@@ -1,6 +1,8 @@
- -I extended -I lib -I +threads
+--include debian/libcore-ocaml-dev/@OCamlStdlibDir@/core
+ -d html/core-api
+ -I lib
+ -I +threads
  -syntax camlp4o
- -package res
  -package bin_prot.syntax
  -package fieldslib.syntax
  -package sexplib.syntax
diff --git a/debian/libcore-ocaml-doc.ocamldoc-extended.in b/debian/libcore-ocaml-doc.ocamldoc-extended.in
new file mode 100644
index 0000000..fdd1eb4
--- /dev/null
+++ b/debian/libcore-ocaml-doc.ocamldoc-extended.in
@@ -0,0 +1,11 @@
+--include debian/libcore-extended-ocaml-dev/@OCamlStdlibDir@/core_extended
+ -d html/extended-api
+ -I extended
+ -I lib
+ -I +threads
+ -syntax camlp4o
+ -package res
+ -package bin_prot.syntax
+ -package fieldslib.syntax
+ -package sexplib.syntax
+ -package type-conv.syntax

-- 
janest-core packaging