[Pkg-ocaml-maint-commits] [dose3] 01/01: skip ocamldoc
Ralf Treinen
treinen at moszumanska.debian.org
Fri Oct 16 17:30:13 UTC 2015
This is an automated email from the git hooks/post-receive script.
treinen pushed a commit to annotated tag debian/4.0.2-2
in repository dose3.
commit eab78b429c3e745cd3d926ac734480141b515d2f
Author: Ralf Treinen <treinen at free.fr>
Date: Fri Oct 16 19:02:10 2015 +0200
skip ocamldoc
---
debian/changelog | 10 ++++++++++
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, 27 insertions(+), 10 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 053c1f1..f8639e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+dose3 (4.0.2-2) unstable; urgency=medium
+
+ * skip generation of ocamldoc documentation since it fails with ocaml 4.02
+ (closes: #801773):
+ - patch skip-ocamldoc
+ - debian/libdose3-ocaml-dev.docs
+ - drop debian/libdose3-ocaml-dev.doc-base
+
+ -- Ralf Treinen <treinen at debian.org> Fri, 16 Oct 2015 19:12:52 +0200
+
dose3 (4.0.2-1) unstable; urgency=medium
* New upstream release
diff --git a/debian/libdose3-ocaml-dev.doc-base b/debian/libdose3-ocaml-dev.doc-base
deleted file mode 100644
index f33fe47..0000000
--- a/debian/libdose3-ocaml-dev.doc-base
+++ /dev/null
@@ -1,9 +0,0 @@
-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 e93ad7f..d9d06aa 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 b7e42fd..35289e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
binaries-prefix-edos
coinstall-binary-name
# librpm-4.12
+skip-ocamldoc
diff --git a/debian/patches/skip-ocamldoc b/debian/patches/skip-ocamldoc
new file mode 100644
index 0000000..2914db5
--- /dev/null
+++ b/debian/patches/skip-ocamldoc
@@ -0,0 +1,15 @@
+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
More information about the Pkg-ocaml-maint-commits
mailing list