[Pkg-ocaml-maint-commits] [dose3] 04/08: reenable `make doc` with a patch against upstream

[Johannes Schauer]

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

josch pushed a commit to branch master
in repository dose3.

commit 0d80756643f3a787b2404abfc488b00066ed47f7
Author: Johannes Schauer <josch at debian.org>
Date:   Thu Aug 27 08:34:09 2015 +0200

    reenable `make doc` with a patch against upstream
---
 debian/changelog                    |  8 ++------
 debian/libdose3-ocaml-dev.docs      |  2 +-
 debian/patches/make-doc-target-work | 22 ++++++++++++++++++++++
 debian/patches/series               |  1 +
 debian/rules                        |  2 +-
 5 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 359bd0f..b69e018 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,14 +3,9 @@ dose3 (4.0-1) unstable; urgency=medium
   [ Ralf Treinen ]
   * New upstream release:
     - refresh patches: binaries-prefix-edos, coinstall-binary-name
-    - deactivate patches: cudfSolver-fix-leaking-fds,
-      encode-package-name-in-cudf_extras, remove_src_prefix_from_name,
-      librpm-4.12
+    - deactivate patches: librpm-4.12
   * drop the edos-distcheck transitional package.
   * Replaced build-dependency camlp4 by cppo, following upstream
-  * deactivate "make doc":
-    - debian/rules
-    - debian/libdose3-ocaml-dev.docs
 
   [ Johannes Schauer ]
   * remove patches cudfSolver-fix-leaking-fds and
@@ -20,6 +15,7 @@ dose3 (4.0-1) unstable; urgency=medium
   * upstream moved ./deb/version.ml to ./versioning/debian_version.ml.
     Adjusting d/copyright accordingly.
   * add d/copyright paragraph for common/shell_lexer.mll
+  * add patch make-doc-target-work to make `make doc` work again
 
  -- Ralf Treinen <treinen at debian.org>  Wed, 26 Aug 2015 21:36:52 +0200
 
diff --git a/debian/libdose3-ocaml-dev.docs b/debian/libdose3-ocaml-dev.docs
index bfd81dc..e93ad7f 100644
--- a/debian/libdose3-ocaml-dev.docs
+++ b/debian/libdose3-ocaml-dev.docs
@@ -1 +1 @@
-# _build/dose3.docdir   # FIXME!!!y
+_build/dose3.docdir
diff --git a/debian/patches/make-doc-target-work b/debian/patches/make-doc-target-work
new file mode 100644
index 0000000..cfe778d
--- /dev/null
+++ b/debian/patches/make-doc-target-work
@@ -0,0 +1,22 @@
+Description: make doc target work
+ Upstream did not update dose3.odocl.in when it did several changes in module
+ locations. This makes `make doc` break. The temporary fix is to disable the
+ modules that are no in different places.
+Author: Johannes Schauer <josch at debian.org>
+
+--- dose3-4.0.orig/dose3.odocl.in
++++ dose3-4.0/dose3.odocl.in
+@@ -7,13 +7,11 @@ algo/Diagnostic
+ algo/Depsolver_int
+ algo/Diagnostic_int
+ algo/Flatten
+-deb/Version
+ deb/Debcudf
+ deb/Packages
+ deb/Sources
+ deb/Release
+ deb/Apt
+-deb/Format822
+ deb/Evolution
+ deb/Edsp
+ deb/Debutil
diff --git a/debian/patches/series b/debian/patches/series
index b7e42fd..c55a8e1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 binaries-prefix-edos
 coinstall-binary-name
 # librpm-4.12
+make-doc-target-work
diff --git a/debian/rules b/debian/rules
index c57bd1c..b8f962c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,7 @@ override_dh_installman:
 
 override_dh_auto_build:
 	dh_auto_build
-	#	$(MAKE) doc 			# FIXME!!!
+	$(MAKE) doc
 	cd doc/apt-external-solvers.primer && $(MAKE)
 	cd doc/debcheck.primer && $(MAKE) 
 	pod2man --section 8 -release "apt-cudf $(RELEASE)" \

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