The following commit has been merged in the master branch:
commit fb20b05f6d4a9e7214cfe552636b16029f832c32
Author: Stephane Glondu <[email protected]>
Date: Wed Nov 16 17:13:43 2011 +0100
Use upstream install/doc targets
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index e845566..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README
diff --git a/debian/libcore-ocaml-dev.install.in
b/debian/libcore-ocaml-dev.install.in
index f92ca81..68f4b4e 100644
--- a/debian/libcore-ocaml-dev.install.in
+++ b/debian/libcore-ocaml-dev.install.in
@@ -1,8 +1,5 @@
-debian/tmp/core/*.a @OCamlStdlibDir@/core/
-debian/tmp/core/*.cma @OCamlStdlibDir@/core/
-debian/tmp/core/*.cmi @OCamlStdlibDir@/core/
-OPT: debian/tmp/core/*.cmxa @OCamlStdlibDir@/core/
-debian/tmp/core/META @OCamlStdlibDir@/core/
-
-lib/*.mli @OCamlStdlibDir@/core/
-lib/*able.ml @OCamlStdlibDir@/core/
+@OCamlStdlibDir@/core/META
+@OCamlStdlibDir@/core/*.a
+@OCamlStdlibDir@/core/*.cma
+@OCamlStdlibDir@/core/*.cmi
+OPT: @OCamlStdlibDir@/core/*.cmxa
diff --git a/debian/libcore-ocaml-doc.dirs b/debian/libcore-ocaml-doc.dirs
deleted file mode 100644
index ba07e04..0000000
--- a/debian/libcore-ocaml-doc.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-/usr/share/doc-base
-/usr/share/doc/libcore-ocaml-dev/html
-/usr/share/doc/libcore-ocaml-doc/html
diff --git a/debian/libcore-ocaml-doc.doc-base
b/debian/libcore-ocaml-doc.doc-base
new file mode 100644
index 0000000..6619563
--- /dev/null
+++ b/debian/libcore-ocaml-doc.doc-base
@@ -0,0 +1,9 @@
+Document: libcore-ocaml-doc-apiref
+Title: Documentation of Jane Street's Core library
+Author: Jane Stree
+Abstract: Documentation of Jane Street's Core library
+Section: Programming/OCaml
+
+Format: HTML
+Index: /usr/share/doc/libcore-ocaml-doc/html/api/index.html
+Files: /usr/share/doc/libcore-ocaml-doc/html/api/*.html
diff --git a/debian/libcore-ocaml-doc.install b/debian/libcore-ocaml-doc.install
new file mode 100644
index 0000000..99046ce
--- /dev/null
+++ b/debian/libcore-ocaml-doc.install
@@ -0,0 +1 @@
+usr/share/doc/libcore-ocaml-doc
diff --git a/debian/libcore-ocaml-doc.links b/debian/libcore-ocaml-doc.links
index 0954f32..f04b0d7 100644
--- a/debian/libcore-ocaml-doc.links
+++ b/debian/libcore-ocaml-doc.links
@@ -1 +1 @@
-/usr/share/doc/libcore-ocaml-doc/html/core-api
/usr/share/doc/libcore-ocaml-dev/html/api
+/usr/share/doc/libcore-ocaml-doc/html /usr/share/doc/libcore-ocaml-dev/html
diff --git a/debian/libcore-ocaml-doc.ocamldoc-core.in
b/debian/libcore-ocaml-doc.ocamldoc-core.in
deleted file mode 100644
index 381c5f4..0000000
--- a/debian/libcore-ocaml-doc.ocamldoc-core.in
+++ /dev/null
@@ -1,5 +0,0 @@
---include debian/libcore-ocaml-dev@OCamlStdlibDir@/core
- -pp "sh debian/dpp.sh"
- -d html/core-api
- -I lib
- -I +threads
diff --git a/debian/libcore-ocaml.install.in b/debian/libcore-ocaml.install.in
index 8fa4daa..1d5ce78 100644
--- a/debian/libcore-ocaml.install.in
+++ b/debian/libcore-ocaml.install.in
@@ -1 +1 @@
-debian/tmp/core/*.so @OCamlDllDir@
+@OCamlDllDir@/*.so
--
janest-core packaging
_______________________________________________
Pkg-ocaml-maint-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
