[Pkg-ocaml-maint-commits] [SCM] pxp packaging branch, master, updated. debian/1.2.0.test1-3-26-g060dc7f

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 06c136f842f0c76a3bd6a2665b12bd5cecd23c10
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Mon Mar 16 17:42:31 2009 +0100

    use upstream ocamldoc to generate manual

diff --git a/debian/changelog b/debian/changelog
index 3ad1034..8e2b67d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ pxp (1.2.1-1) UNRELEASED; urgency=low
     - remove patch build_w_camlp5 (no longer needed, pxp now builds fine
       with legacy camlp4 and ulex). As a consequence replace build-deps
       from camlp5/ulex08 to camlp4/ulex
+    - add patch ocamldoc_missing_txt to avoid referencing an unavailable doc
   * debian/*.in use high level substvar instead of making assumptions on
     the stdlib dir location
   * bump debhelper compatibility to 7
@@ -18,6 +19,8 @@ pxp (1.2.1-1) UNRELEASED; urgency=low
     - move pxp to (new) archive section "ocaml"
   * debian/docs: avoid installing vanished documents
   * debian/rules: use ocaml.mk as a CDBS "rules" snippet
+  * use upstream build system to create the ocamldoc reference manual,
+    because it includes extra documentation
 
   [ Stephane Glondu ]
   * Switching packaging to git
diff --git a/debian/docs b/debian/docs
index cf68faa..72d28ed 100644
--- a/debian/docs
+++ b/debian/docs
@@ -2,3 +2,4 @@ doc/DEV
 doc/README
 doc/SPEC
 doc/design.txt
+doc/manual/html/
diff --git a/debian/expand_stars.sh b/debian/expand_stars.sh
deleted file mode 100644
index 7e521fa..0000000
--- a/debian/expand_stars.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-# expand '(*' to '(**'
-sed 's/^\( *\)(\*\( [^\$=]\)/\1(**\2/' "$@"
diff --git a/debian/patches/00list b/debian/patches/00list
index 806a429..dceac02 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1 +1,2 @@
 install_destdir.dpatch
+ocamldoc_missing_txt.dpatch
diff --git a/debian/patches/ocamldoc_missing_txt.dpatch b/debian/patches/ocamldoc_missing_txt.dpatch
new file mode 100755
index 0000000..12bb480
--- /dev/null
+++ b/debian/patches/ocamldoc_missing_txt.dpatch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ocamldoc_missing_txt.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: avoid dependending on a missing .txt document
+
+ at DPATCH@
+diff -urNad pxp~/src/pxp-engine/Makefile.code pxp/src/pxp-engine/Makefile.code
+--- pxp~/src/pxp-engine/Makefile.code	2009-03-16 17:36:26.000000000 +0100
++++ pxp/src/pxp-engine/Makefile.code	2009-03-16 17:37:30.743013465 +0100
+@@ -21,8 +21,7 @@
+   	pxp_marshal.mli pxp_yacc.mli pxp_reader.mli \
+ 	intro_trees.txt intro_extensions.txt intro_namespaces.txt \
+         intro_events.txt intro_resolution.txt intro_getting_started.txt \
+-	intro_advanced.txt intro_preprocessor.txt \
+-	example_readme.txt
++	intro_advanced.txt intro_preprocessor.txt
+ 
+ XOBJ = $(OBJ:.cmo=.cmx)
+ 
diff --git a/debian/rules b/debian/rules
index 97cf466..c4a8b2c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,6 @@ include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/rules/ocaml.mk
 
 PKGNAME = libpxp-ocaml-dev
-OCAML_OCAMLDOC_PACKAGES = $(OCAML_LIBDEV_PACKAGES)                                                                             
-OCAML_OCAMLDOC_FLAGS += -pp $(CURDIR)/debian/expand_stars.sh
-OCAML_OCAMLDOC_OCAMLFIND_FLAGS = -package netstring
 DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/$(PKGNAME)$(OCAML_STDLIB_DIR)
 
 configure/$(PKGNAME)::
@@ -18,7 +15,7 @@ build/$(PKGNAME)::
 	$(MAKE) opt
 endif
 build/$(PKGNAME)::
-	chmod +x $(CURDIR)/debian/expand_stars.sh
+	$(MAKE) -C doc/manual/
 binary-post-install/$(PKGNAME)::
 	-for f in debian/$(PKGNAME)/usr/share/doc/$(PKGNAME)/examples/xmlforms/styles/* ; do \
 		test ! -r $$f && rm -f $$f ; \

-- 
pxp packaging