[Pkg-ocaml-maint-commits] [SCM] mlpost packaging branch, master, updated. debian/0.7.4-1-14-g5cc3eb4

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 541ceecd81c92d49c85d300d2b218ae898f1793c
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat May 22 21:07:13 2010 +0200

    New binary packages

diff --git a/debian/control b/debian/control
index 8af529e..3d8b5ce 100644
--- a/debian/control
+++ b/debian/control
@@ -3,18 +3,19 @@ Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Stéphane Glondu <glondu at debian.org>
 Build-Depends:
- context,
- texlive-latex-base,
- texlive-latex-recommended,
- texlive-metapost,
- ghostscript,
- imagemagick,
  debhelper (>= 7.2.11~),
  dh-ocaml (>= 0.9~),
  libcairo-ocaml-dev (>= 20090223-2~),
  libbitstring-ocaml-dev (>= 2.0.0-5~),
  camlp4,
  ocaml-nox (>= 3.11.1-3~)
+Build-Depends-Indep:
+ context,
+ texlive-latex-base,
+ texlive-latex-recommended,
+ texlive-metapost,
+ ghostscript,
+ imagemagick
 Standards-Version: 3.8.4
 Section: tex
 Homepage: http://mlpost.lri.fr/
@@ -28,17 +29,67 @@ Depends:
  texlive-latex-base,
  texlive-latex-recommended,
  texlive-metapost,
+ libmlpost-ocaml-dev,
  ${ocaml:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
-Provides: ${ocaml:Provides}
 Recommends:
+ libmlpost-ocaml-doc,
  xpdf
 Suggests:
  ghostscript,
  imagemagick,
  ocaml-findlib
-Description: Objective Caml interface to Metapost
+Description: Objective Caml interface to Metapost (command-line tool)
+ Mlpost is an OCaml library for scientific drawing. It relies on
+ Metapost, giving the possibility to include (La)TeX fragments.
+ Mlpost users can use the full power of OCaml to generate their
+ diagrams, including static typing and the possibility to use any
+ OCaml library. Moreover, Mlpost promotes a declarative style quite
+ different from existing tools.
+ .
+ This package contains a command-line tool to ease the generation of
+ PostScript or PDF figures directly from .ml files.
+
+Package: libmlpost-ocaml-dev
+Section: ocaml
+Architecture: any
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
+Recommends:
+ libmlpost-ocaml-doc,
+ ocaml-findlib
+Suggests:
+ context,
+ texlive-latex-base,
+ texlive-latex-recommended,
+ texlive-metapost,
+ xpdf,
+ ghostscript,
+ imagemagick
+Replaces: mlpost (<< 0.8.1)
+Conflicts: mlpost (<< 0.8.1)
+Description: Objective Caml interface to Metapost (library)
+ Mlpost is an OCaml library for scientific drawing. It relies on
+ Metapost, giving the possibility to include (La)TeX fragments.
+ Mlpost users can use the full power of OCaml to generate their
+ diagrams, including static typing and the possibility to use any
+ OCaml library. Moreover, Mlpost promotes a declarative style quite
+ different from existing tools.
+ .
+ This package contains the library itself.
+
+Package: libmlpost-ocaml-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Enhances: libmlpost-ocaml-dev
+Replaces: mlpost (<< 0.8.1)
+Conflicts: mlpost (<< 0.8.1)
+Description: Objective Caml interface to Metapost (doc)
  Mlpost is an OCaml library for scientific drawing. It relies on
  Metapost, giving the possibility to include (La)TeX fragments.
  Mlpost users can use the full power of OCaml to generate their
@@ -46,6 +97,4 @@ Description: Objective Caml interface to Metapost
  OCaml library. Moreover, Mlpost promotes a declarative style quite
  different from existing tools.
  .
- This package contains the library itself, and a command-line tool to
- ease the generation of PostScript or PDF figures directly from .ml
- files.
+ This package contains the API reference of the library.
diff --git a/debian/libmlpost-ocaml-dev.install.in b/debian/libmlpost-ocaml-dev.install.in
new file mode 100644
index 0000000..d99c768
--- /dev/null
+++ b/debian/libmlpost-ocaml-dev.install.in
@@ -0,0 +1,2 @@
+ at OCamlStdlibDir@
+mlpost.mli @OCamlStdlibDir@/mlpost
diff --git a/debian/mlpost.doc-base b/debian/libmlpost-ocaml-doc.doc-base
similarity index 100%
rename from debian/mlpost.doc-base
rename to debian/libmlpost-ocaml-doc.doc-base
diff --git a/debian/mlpost.install.in b/debian/libmlpost-ocaml-doc.install
similarity index 97%
rename from debian/mlpost.install.in
rename to debian/libmlpost-ocaml-doc.install
index 93b3e67..2c63b36 100644
--- a/debian/mlpost.install.in
+++ b/debian/libmlpost-ocaml-doc.install
@@ -1,4 +1,3 @@
-usr
 _build/doc/*.html       /usr/share/doc/mlpost/html
 _build/doc/style.css    /usr/share/doc/mlpost/html
 _build/doc/img/*.png    /usr/share/doc/mlpost/html/img
diff --git a/debian/mlpost.dirs.in b/debian/mlpost.dirs.in
deleted file mode 100644
index fd87e42..0000000
--- a/debian/mlpost.dirs.in
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin
-usr/share/man/man1
- at OCamlStdlibDir@/mlpost
diff --git a/debian/mlpost.install b/debian/mlpost.install
new file mode 100644
index 0000000..f7177e8
--- /dev/null
+++ b/debian/mlpost.install
@@ -0,0 +1,2 @@
+usr/bin
+usr/share
diff --git a/debian/rules b/debian/rules
index 9c41c53..f31294c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,13 +19,11 @@ override_dh_auto_configure: $(EXAMPLES_TARBALL)
 
 .PHONY: override_dh_auto_install
 override_dh_auto_install:
+ifneq (,$(findstring libmlpost-ocaml-doc,$(shell dh_listpackages)))
 	$(MAKE) doc
+endif
 	mkdir -p $(OCAMLFIND_DESTDIR)
 	$(MAKE) DESTDIR="-destdir $(OCAMLFIND_DESTDIR)" install
 
-.PHONY: override_dh_ocaml
-override_dh_ocaml:
-	dh_ocaml --runtime-map=mlpost
-
 .PHONY: override_dh_auto_test
 override_dh_auto_test:

-- 
mlpost packaging