[Pkg-ocaml-maint-commits] [janest-core] 01/03: Merge libcore-ocaml-doc into libcore-ocaml-dev

[Hilko Bengen]

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

bengen pushed a commit to branch master
in repository janest-core.

commit ba0d84e32aec83a6aeeb7c42cd2a7c4293718aad
Author: Hilko Bengen <bengen at debian.org>
Date:   Wed Feb 3 00:14:42 2016 +0100

    Merge libcore-ocaml-doc into libcore-ocaml-dev
---
 debian/control                    | 18 ++----------------
 debian/libcore-ocaml-doc.doc-base |  9 ---------
 debian/libcore-ocaml-doc.links    |  1 -
 debian/rules                      |  7 -------
 4 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/debian/control b/debian/control
index 50b2b2f..9a4fa12 100644
--- a/debian/control
+++ b/debian/control
@@ -42,8 +42,9 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  libcomparelib-camlp4-dev, libcustom-printf-camlp4-dev, libpipebang-camlp4-dev, libhere-camlp4-dev,
-Recommends: libcore-ocaml-doc
 Provides: ${ocaml:Provides}
+Breaks: libcore-ocaml-doc (<< 113.00.00-3~)
+Replaces: libcore-ocaml-doc (<< 113.00.00-3~)
 Description: Jane Street's standard library for OCaml
  Core is an industrial-strength alternative to the OCaml standard
  library. It was developed by Jane Street, which is the largest
@@ -67,18 +68,3 @@ Description: Jane Street's standard library for OCaml (runtime)
  .
  This package contains the runtime stuff you need to run programs using
  Core.
-
-Package: libcore-ocaml-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Enhances:
- libcore-ocaml-dev,
- ${misc:Depends}
-Description: Jane Street's standard library for OCaml - documentation
- Core is an industrial-strength alternative to the OCaml standard
- library. It was developed by Jane Street, which is the largest
- industrial user of OCaml.
- .
- This package contains the ocamldoc API reference in HTML format for
- Core.
diff --git a/debian/libcore-ocaml-doc.doc-base b/debian/libcore-ocaml-doc.doc-base
deleted file mode 100644
index 2cb32ea..0000000
--- a/debian/libcore-ocaml-doc.doc-base
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: libcore-ocaml-doc-apiref
-Title: Documentation of Jane Street's Core library
-Author: Jane Street Capital LLC
-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.links b/debian/libcore-ocaml-doc.links
deleted file mode 100644
index f04b0d7..0000000
--- a/debian/libcore-ocaml-doc.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/doc/libcore-ocaml-doc/html /usr/share/doc/libcore-ocaml-dev/html
diff --git a/debian/rules b/debian/rules
index c39507e..b67d6d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,10 +31,3 @@ override_dh_auto_clean:
 
 override_dh_install:
 	dh_install --fail-missing
-
-override_dh_ocamldoc:
-	dh_ocamldoc
-	rm -f debian/libcore-ocaml-dev/usr/share/doc-base/libcore-ocaml-dev.doc-base.apiref
-	mkdir -p debian/libcore-ocaml-doc/usr/share/doc/libcore-ocaml-doc
-	mv debian/libcore-ocaml-dev/usr/share/doc/libcore-ocaml-dev/html \
-	   debian/libcore-ocaml-doc/usr/share/doc/libcore-ocaml-doc/html

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