[Pkg-ocaml-maint-commits] [dose3] 01/01: restore doc generation

[Ralf Treinen]

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

treinen pushed a commit to branch master
in repository dose3.

commit 5bb232ae7318e5cab18680c5976c40e5018f4518
Author: Ralf Treinen <treinen at free.fr>
Date:   Thu Dec 24 12:14:09 2015 +0100

    restore doc generation
---
 debian/changelog                   |  7 +++++++
 debian/libdose3-ocaml-dev.doc-base |  9 +++++++++
 debian/libdose3-ocaml-dev.docs     |  2 +-
 debian/patches/series              |  1 -
 debian/patches/skip-ocamldoc       | 15 ---------------
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f8639e8..7529304 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dose3 (4.0.2-3) unstable; urgency=medium
+
+  * revert modifications done for 4.0.2-2 and restore generation of ocamldoc
+    documentation since this is fixed now in ocaml.
+
+ -- Ralf Treinen <treinen at debian.org>  Thu, 24 Dec 2015 12:12:42 +0100
+
 dose3 (4.0.2-2) unstable; urgency=medium
 
   * skip generation of ocamldoc documentation  since it fails with ocaml 4.02
diff --git a/debian/libdose3-ocaml-dev.doc-base b/debian/libdose3-ocaml-dev.doc-base
new file mode 100644
index 0000000..f33fe47
--- /dev/null
+++ b/debian/libdose3-ocaml-dev.doc-base
@@ -0,0 +1,9 @@
+Document: dose3
+Title: libdose3-ocaml-dev OCamldoc API Reference
+Author: Pietro Abate
+Abstract: API reference manual for libdose3-ocaml-dev (generated via OCamldoc)
+Section: Programming/OCaml
+
+Format: HTML
+Index: /usr/share/doc/libdose3-ocaml-dev/dose3.docdir/index.html
+Files: /usr/share/doc/libdose3-ocaml-dev/dose3.docdir/*
diff --git a/debian/libdose3-ocaml-dev.docs b/debian/libdose3-ocaml-dev.docs
index d9d06aa..e93ad7f 100644
--- a/debian/libdose3-ocaml-dev.docs
+++ b/debian/libdose3-ocaml-dev.docs
@@ -1 +1 @@
-#_build/dose3.docdir
+_build/dose3.docdir
diff --git a/debian/patches/series b/debian/patches/series
index 35289e9..b7e42fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 binaries-prefix-edos
 coinstall-binary-name
 # librpm-4.12
-skip-ocamldoc
diff --git a/debian/patches/skip-ocamldoc b/debian/patches/skip-ocamldoc
deleted file mode 100644
index 2914db5..0000000
--- a/debian/patches/skip-ocamldoc
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: dose3/Makefile
-===================================================================
---- dose3.orig/Makefile	2015-10-16 18:38:17.046686436 +0200
-+++ dose3/Makefile	2015-10-16 19:01:07.752813579 +0200
-@@ -227,8 +227,8 @@
- 	@git log --pretty=format:'%aN        %aE' | LC_ALL=C sort -u | awk -F'\t' '{printf("\t%s <%s>\n",$$1,$$2)}';
- 
- doc: all
--	$(OCAMLBUILD) dose3.docdir/index.html dose3.docdir/index.dot
--	dot -Grotate=0 -Tsvg -o dose3.docdir/index.svg dose3.docdir/index.dot
-+	#$(OCAMLBUILD) dose3.docdir/index.html dose3.docdir/index.dot
-+	#dot -Grotate=0 -Tsvg -o dose3.docdir/index.svg dose3.docdir/index.dot
- 	(cd doc && $(MAKE) all)
- 
- man:

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