[Pkg-ocaml-maint-commits] [ocaml-text] 09/11: Update packaging

[Stéphane Glondu]

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

glondu pushed a commit to branch master
in repository ocaml-text.

commit e5e8ee51d9f14fa2f90c707fbe3ded5325f778e0
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Jul 18 10:36:41 2017 +0200

    Update packaging
---
 debian/control                      | 3 +++
 debian/libtext-ocaml-dev.doc-base   | 9 ---------
 debian/libtext-ocaml-dev.install.in | 7 ++++---
 debian/libtext-ocaml-dev.ocamldoc   | 1 +
 debian/libtext-ocaml.install.in     | 8 ++++----
 debian/rules                        | 4 ++--
 6 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/debian/control b/debian/control
index 9eacc36..7a4b278 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,9 @@ Build-Depends:
  camlp4,
  libpcre-ocaml-dev (>= 6.2.2),
  ocamlbuild,
+ rubber,
+ texlive-latex-recommended,
+ texlive-latex-extra,
  ocaml-nox (>= 4)
 Standards-Version: 3.9.4
 Section: ocaml
diff --git a/debian/libtext-ocaml-dev.doc-base b/debian/libtext-ocaml-dev.doc-base
deleted file mode 100644
index 83b4b1e..0000000
--- a/debian/libtext-ocaml-dev.doc-base
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: ocaml-text
-Title: OCaml-Text API documentation
-Author: Jérémie Dimino <jeremie at dimino.org>
-Abstract: OCaml-Text ocamldoc-generated API documentation
-Section: Programming/OCaml
-
-Format: HTML
-Index: /usr/share/doc/libtext-ocaml-dev/api/index.html
-Files: /usr/share/doc/libtext-ocaml-dev/api/*
diff --git a/debian/libtext-ocaml-dev.install.in b/debian/libtext-ocaml-dev.install.in
index 763ec8b..ed25451 100644
--- a/debian/libtext-ocaml-dev.install.in
+++ b/debian/libtext-ocaml-dev.install.in
@@ -1,8 +1,9 @@
-/usr/share/doc/libtext-ocaml-dev
- at OCamlStdlibDir@/text/text-pcre-syntax.cma
+ at OCamlStdlibDir@/text/pcre-syntax.cma
 @OCamlStdlibDir@/text/*.mli
 @OCamlStdlibDir@/text/*.cmi
 @OCamlStdlibDir@/text/*.a
+ at OCamlStdlibDir@/text/*.annot
+ at OCamlStdlibDir@/text/*.cmt*
 OPT: @OCamlStdlibDir@/text/*.cmxa
 OPT: @OCamlStdlibDir@/text/*.cmx
-DYN: @OCamlStdlibDir@/text/text-pcre-syntax.cmxs
+DYN: @OCamlStdlibDir@/text/pcre-syntax.cmxs
diff --git a/debian/libtext-ocaml-dev.ocamldoc b/debian/libtext-ocaml-dev.ocamldoc
new file mode 100644
index 0000000..084c543
--- /dev/null
+++ b/debian/libtext-ocaml-dev.ocamldoc
@@ -0,0 +1 @@
+-I +pcre
diff --git a/debian/libtext-ocaml.install.in b/debian/libtext-ocaml.install.in
index 532ec47..97a1ab9 100644
--- a/debian/libtext-ocaml.install.in
+++ b/debian/libtext-ocaml.install.in
@@ -1,8 +1,8 @@
 @OCamlStdlibDir@/text/META
 @OCamlStdlibDir@/text/text.cma
- at OCamlStdlibDir@/text/text-pcre.cma
- at OCamlStdlibDir@/text/text-bigarray.cma
+ at OCamlStdlibDir@/text/pcre.cma
+ at OCamlStdlibDir@/text/bigarray.cma
 @OCamlStdlibDir@/text/*.so             @OCamlDllDir@
 DYN: @OCamlStdlibDir@/text/text.cmxs
-DYN: @OCamlStdlibDir@/text/text-pcre.cmxs
-DYN: @OCamlStdlibDir@/text/text-bigarray.cmxs
+DYN: @OCamlStdlibDir@/text/pcre.cmxs
+DYN: @OCamlStdlibDir@/text/bigarray.cmxs
diff --git a/debian/rules b/debian/rules
index a52c4f6..aa544e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,8 +20,8 @@ override_dh_auto_configure:
 override_dh_auto_build:
 	ocaml setup.ml -build
 ifeq ($(OCAML_NATDYNLINK),yes)
-	cd _build && for u in text text-pcre text-bigarray; do ocamlopt -shared -I src -o src/$$u.cmxs src/$$u.cmxa; done
-	cd _build && for u in text-pcre-syntax; do ocamlopt -shared -I syntax -o syntax/$$u.cmxs syntax/$$u.cmxa; done
+	cd _build && for u in text pcre bigarray; do ocamlopt -shared -I src -o src/$$u.cmxs src/$$u.cmxa; done
+	cd _build && for u in pcre-syntax; do ocamlopt -shared -I syntax -o syntax/$$u.cmxs syntax/$$u.cmxa; done
 endif
 	ocaml setup.ml -doc
 

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