The following commit has been merged in the master branch: commit d9f2402a143529a801d398f9e79ad7a35d4d8f03 Author: Mehdi Dogguy <me...@debian.org> Date: Sun Jun 16 13:38:11 2013 +0200
Add binary package opam-docs diff --git a/debian/control b/debian/control index 5f7e220..a9e9d02 100644 --- a/debian/control +++ b/debian/control @@ -35,6 +35,7 @@ Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}, + opam-docs (= ${source:Version}), wget | curl Recommends: git, @@ -59,3 +60,33 @@ Description: package manager for OCaml just the latest one. * You want to create your own packages yourself, put them on your own repository, with minimal effort. + +Package: opam-docs +Architecture: all +Section: doc +Depends: + ${ocaml:Depends}, + ${shlibs:Depends}, + ${misc:Depends} +Description: package manager for OCaml (documentation) + OPAM stands for OCaml PAckage Manager. It aims to suit to a vast number + of users and use cases, and has unique features: + * Powerful handling of dependencies: versions constraints, optional + dependencies, conflicts, etc. + * Multiple repositories backends: HTTP, rsync, git + * Ease to create packages and repositories + * Ability to switch between different compiler versions + . + Typically, OPAM will probably make your life easier if you recognize + yourself in at least one of these profiles: + * You use multiple versions of the OCaml compiler, or you hack the compiler + yourself and needs to frequently switch between compiler versions. + * You use or develop software that needs a specific and/or modified version + of the OCaml compiler to be installed. + * You use or develop software that depends on a specific version of an OCaml + library, or you just want to install a specific version of a package, not + just the latest one. + * You want to create your own packages yourself, put them on your own + repository, with minimal effort. + . + This package contains manpages and general documentation about OPAM. diff --git a/debian/opam.doc-base b/debian/opam-docs.doc-base similarity index 76% rename from debian/opam.doc-base rename to debian/opam-docs.doc-base index 39daea4..ff5c2e8 100644 --- a/debian/opam.doc-base +++ b/debian/opam-docs.doc-base @@ -5,4 +5,4 @@ Abstract: Developer Manual of OPAM Section: Programming/OCaml Format: PDF -Files: /usr/share/doc/opam/dev-manual.pdf +Files: /usr/share/doc/opam-docs/dev-manual.pdf diff --git a/debian/opam.docs b/debian/opam-docs.docs similarity index 83% rename from debian/opam.docs rename to debian/opam-docs.docs index c2b57bd..1848180 100644 --- a/debian/opam.docs +++ b/debian/opam-docs.docs @@ -1,3 +1,2 @@ README.md -CHANGES doc/dev-manual/dev-manual.pdf diff --git a/debian/opam.manpages b/debian/opam-docs.manpages similarity index 100% rename from debian/opam.manpages rename to debian/opam-docs.manpages diff --git a/debian/rules b/debian/rules index d2aadd6..245cba9 100755 --- a/debian/rules +++ b/debian/rules @@ -20,11 +20,11 @@ override_dh_auto_configure: .PHONY: override_dh_auto_build override_dh_auto_build: ocamlbuild $(OCAML_BEST).otarget -# We need "pandoc" on all architectures to be able to build manpages -# As of now, "pandoc" is missing on mips, mipsel and s390. -# $(MAKE) -C doc OPAM=../opamMain.$(BINEXT) man +ifneq (,$(findstring opam-docs, $(shell dh_listpackages))) + $(MAKE) -C doc OPAM=../opamMain.$(BINEXT) man $(RM) -f doc/dev-manual/dev-manual.pdf $(MAKE) -C doc/dev-manual +endif .PHONY: override_dh_auto_test override_dh_auto_test: -- opam packaging _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits